>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18544 )
Change subject: Merge branch 'gerrit/goldfish' into 'master'
......................................................................
Merge branch 'gerrit/goldfish' into 'master'
Change-Id: Ib3821e38271fa4dd589179d25b2c599d885b4292
---
M
asterixdb/asterix-app/src/test/resources/optimizerts/results_cbo/ch2/ch2_q7.plan
2 files changed, 18 insertions(+), 67 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_cbo/ch2/ch2_q7.plan
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_cbo/ch2/ch2_q7.plan
index 3b0b331..0eaee70 100644
---
a/asterixdb/asterix-app/src/test/resources/optimizerts/results_cbo/ch2/ch2_q7.plan
+++
b/asterixdb/asterix-app/src/test/resources/optimizerts/results_cbo/ch2/ch2_q7.plan
@@ -29,33 +29,9 @@
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- STREAM_PROJECT |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE
|PARTITIONED|
-<<<<<<< HEAD (1e0200 Merge commit '79af1625' into 'master')
- -- HYBRID_HASH_JOIN
[$$288][$$304] |PARTITIONED|
- -- HASH_PARTITION_EXCHANGE
[$$288] |PARTITIONED|
-=======
-- HYBRID_HASH_JOIN
[$$326][$$300] |PARTITIONED|
-- HASH_PARTITION_EXCHANGE
[$$326] |PARTITIONED|
->>>>>>> BRANCH (54b332 [ASTERIXDB-3465][STO] Change default cloud read/write
reques)
-- STREAM_PROJECT
|PARTITIONED|
-<<<<<<< HEAD (1e0200 Merge commit '79af1625' into 'master')
- -- ONE_TO_ONE_EXCHANGE
|PARTITIONED|
- -- HYBRID_HASH_JOIN
[$$291, $$293, $$295][$$305, $$306, $$307] |PARTITIONED|
- --
HASH_PARTITION_EXCHANGE [$$291, $$293, $$295] |PARTITIONED|
- -- STREAM_PROJECT
|PARTITIONED|
- --
ONE_TO_ONE_EXCHANGE |PARTITIONED|
- --
HYBRID_HASH_JOIN [$$275, $$276][$$310, $$311] |PARTITIONED|
- --
HASH_PARTITION_EXCHANGE [$$275, $$276] |PARTITIONED|
- --
STREAM_PROJECT |PARTITIONED|
- -- ASSIGN
|PARTITIONED|
- --
STREAM_PROJECT |PARTITIONED|
- --
ONE_TO_ONE_EXCHANGE |PARTITIONED|
- --
DATASOURCE_SCAN (test.stock) |PARTITIONED|
- --
ONE_TO_ONE_EXCHANGE |PARTITIONED|
-
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
- --
HASH_PARTITION_EXCHANGE [$$310, $$311] |PARTITIONED|
- --
STREAM_PROJECT |PARTITIONED|
- --
STREAM_SELECT |PARTITIONED|
-=======
-- ASSIGN |PARTITIONED|
-- STREAM_PROJECT
|PARTITIONED|
-- ONE_TO_ONE_EXCHANGE
|PARTITIONED|
@@ -65,7 +41,6 @@
--
ONE_TO_ONE_EXCHANGE |PARTITIONED|
--
HYBRID_HASH_JOIN [$$275, $$276][$$310, $$311] |PARTITIONED|
--
HASH_PARTITION_EXCHANGE [$$275, $$276] |PARTITIONED|
->>>>>>> BRANCH (54b332 [ASTERIXDB-3465][STO] Change default cloud read/write
reques)
--
STREAM_PROJECT |PARTITIONED|
--
ASSIGN |PARTITIONED|
--
STREAM_PROJECT |PARTITIONED|
@@ -84,47 +59,6 @@
-- ASSIGN |PARTITIONED|
-- STREAM_PROJECT |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-<<<<<<< HEAD (1e0200 Merge commit '79af1625' into 'master')
-
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
- --
HASH_PARTITION_EXCHANGE [$$305, $$306, $$307] |PARTITIONED|
- -- ASSIGN
|PARTITIONED|
- -- STREAM_PROJECT
|PARTITIONED|
- -- ASSIGN
|PARTITIONED|
- --
STREAM_PROJECT |PARTITIONED|
- --
ONE_TO_ONE_EXCHANGE |PARTITIONED|
- --
DATASOURCE_SCAN (test.customer) |PARTITIONED|
- --
ONE_TO_ONE_EXCHANGE |PARTITIONED|
- --
EMPTY_TUPLE_SOURCE |PARTITIONED|
- -- HASH_PARTITION_EXCHANGE
[$$304] |PARTITIONED|
- -- REPLICATE |PARTITIONED|
- -- ONE_TO_ONE_EXCHANGE
|PARTITIONED|
- -- STREAM_PROJECT
|PARTITIONED|
- -- ASSIGN
|PARTITIONED|
- -- STREAM_PROJECT
|PARTITIONED|
- --
ONE_TO_ONE_EXCHANGE |PARTITIONED|
- --
DATASOURCE_SCAN (test.nation) |PARTITIONED|
- --
ONE_TO_ONE_EXCHANGE |PARTITIONED|
- --
EMPTY_TUPLE_SOURCE |PARTITIONED|
- -- BROADCAST_EXCHANGE |PARTITIONED|
- -- STREAM_PROJECT |PARTITIONED|
- -- ASSIGN |PARTITIONED|
- -- ONE_TO_ONE_EXCHANGE
|PARTITIONED|
- -- REPLICATE |PARTITIONED|
- -- ONE_TO_ONE_EXCHANGE
|PARTITIONED|
- -- STREAM_PROJECT
|PARTITIONED|
- -- ASSIGN |PARTITIONED|
- -- STREAM_PROJECT
|PARTITIONED|
- --
ONE_TO_ONE_EXCHANGE |PARTITIONED|
- -- DATASOURCE_SCAN
(test.nation) |PARTITIONED|
- --
ONE_TO_ONE_EXCHANGE |PARTITIONED|
- --
EMPTY_TUPLE_SOURCE |PARTITIONED|
- -- BROADCAST_EXCHANGE |PARTITIONED|
- -- STREAM_PROJECT |PARTITIONED|
- -- ASSIGN |PARTITIONED|
- -- STREAM_PROJECT |PARTITIONED|
- -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
- -- DATASOURCE_SCAN (test.supplier)
|PARTITIONED|
-=======
-- DATASOURCE_SCAN (test.orders) |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
@@ -145,7 +79,6 @@
-- DATASOURCE_SCAN
(test.supplier) |PARTITIONED|
--
ONE_TO_ONE_EXCHANGE |PARTITIONED|
--
EMPTY_TUPLE_SOURCE |PARTITIONED|
->>>>>>> BRANCH (54b332 [ASTERIXDB-3465][STO] Change default cloud read/write
reques)
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- REPLICATE |PARTITIONED|
-- BROADCAST_EXCHANGE
|PARTITIONED|
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18544
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: Ib3821e38271fa4dd589179d25b2c599d885b4292
Gerrit-Change-Number: 18544
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
