From 45242f2dbfe000a603c4c2b327a07a9eb06049d0 Mon Sep 17 00:00:00 2001 From: Jiyong Huang Date: Wed, 21 Aug 2024 11:00:48 +0800 Subject: [PATCH 1/3] chore: fix lint for deprecate method Signed-off-by: Jiyong Huang --- extensions/impl/sql/source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/impl/sql/source.go b/extensions/impl/sql/source.go index d506efd830..1e15bf165b 100644 --- a/extensions/impl/sql/source.go +++ b/extensions/impl/sql/source.go @@ -208,7 +208,7 @@ func prepareValues(values []interface{}, columnTypes []*sql.ColumnType, columns if len(columnTypes) > 0 { for idx, columnType := range columnTypes { if columnType.ScanType() != nil { - values[idx] = reflect.New(reflect.PtrTo(columnType.ScanType())).Interface() + values[idx] = reflect.New(reflect.PointerTo(columnType.ScanType())).Interface() } else { values[idx] = new(interface{}) } From e57d9c906206b32225b59c9015ce8506569c9318 Mon Sep 17 00:00:00 2001 From: Jiyong Huang Date: Wed, 21 Aug 2024 13:44:24 +0800 Subject: [PATCH 2/3] chore(test): run tests in parallel Signed-off-by: Jiyong Huang --- .github/workflows/run_test_case.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run_test_case.yaml b/.github/workflows/run_test_case.yaml index 7f37f43e52..e56af857e6 100644 --- a/.github/workflows/run_test_case.yaml +++ b/.github/workflows/run_test_case.yaml @@ -89,12 +89,11 @@ jobs: path: fvt_coverage.xml run_fvt_tests: - needs: - - run_unit_tests uses: ./.github/workflows/run_fvt_tests.yaml upload_coverage: needs: + - run_unit_tests - run_fvt_tests runs-on: ubuntu-latest steps: From 9a4bf138a1a0c3669f8e7112a3a87beed9ebef0c Mon Sep 17 00:00:00 2001 From: Jiyong Huang Date: Wed, 21 Aug 2024 14:40:03 +0800 Subject: [PATCH 3/3] fix(source): fix memory source tuple list Signed-off-by: Jiyong Huang --- internal/topo/node/source_node.go | 5 +++++ test/run_jmeter.sh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/topo/node/source_node.go b/internal/topo/node/source_node.go index 775c60f51e..055e66533d 100644 --- a/internal/topo/node/source_node.go +++ b/internal/topo/node/source_node.go @@ -20,6 +20,7 @@ import ( "github.com/lf-edge/ekuiper/contract/v2/api" + "github.com/lf-edge/ekuiper/v2/internal/io/memory/pubsub" "github.com/lf-edge/ekuiper/v2/internal/pkg/def" "github.com/lf-edge/ekuiper/v2/internal/xsql" "github.com/lf-edge/ekuiper/v2/pkg/cast" @@ -120,6 +121,10 @@ func (m *SourceNode) ingestAnyTuple(ctx api.StreamContext, data any, meta map[st for _, mm := range mess { m.ingestTuple(mm, ts) } + case []pubsub.MemTuple: + for _, mm := range mess { + m.ingestTuple(mm.(*xsql.Tuple), ts) + } default: // should never happen panic(fmt.Sprintf("receive wrong data %v", data)) diff --git a/test/run_jmeter.sh b/test/run_jmeter.sh index a8016da0d2..0523245be5 100755 --- a/test/run_jmeter.sh +++ b/test/run_jmeter.sh @@ -83,8 +83,8 @@ echo -e "---------------------------------------------\n" /opt/jmeter/bin/jmeter.sh -Jjmeter.save.saveservice.output_format=xml -n -t test/select_aggr_rule_order.jmx -l jmeter_logs/select_aggr_rule_order.jtl -j jmeter_logs/select_aggr_rule_order.log echo -e "---------------------------------------------\n" -# /opt/jmeter/bin/jmeter.sh -Jjmeter.save.saveservice.output_format=xml -n -t test/rule_pipeline.jmx -l jmeter_logs/rule_pipeline.jtl -j jmeter_logs/rule_pipeline.log -# echo -e "---------------------------------------------\n" +/opt/jmeter/bin/jmeter.sh -Jjmeter.save.saveservice.output_format=xml -n -t test/rule_pipeline.jmx -l jmeter_logs/rule_pipeline.jtl -j jmeter_logs/rule_pipeline.log +echo -e "---------------------------------------------\n" if test $with_edgex = true; then /opt/jmeter/bin/jmeter.sh -Jjmeter.save.saveservice.output_format=xml -n -t test/select_edgex_condition_rule.jmx -Dbase="$base_dir" -Dfvt="$fvt_dir" -l jmeter_logs/select_edgex_condition_rule.jtl -j jmeter_logs/select_edgex_condition_rule.log