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/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql
index f0e0c9e..cbe5b17 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.aql
@@ -40,7 +40,7 @@
create index ngram_index on DBLP(authors) type ngram(3);
-write output to nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
// Only the first edit-distance-check can be optimized with an index.
for $o in dataset('DBLP')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql
index df9c802..a40a4de 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.aql
@@ -40,7 +40,7 @@
create index ngram_index on DBLP(authors) type ngram(3);
-write output to nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic-nopanic_01.adm";
// Only the second edit-distance-check can be optimized with an index.
for $o in dataset('DBLP')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
index 89e5e2c..fc3894f 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let-panic.aql
@@ -39,7 +39,7 @@
create index ngram_index on DBLP(authors) type ngram(3);
-write output to nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let-panic.adm";
// This query cannot be optimized with an index, based on the high edit distance.
for $o in dataset('DBLP')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let.aql
index 9374c07..09173ce 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-let.aql
@@ -39,7 +39,7 @@
create index ngram_index on DBLP(authors) type ngram(3);
-write output to nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-let.adm";
for $o in dataset('DBLP')
let $ed := edit-distance-check($o.authors, "Amihay Motro", 1)
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-substring.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-substring.aql
index 8f8d820..73293bc 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-substring.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-substring.aql
@@ -39,7 +39,7 @@
create index ngram_index on DBLP(title) type ngram(3);
-write output to nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-substring.adm";
for $paper in dataset('DBLP')
where edit-distance-check(substring($paper.title, 0, 8), "datbase", 1)[0]
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
index 137a793..30bc42f 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-edit-distance-check-word-tokens.aql
@@ -39,7 +39,7 @@
create index ngram_index on DBLP(title) type ngram(3);
-write output to nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-edit-distance-check-word-tokens.adm";
for $paper in dataset('DBLP')
for $word in word-tokens($paper.title)
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-jaccard-check-let.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-jaccard-check-let.aql
index 5d47e7b..3271c8a 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-jaccard-check-let.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-jaccard-check-let.aql
@@ -40,7 +40,7 @@
create index ngram_index on DBLP(title) type ngram(3);
-write output to nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-let.adm";
for $o in dataset('DBLP')
let $jacc := similarity-jaccard-check(gram-tokens($o.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false), 0.5f)
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-jaccard-check-multi-let.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-jaccard-check-multi-let.aql
index 732f1e8..dfeda68 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-jaccard-check-multi-let.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ngram-jaccard-check-multi-let.aql
@@ -40,7 +40,7 @@
create index ngram_index on DBLP(title) type ngram(3);
-write output to nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_ngram-jaccard-check-multi-let.adm";
// This test is complex because we have three assigns to drill into.
for $paper in dataset('DBLP')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-edit-distance-check-let-panic.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-edit-distance-check-let-panic.aql
index 82d5a1c..2cb65d1 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-edit-distance-check-let-panic.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-edit-distance-check-let-panic.aql
@@ -46,7 +46,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let-panic.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let-panic.adm";
for $c in dataset('Customers')
let $ed := edit-distance-check($c.interests, ["computers", "wine", "walking"], 3)
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-edit-distance-check-let.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-edit-distance-check-let.aql
index 10591c5..9646383 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-edit-distance-check-let.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-edit-distance-check-let.aql
@@ -46,7 +46,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_olist-edit-distance-check-let.adm";
for $c in dataset('Customers')
let $ed := edit-distance-check($c.interests, ["computers", "wine", "walking"], 1)
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-jaccard-check-let.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-jaccard-check-let.aql
index b7da46b..a274b9f 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-jaccard-check-let.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/olist-jaccard-check-let.aql
@@ -46,7 +46,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-complex_olist-jaccard-check-let.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_olist-jaccard-check-let.adm";
for $c in dataset('Customers')
let $jacc := similarity-jaccard-check($c.interests, ["databases", "computers", "wine"], 0.7f)
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ulist-jaccard-check-let.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ulist-jaccard-check-let.aql
index cecc2ea..9d3ca6c 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ulist-jaccard-check-let.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/ulist-jaccard-check-let.aql
@@ -46,7 +46,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-complex_ulist-jaccard-check-let.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_ulist-jaccard-check-let.adm";
for $c in dataset('Customers')
let $jacc := similarity-jaccard-check($c.interests, ["databases", "computers", "wine"], 0.7f)
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/word-jaccard-check-let.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/word-jaccard-check-let.aql
index 81eaea2..d932d23 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/word-jaccard-check-let.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/word-jaccard-check-let.aql
@@ -39,7 +39,7 @@
create index keyword_index on DBLP(title) type keyword;
-write output to nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-let.adm";
for $o in dataset('DBLP')
let $jacc := similarity-jaccard-check(word-tokens($o.title), word-tokens("Transactions for Cooperative Environments"), 0.5f)
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/word-jaccard-check-multi-let.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/word-jaccard-check-multi-let.aql
index 2c2efe6..79fe390 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/word-jaccard-check-multi-let.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-complex/word-jaccard-check-multi-let.aql
@@ -39,7 +39,7 @@
create index keyword_index on DBLP(title) type keyword;
-write output to nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm";
+write output to asterix_nc1:"rttest/inverted-index-complex_word-jaccard-check-multi-let.adm";
// This test is complex because we have three assigns to drill into.
for $paper in dataset('DBLP')