fixing incorrect resulting plans of optimizer tests: inconsistent partition variable ordering in hash-exchange
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization@71 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/logging.properties b/asterix-app/src/test/resources/logging.properties
index deb88307..3b4979e 100644
--- a/asterix-app/src/test/resources/logging.properties
+++ b/asterix-app/src/test/resources/logging.properties
@@ -60,6 +60,6 @@
# For example, set the com.xyz.foo logger to only log SEVERE
# messages:
-#edu.uci.ics.asterix.level = FINE
-#edu.uci.ics.algebricks.level = FINE
+edu.uci.ics.asterix.level = FINE
+edu.uci.ics.algebricks.level = FINE
#edu.uci.ics.hyracks.level = INFO
diff --git a/asterix-app/src/test/resources/optimizerts/results/join-super-key_01.plan b/asterix-app/src/test/resources/optimizerts/results/join-super-key_01.plan
index ac5a3a8..7f3d6d7 100644
--- a/asterix-app/src/test/resources/optimizerts/results/join-super-key_01.plan
+++ b/asterix-app/src/test/resources/optimizerts/results/join-super-key_01.plan
@@ -4,14 +4,14 @@
-- ASSIGN |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- HYBRID_HASH_JOIN [$$20, $$22, $$16][$$19, $$23, $$18] |PARTITIONED|
- -- HASH_PARTITION_EXCHANGE [$$16, $$20, $$22] |PARTITIONED|
+ -- HASH_PARTITION_EXCHANGE [$$20, $$22, $$16] |PARTITIONED|
-- STREAM_PROJECT |PARTITIONED|
-- ASSIGN |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- DATASOURCE_SCAN |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
- -- HASH_PARTITION_EXCHANGE [$$19, $$18, $$23] |PARTITIONED|
+ -- HASH_PARTITION_EXCHANGE [$$19, $$23, $$18] |PARTITIONED|
-- STREAM_PROJECT |PARTITIONED|
-- ASSIGN |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
diff --git a/asterix-app/src/test/resources/optimizerts/results/loj-super-key_01.plan b/asterix-app/src/test/resources/optimizerts/results/loj-super-key_01.plan
index 69d63d5..87aac7f 100644
--- a/asterix-app/src/test/resources/optimizerts/results/loj-super-key_01.plan
+++ b/asterix-app/src/test/resources/optimizerts/results/loj-super-key_01.plan
@@ -11,17 +11,17 @@
}
-- ONE_TO_ONE_EXCHANGE |LOCAL|
-- STABLE_SORT [$$22(ASC), $$23(ASC)] |LOCAL|
- -- HASH_PARTITION_EXCHANGE [$$23, $$22] |PARTITIONED|
+ -- HASH_PARTITION_EXCHANGE [$$22, $$23] |PARTITIONED|
-- STREAM_PROJECT |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- HYBRID_HASH_JOIN [$$24, $$22, $$28][$$25, $$19, $$20] |PARTITIONED|
- -- HASH_PARTITION_EXCHANGE [$$22, $$24, $$28] |PARTITIONED|
+ -- HASH_PARTITION_EXCHANGE [$$24, $$22, $$28] |PARTITIONED|
-- ASSIGN |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- DATASOURCE_SCAN |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- EMPTY_TUPLE_SOURCE |PARTITIONED|
- -- HASH_PARTITION_EXCHANGE [$$19, $$20, $$25] |PARTITIONED|
+ -- HASH_PARTITION_EXCHANGE [$$25, $$19, $$20] |PARTITIONED|
-- ASSIGN |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- DATASOURCE_SCAN |PARTITIONED|
diff --git a/asterix-app/src/test/resources/optimizerts/results/nested_loj3.plan b/asterix-app/src/test/resources/optimizerts/results/nested_loj3.plan
index 17cae26..4c7844e 100644
--- a/asterix-app/src/test/resources/optimizerts/results/nested_loj3.plan
+++ b/asterix-app/src/test/resources/optimizerts/results/nested_loj3.plan
@@ -29,7 +29,7 @@
-- STREAM_PROJECT |PARTITIONED|
-- ONE_TO_ONE_EXCHANGE |PARTITIONED|
-- HYBRID_HASH_JOIN [$$48, $$50][$$34, $$35] |PARTITIONED|
- -- HASH_PARTITION_EXCHANGE [$$50, $$48] |PARTITIONED|
+ -- HASH_PARTITION_EXCHANGE [$$48, $$50] |PARTITIONED|
-- HYBRID_HASH_JOIN [$$40][$$37] |PARTITIONED|
-- HASH_PARTITION_EXCHANGE [$$40] |PARTITIONED|
-- STREAM_PROJECT |PARTITIONED|
diff --git a/asterix-app/src/test/resources/optimizerts/results/q3_shipping_priority.plan b/asterix-app/src/test/resources/optimizerts/results/q3_shipping_priority.plan
index 1302637..80badee 100644
--- a/asterix-app/src/test/resources/optimizerts/results/q3_shipping_priority.plan
+++ b/asterix-app/src/test/resources/optimizerts/results/q3_shipping_priority.plan
@@ -12,7 +12,7 @@
-- AGGREGATE |LOCAL|
-- NESTED_TUPLE_SOURCE |LOCAL|
}
- -- HASH_PARTITION_EXCHANGE [$$55, $$57, $$56] |PARTITIONED|
+ -- HASH_PARTITION_EXCHANGE [$$55, $$56, $$57] |PARTITIONED|
-- EXTERNAL_GROUP_BY[$$42, $$46, $$39] |LOCAL|
{
-- AGGREGATE |LOCAL|