Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(source): fix memory source tuple list #3124

Merged
merged 3 commits into from
Aug 21, 2024
Merged

fix(source): fix memory source tuple list #3124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45242f2
chore: fix lint for deprecate method
ngjaying Aug 21, 2024
e57d9c9
chore(test): run tests in parallel
ngjaying Aug 21, 2024
9a4bf13
fix(source): fix memory source tuple list
ngjaying Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/run_test_case.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion extensions/impl/sql/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{})
}
Expand Down
5 changes: 5 additions & 0 deletions internal/topo/node/source_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions test/run_jmeter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading