>From Michael Blow <mb...@apache.org>:

Michael Blow has submitted this change. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20067 )

Change subject: += missing auto-merge fixup from f4feb32e89
......................................................................

+= 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>
---
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.008.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.009.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/column/filter/return-array/return-array.007.adm
3 files changed, 39 insertions(+), 27 deletions(-)

Approvals:
  Michael Blow: Looks good to me, approved; Verified




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 65a8abc..bb24b8a 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 2f65f60..1935885 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 1235754..9b20402 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|

--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20067
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: phoenix
Gerrit-Change-Id: Ife66bcc4d78a5e81a43ed765f229d822e733e1b2
Gerrit-Change-Number: 20067
Gerrit-PatchSet: 4
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-MessageType: merged

Reply via email to