Merge pull request #2226 from fengzeroz/v2.10

version: 2.10.0-alpha2
2026-10-30 07:45:59 +08:00 · 2024-09-19 10:22:05 +08:00 · 2024-09-19 02:21:26 +00:00 · 2024-09-19 10:16:13 +08:00 · 2024-09-18 15:59:50 +08:00 · 2024-09-14 15:51:56 +08:00
9 changed files with 20 additions and 45 deletions
@@ -41,7 +41,7 @@ jobs:

  ut:
    runs-on: ubuntu-20.04
-    container: ghcr.io/neugates/build:x86_64-main
+    container: ghcr.io/neugates/build:x86_64-v2.10

    steps:
      - uses: actions/checkout@v4
@@ -60,25 +60,9 @@ jobs:
          cd build
          ctest --output-on-failure

-      - name: create cov report
-        run: |
-            sudo apt-get update
-            sudo apt-get -y install lcov
-            mkdir -p cov_report
-            ./create_cov_report.sh ut
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
-        with:
-          verbose: true
-          fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./cov_report/
-          files: ./cov_report/cov-ut.info
-
  pft:
    runs-on: ubuntu-20.04
-    container: ghcr.io/neugates/build:x86_64-main
+    container: ghcr.io/neugates/build:x86_64-v2.10
    strategy:
      matrix:
        plugin: [core, ekuiper, modbus, mqtt, azure, metrics]
@@ -120,20 +104,4 @@ jobs:
            pytest -s -v tests/ft/app/"test_azure.py"
          else
            pytest -s -v tests/ft/metrics/"test_metrics.py"          
-          fi
-
-      - name: create cov report
-        run: |
-            sudo apt-get update
-            sudo apt-get -y install lcov
-            mkdir -p cov_report
-            ./create_cov_report.sh ${{ matrix.plugin }}
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
-        with:
-          verbose: true
-          fail_ci_if_error: true
-          token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./cov_report/
-          files: ./cov_report/cov-${{ matrix.plugin }}.info
+          fi
@@ -10,7 +10,7 @@ on:
 env:
  VERSION: 2.10.0
  UI_VERSION: 2.6.1
-  BRANCH: main
+  BRANCH: v2.10

 jobs:
  cross-build:
@@ -21,7 +21,7 @@ jobs:
          - [aarch64-linux-gnu, aarch64, arm64]
          - [arm-linux-gnueabihf, armv4, armhf]
          - [x86_64-linux-gnu, x86_64, amd64]
-    container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main
+    container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.10

    steps:
      - uses: actions/checkout@v4
@@ -64,7 +64,7 @@ jobs:
      matrix:
        arch:
          - [x86_64-linux-gnu, x86_64, amd64]
-    container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main
+    container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.10

    steps:
      - uses: actions/checkout@v4
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(COMPILER_PREFIX aarch64-linux-gnu)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
-set(LIBRARY_DIR /home/neuron/main/libs)
+set(LIBRARY_DIR /home/neuron/v2.10/libs)

 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(COMPILER_PREFIX arm-linux-gnueabi)
 set(CMAKE_SYSTEM_PROCESSOR armv5tejl)
-set(LIBRARY_DIR /home/neuron/main/libs)
+set(LIBRARY_DIR /home/neuron/v2.10/libs)

 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(COMPILER_PREFIX arm-linux-gnueabihf)
 set(CMAKE_SYSTEM_PROCESSOR armv7l)
-set(LIBRARY_DIR /home/neuron/main/libs)
+set(LIBRARY_DIR /home/neuron/v2.10/libs)

 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
@@ -1,7 +1,7 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(COMPILER_PREFIX x86_64-linux-gnu)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
-set(LIBRARY_DIR /home/neuron/main/libs)
+set(LIBRARY_DIR /home/neuron/v2.10/libs)

 set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
 set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
@@ -2559,6 +2559,13 @@ static void read_group_paginate(int64_t timestamp, int64_t timeout,
        tag_value.datatag.option      = tag->option;
        memcpy(tag_value.datatag.meta, tag->meta, NEU_TAG_META_LENGTH);

+        if (tag->attribute == NEU_ATTRIBUTE_WRITE) {
+            tag_value.value.type         = NEU_TYPE_STRING;
+            tag_value.value.value.str[0] = 0;
+            utarray_push_back(tag_values, &tag_value);
+            continue;
+        }
+
        if (neu_driver_cache_meta_get(cache, group, tag->name, &value,
                                      tag_value.metas,
                                      NEU_TAG_META_SIZE) != 0) {
@@ -315,8 +315,8 @@ UT_array *neu_group_query_read_tag_paginate(neu_group_t *group,
    };

    pthread_mutex_lock(&group->mtx);
-    array = filter_tags_by_page(group->tags, is_readable_and_match_query, &q,
-                                current_page, page_size, total_count);
+    array = filter_tags_by_page(group->tags, match_query, &q, current_page,
+                                page_size, total_count);
    pthread_mutex_unlock(&group->mtx);

    return array;
@@ -1 +1 @@
-2.10.0-alpha
+2.10.0-alpha2
Author	SHA1	Message	Date
fengzeroz	1f67ee6a8e	Merge pull request #2226 from fengzeroz/v2.10 version: 2.10.0-alpha2	2024-09-19 10:22:05 +08:00
fengzero	bceb610b6a	version: 2.10.0-alpha2	2024-09-19 02:21:26 +00:00
fengzeroz	664cd09024	Merge pull request #2221 from hxy7yx/v2.10-1 [2.10]fix(read paginate):handle only_write tags	2024-09-19 10:16:13 +08:00
hxy7yx	f9f86e1f22	fix(read paginate):handle only_write tags	2024-09-18 15:59:50 +08:00
fengzeroz	2a92002eaf	Merge pull request #2218 from fengzeroz/v2.10 ci: rm upload cov	2024-09-14 15:51:56 +08:00
fengzero	01a3f20799	ci: rm upload cov	2024-09-14 07:51:12 +00:00
fengzeroz	904a8dda0a	Merge pull request #2217 from fengzeroz/v2.10 branch v2.10	2024-09-14 15:43:33 +08:00
fengzero	94bf6a0d40	branch v2.10	2024-09-14 07:33:36 +00:00