Run ExecutionTest w/integration test framework
I changed the default local.xml to use 2 NCs with
2 partitions each like AsterixHyracksIntegrationUtil
so that the results will match despite using simple
string compare to determine correctness.
There is also one test in particular (big-object-join)
that I had to add an artificial order by clause to
to deal with different results.
Issues outstanding:
- HDFS in ClusterExecutionIT needs to be thought out
Change-Id: I423f2a7c77839b999d466dd5cace302574d956c0
Reviewed-on: https://asterix-gerrit.ics.uci.edu/525
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Chris Hillery <ceej@lambda.nu>
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
index 841d3eb..f69d2c8 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
@@ -55,7 +55,7 @@
create index msgCountBIx on TweetMessages(countB) type btree;
create index msgTextIx on TweetMessages(message-text) type keyword;
-write output to nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_01.adm";
for $t1 in dataset('TweetMessages')
where $t1.tweetid < int64("10")
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
index e756921..a326108 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
@@ -55,7 +55,7 @@
create index msgCountBIx on TweetMessages(countB) type btree;
create index msgTextIx on TweetMessages(message-text) type keyword;
-write output to nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
+write output to asterix_nc1:"rttest/btree-index-join_leftouterjoin-probe-pidx-with-join-btree-sidx_02.adm";
for $t1 in dataset('TweetMessages')
where $t1.tweetid < int64("10")
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_01.aql
index 8e7ea26..f247132 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_01.aql
@@ -34,7 +34,7 @@
create dataset Names(Name) primary key fname,lname;
-write output to nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_01.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_01.adm";
for $emp1 in dataset('Names')
for $emp2 in dataset('Names')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_02.aql
index 34203a3..1c04e5b 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_02.aql
@@ -34,7 +34,7 @@
create dataset Names(Name) primary key fname,lname;
-write output to nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_02.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_02.adm";
for $emp1 in dataset('Names')
for $emp2 in dataset('Names')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_03.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_03.aql
index fc1a578..8b52af5 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_03.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-join_03.aql
@@ -34,7 +34,7 @@
create dataset Names(Name) primary key fname,lname;
-write output to nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_03.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-join_03.adm";
for $emp1 in dataset('Names')
for $emp2 in dataset('Names')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_01.aql
index 974afc4..e03febf 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_01.aql
@@ -34,7 +34,7 @@
create dataset Names(Name) primary key fname,lname;
-write output to nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_01.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_01.adm";
for $emp1 in dataset('Names')
for $emp2 in dataset('Names')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_02.aql
index 1c3b244..99ea3de 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_02.aql
@@ -34,7 +34,7 @@
create dataset Names(Name) primary key fname,lname;
-write output to nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_02.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_02.adm";
for $emp1 in dataset('Names')
for $emp2 in dataset('Names')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_03.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_03.aql
index 39a37c8..195eeb4 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_03.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_03.aql
@@ -34,7 +34,7 @@
create dataset Names(Name) primary key fname,lname;
-write output to nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_03.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_03.adm";
for $emp1 in dataset('Names')
for $emp2 in dataset('Names')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_04.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_04.aql
index 213bd27..5fe30db 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_04.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_04.aql
@@ -34,7 +34,7 @@
create dataset Names(Name) primary key fname,lname;
-write output to nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_04.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_04.adm";
for $emp1 in dataset('Names')
for $emp2 in dataset('Names')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_05.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_05.aql
index 3c623d0..2ccaca3 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_05.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_05.aql
@@ -34,7 +34,7 @@
create dataset Names(Name) primary key fname,lname;
-write output to nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_05.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_05.adm";
for $emp1 in dataset('Names')
for $emp2 in dataset('Names')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_06.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_06.aql
index 7f3749e..c9767af 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_06.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-composite-key-prefix-join_06.aql
@@ -34,7 +34,7 @@
create dataset Names(Name) primary key fname,lname;
-write output to nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_06.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-composite-key-prefix-prefix-join_06.adm";
for $emp1 in dataset('Names')
for $emp2 in dataset('Names')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-multipred.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-multipred.aql
index e4c140c..9e8a987 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-multipred.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-multipred.aql
@@ -58,7 +58,7 @@
create dataset Customers(CustomerType) primary key cid;
create dataset Orders(OrderType) primary key oid;
-write output to nc1:"rttest/btree-index-join_primary-equi-join-multipred.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-multipred.adm";
for $c in dataset('Customers')
for $o in dataset('Orders')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_01.aql
index c9e1fa5..1815c66 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_01.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-equi-join-neg_01.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_01.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_02.aql
index 62d299c..057f9a5 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join-neg_02.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-equi-join-neg_02.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join-neg_02.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_01.aql
index d0532b2..48e7965 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_01.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is a HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-equi-join_01.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_01.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_02.aql
index 8574856..a4b5264 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_02.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is a HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-equi-join_02.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_02.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_03.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_03.aql
index 407e617..025b101 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_03.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_03.aql
@@ -56,7 +56,7 @@
create dataset Customers(CustomerType) primary key cid;
create dataset Orders(OrderType) primary key oid;
-write output to nc1:"rttest/btree-index-join_primary-equi-join_04.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_04.adm";
for $c in dataset('Customers')
for $o in dataset('Orders')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_04.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_04.aql
index c1e0844..1775c6a 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_04.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_04.aql
@@ -56,7 +56,7 @@
create dataset Customers(CustomerType) primary key cid;
create dataset Orders(OrderType) primary key oid;
-write output to nc1:"rttest/btree-index-join_primary-equi-join_05.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_05.adm";
for $o in dataset('Orders')
for $c in dataset('Customers')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_05.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_05.aql
index 52506e9..f8525cf 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_05.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-equi-join_05.aql
@@ -46,7 +46,7 @@
create dataset Customers(CustomerType) primary key cid;
-write output to nc1:"rttest/btree-index-join_primary-equi-join_06.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-equi-join_06.adm";
for $c1 in dataset('Customers')
for $c2 in dataset('Customers')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_01.aql
index ddb2684..5ae298c 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_01.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-ge-join_01.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_01.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_02.aql
index 71616c0..745361f 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-ge-join_02.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-ge-join_02.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-ge-join_02.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_01.aql
index 4dcee85..f0d1853 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_01.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-gt-join_01.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_01.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_02.aql
index 7c3ac55..935b884 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-gt-join_02.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-gt-join_02.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-gt-join_02.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_01.aql
index 05850d0..a880f16 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_01.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-le-join_01.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_01.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_02.aql
index f28be44..34d128d 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-le-join_02.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-le-join_02.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-le-join_02.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_01.aql
index e814409..e87265c 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_01.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-lt-join_01.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_01.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_02.aql
index d30d31f..b629d54 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-lt-join_02.aql
@@ -38,7 +38,7 @@
// Please note content enclosed in the comment in the predicate is the HINT to the optimizer
-write output to nc1:"rttest/btree-index-join_primary-lt-join_02.adm";
+write output to asterix_nc1:"rttest/btree-index-join_primary-lt-join_02.adm";
for $x in dataset('test1.DsOne')
for $y in dataset('test1.DsTwo')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multiindex.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multiindex.aql
index d304b3b..bb4ad1b 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multiindex.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multiindex.aql
@@ -64,7 +64,7 @@
create index fbmIdxAutId if not exists on FacebookMessages(author-id-copy);
-write output to nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm";
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multiindex.adm";
for $user in dataset('FacebookUsers')
for $message in dataset('FacebookMessages')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multipred.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multipred.aql
index 923187c..dd4ca77 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multipred.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join-multipred.aql
@@ -51,7 +51,7 @@
create index title_index on DBLP(title);
-write output to nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm";
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join-multipred.adm";
for $a in dataset('DBLP')
for $b in dataset('CSX')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_01.aql
index 068e7cd..4de7a0b 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_01.aql
@@ -49,7 +49,7 @@
create index title_index on DBLP(title);
-write output to nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm";
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_01.adm";
for $a in dataset('DBLP')
for $b in dataset('CSX')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_02.aql
index 4703954..5bdacc3 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_02.aql
@@ -49,7 +49,7 @@
create index title_index on CSX(title);
-write output to nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_02.adm";
for $a in dataset('DBLP')
for $b in dataset('CSX')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_03.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_03.aql
index 92247b9..33bb320 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_03.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-equi-join_03.aql
@@ -39,7 +39,7 @@
create index title_index on DBLP(title);
-write output to nc1:"rttest/btree-index-join_title-secondary-equi-join_03.adm";
+write output to asterix_nc1:"rttest/btree-index-join_title-secondary-equi-join_03.adm";
for $a in dataset('DBLP')
for $b in dataset('DBLP')