This is an automated email from the ASF dual-hosted git repository.
preetham02 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 20eb5ff4f459881507326d764697b0fbf0cd9f58
Author: Michael Blow <michael.b...@couchbase.com>
AuthorDate: Thu Jul 10 13:53:09 2025 -0400
+= missing auto-merge fixup from f4feb32e89
Change-Id: Ife66bcc4d78a5e81a43ed765f229d822e733e1b2
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20067
Reviewed-by: Michael Blow <mb...@apache.org>
Tested-by: Michael Blow <mb...@apache.org>
---
.../column/filter/return-array/return-array.007.adm | 18 +++++++++---------
.../column/filter/return-array/return-array.008.adm | 18 +++++++++---------
.../column/filter/return-array/return-array.009.adm | 18 +++++++++---------
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.007.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.007.adm
index 65a8abc378..bb24b8a2e5 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.007.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.007.adm
@@ -1,18 +1,18 @@
-distribute result [$$18] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+distribute result [$$18] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- DISTRIBUTE_RESULT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$18] <- [{"c": $$c}] project: [$$18] [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
+ assign [$$18] <- [{"c": $$c}] project: [$$18] [cardinality: 0.0, doc-size:
0.0, op-cost: 0.0, total-cost: 0.0]
-- ASSIGN |PARTITIONED|
- select (eq(numeric-add($$c.getField("n").getField("x"), 1), 13))
[cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ select (eq(numeric-add($$c.getField("n").getField("x"), 1), 13))
[cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ project ([$$c]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- STREAM_PROJECT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost:
0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- data-scan []<-[$$19, $$c] <- test.ColumnDataset filter on:
eq(numeric-add($$c.getField("n").getField("x"), 1), 13) [cardinality: 0.0,
op-cost: 0.0, total-cost: 0.0]
+ data-scan []<-[$$19, $$c] <- test.ColumnDataset filter on:
eq(numeric-add($$c.getField("n").getField("x"), 1), 13) [cardinality: 0.0,
doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- empty-tuple-source [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
+ empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.008.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.008.adm
index 2f65f60a7d..1935885504 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.008.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.008.adm
@@ -1,18 +1,18 @@
-distribute result [$$18] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+distribute result [$$18] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- DISTRIBUTE_RESULT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$18] <- [{"c": $$c}] project: [$$18] [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
+ assign [$$18] <- [{"c": $$c}] project: [$$18] [cardinality: 0.0, doc-size:
0.0, op-cost: 0.0, total-cost: 0.0]
-- ASSIGN |PARTITIONED|
- select (eq($$c.getField("nested_field").getField("array_field"),
ordered-list-constructor(1, "a", true))) [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
+ select (eq($$c.getField("nested_field").getField("array_field"),
ordered-list-constructor(1, "a", true))) [cardinality: 0.0, doc-size: 0.0,
op-cost: 0.0, total-cost: 0.0]
-- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ project ([$$c]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- STREAM_PROJECT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost:
0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- data-scan []<-[$$19, $$c] <- test.ColumnDataset [cardinality: 0.0,
op-cost: 0.0, total-cost: 0.0]
+ data-scan []<-[$$19, $$c] <- test.ColumnDataset [cardinality: 0.0,
doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- empty-tuple-source [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
+ empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.009.adm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.009.adm
index 1235754525..9b20402c8e 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.009.adm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.009.adm
@@ -1,18 +1,18 @@
-distribute result [$$17] [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+distribute result [$$17] [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- DISTRIBUTE_RESULT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$17] <- [{"c": $$c}] project: [$$17] [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
+ assign [$$17] <- [{"c": $$c}] project: [$$17] [cardinality: 0.0, doc-size:
0.0, op-cost: 0.0, total-cost: 0.0]
-- ASSIGN |PARTITIONED|
- select (eq($$c.getField("nested_field").getField("a"), 1)) [cardinality:
0.0, op-cost: 0.0, total-cost: 0.0]
+ select (eq($$c.getField("nested_field").getField("a"), 1)) [cardinality:
0.0, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
-- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ project ([$$c]) [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- STREAM_PROJECT |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0, total-cost:
0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- data-scan []<-[$$18, $$c] <- test.ColumnDataset filter on:
eq($$c.getField("nested_field").getField("a"), 1) range-filter on:
eq($$c.getField("nested_field").getField("a"), 1) [cardinality: 0.0, op-cost:
0.0, total-cost: 0.0]
+ data-scan []<-[$$18, $$c] <- test.ColumnDataset filter on:
eq($$c.getField("nested_field").getField("a"), 1) range-filter on:
eq($$c.getField("nested_field").getField("a"), 1) [cardinality: 0.0, doc-size:
0.0, op-cost: 0.0, total-cost: 0.0]
-- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 0.0, op-cost: 0.0, total-cost: 0.0]
+ exchange [cardinality: 0.0, doc-size: 0.0, op-cost: 0.0,
total-cost: 0.0]
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- empty-tuple-source [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
+ empty-tuple-source [cardinality: 0.0, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
