>From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20066 )
Change subject: Null merge branch 'gerrit/phoenix' into 'master'
......................................................................
Null merge branch 'gerrit/phoenix' into 'master'
As a number of commits from master have been replayed into
phoenix, perform a null merge commit to enable future merge
commits from phoenix to master
Change-Id: I00e9787583f396e4969904212f7b48e08d437e6b
---
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
4 files changed, 33 insertions(+), 60 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/66/20066/1
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 0ec2e07..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,4 +1,3 @@
-<<<<<<< HEAD (7e36d6 Merge branch 'gerrit/ionic' to 'gerrit/master)
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, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
@@ -16,23 +15,4 @@
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, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-=======
-distribute result [$$18] [cardinality: 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]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$18] <- [{"c": $$c}] project: [$$18] [cardinality: 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]
- -- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 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]
- -- 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]
- -- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 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]
->>>>>>> BRANCH (b76b61 [NO ISSUE][OTH] Keep elapsedTime as float)
-- 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 d87ff1c..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,4 +1,3 @@
-<<<<<<< HEAD (7e36d6 Merge branch 'gerrit/ionic' to 'gerrit/master)
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, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
@@ -16,23 +15,4 @@
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, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-=======
-distribute result [$$18] [cardinality: 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]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$18] <- [{"c": $$c}] project: [$$18] [cardinality: 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]
- -- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 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]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- data-scan []<-[$$19, $$c] <- test.ColumnDataset [cardinality: 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]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- empty-tuple-source [cardinality: 0.0, op-cost: 0.0,
total-cost: 0.0]
->>>>>>> BRANCH (b76b61 [NO ISSUE][OTH] Keep elapsedTime as float)
-- 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 9702f67..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,4 +1,3 @@
-<<<<<<< HEAD (7e36d6 Merge branch 'gerrit/ionic' to 'gerrit/master)
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, doc-size: 0.0, op-cost: 0.0, total-cost: 0.0]
@@ -16,23 +15,4 @@
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, doc-size: 0.0, op-cost:
0.0, total-cost: 0.0]
-=======
-distribute result [$$17] [cardinality: 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]
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- assign [$$17] <- [{"c": $$c}] project: [$$17] [cardinality: 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]
- -- STREAM_SELECT |PARTITIONED|
- project ([$$c]) [cardinality: 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]
- -- 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]
- -- DATASOURCE_SCAN |PARTITIONED|
- exchange [cardinality: 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]
->>>>>>> BRANCH (b76b61 [NO ISSUE][OTH] Keep elapsedTime as float)
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20066
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I00e9787583f396e4969904212f7b48e08d437e6b
Gerrit-Change-Number: 20066
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
