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-basic/ngram-contains-panic.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-contains-panic.aql
index 2822866..488ed70 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-contains-panic.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-contains-panic.aql
@@ -38,7 +38,7 @@
create index ngram_index on DBLP(title) type ngram(3);
-write output to nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains-panic.adm";
// Cannot optimize this query because the string constant is shorter than the gram length.
for $o in dataset('DBLP')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-contains.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-contains.aql
index 3b41a96..ba460a6 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-contains.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-contains.aql
@@ -38,7 +38,7 @@
create index ngram_index on DBLP(title) type ngram(3);
-write output to nc1:"rttest/inverted-index-basic_ngram-contains.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-contains.adm";
for $o in dataset('DBLP')
where contains($o.title, "Multimedia")
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-check-panic.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-check-panic.aql
index 8f59bbf..4d0219c 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-check-panic.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-check-panic.aql
@@ -38,7 +38,7 @@
create index ngram_index on DBLP(authors) type ngram(3);
-write output to nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-panic.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check-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-basic/ngram-edit-distance-check.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-check.aql
index 392fb41..81780a2 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-check.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-check.aql
@@ -38,7 +38,7 @@
create index ngram_index on DBLP(authors) type ngram(3);
-write output to nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-check.adm";
for $o in dataset('DBLP')
where edit-distance-check($o.authors, "Amihay Motro", 1)[0]
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-panic.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-panic.aql
index f39a622..aa51e50 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-panic.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance-panic.aql
@@ -38,7 +38,7 @@
create index ngram_index on DBLP(authors) type ngram(3);
-write output to nc1:"rttest/inverted-index-basic_ngram-edit-distance-panic.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance-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-basic/ngram-edit-distance.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance.aql
index 8c23176..6917878 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-edit-distance.aql
@@ -38,7 +38,7 @@
create index ngram_index on DBLP(authors) type ngram(3);
-write output to nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-edit-distance.adm";
for $o in dataset('DBLP')
where edit-distance($o.authors, "Amihay Motro") <= 1
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql
index fc3eebb..b4d342c 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-fuzzyeq-edit-distance.aql
@@ -38,7 +38,7 @@
create index ngram_index on DBLP(authors) type ngram(3);
-write output to nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-edit-distance.adm";
set simfunction 'edit-distance';
set simthreshold '1';
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-fuzzyeq-jaccard.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-fuzzyeq-jaccard.aql
index 33cc61a..55f1830 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-fuzzyeq-jaccard.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-fuzzyeq-jaccard.aql
@@ -39,7 +39,7 @@
create index ngram_index on DBLP(title) type ngram(3);
-write output to nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-fuzzyeq-jaccard.adm";
set simfunction 'jaccard';
set simthreshold '0.8f';
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-jaccard-check.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-jaccard-check.aql
index fa9bdc2..c7d273d 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-jaccard-check.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-jaccard-check.aql
@@ -39,7 +39,7 @@
create index ngram_index on DBLP(title) type ngram(3);
-write output to nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard-check.adm";
for $o in dataset('DBLP')
where similarity-jaccard-check(gram-tokens($o.title, 3, false), gram-tokens("Transactions for Cooperative Environments", 3, false), 0.5f)[0]
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-jaccard.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-jaccard.aql
index 6f3eeaf..da87bc0 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-jaccard.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ngram-jaccard.aql
@@ -39,7 +39,7 @@
create index ngram_index on DBLP(title) type ngram(3);
-write output to nc1:"rttest/inverted-index-basic_ngram-jaccard.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ngram-jaccard.adm";
for $o in dataset('DBLP')
where similarity-jaccard(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-basic/olist-edit-distance-check-panic.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-check-panic.aql
index b3683d1..88b0d58 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-check-panic.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-check-panic.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_olist-edit-distance-check-panic.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check-panic.adm";
// Index should not be applied because all list elements can be modified by 3 edit operations.
for $c in dataset('Customers')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-check.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-check.aql
index 89764a7..d107b68 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-check.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-check.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_olist-edit-distance-check.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-check.adm";
for $c in dataset('Customers')
where edit-distance-check($c.interests, ["computers", "wine", "walking"], 1)[0]
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-panic.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-panic.aql
index 2d315dd..f4d5e14 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-panic.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance-panic.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_olist-edit-distance-panic.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance-panic.adm";
// Index should not be applied because all list elements can be modified by 3 edit operations.
for $c in dataset('Customers')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance.aql
index 6d011f3..687e55d 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-edit-distance.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_olist-edit-distance.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-edit-distance.adm";
for $c in dataset('Customers')
where edit-distance($c.interests, ["computers", "wine", "walking"]) <= 1
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-fuzzyeq-edit-distance.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-fuzzyeq-edit-distance.aql
index 3659f0d..8833eaf 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-fuzzyeq-edit-distance.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-fuzzyeq-edit-distance.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_olist-fuzzyeq-edit-distance.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-edit-distance.adm";
set simfunction 'edit-distance';
set simthreshold '1';
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-fuzzyeq-jaccard.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-fuzzyeq-jaccard.aql
index 219f355..d0df75f 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-fuzzyeq-jaccard.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-fuzzyeq-jaccard.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_olist-fuzzyeq-jaccard.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-fuzzyeq-jaccard.adm";
set simfunction 'jaccard';
set simthreshold '0.8f';
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-jaccard-check.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-jaccard-check.aql
index 1f5ef22..97e9962 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-jaccard-check.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-jaccard-check.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_olist-jaccard-check.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard-check.adm";
for $c in dataset('Customers')
where similarity-jaccard-check($c.interests, ["databases", "computers", "wine"], 0.7f)[0]
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-jaccard.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-jaccard.aql
index 2712ce0..329b26a 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-jaccard.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/olist-jaccard.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_olist-jaccard.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_olist-jaccard.adm";
for $c in dataset('Customers')
where similarity-jaccard($c.interests, ["databases", "computers", "wine"]) >= 0.7f
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-fuzzyeq-jaccard.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-fuzzyeq-jaccard.aql
index 5454526..c20493a 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-fuzzyeq-jaccard.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-fuzzyeq-jaccard.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_ulist-fuzzyeq-jaccard.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ulist-fuzzyeq-jaccard.adm";
set simfunction 'jaccard';
set simthreshold '0.8f';
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-jaccard-check.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-jaccard-check.aql
index 14c27de..cb6c0c4 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-jaccard-check.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-jaccard-check.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_ulist-jaccard.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm";
for $c in dataset('Customers')
where similarity-jaccard-check($c.interests, {{"computers", "wine", "databases"}}, 0.7f)[0]
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-jaccard.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-jaccard.aql
index 17a3520..c0cdd4f 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-jaccard.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/ulist-jaccard.aql
@@ -45,7 +45,7 @@
create index interests_index on Customers(interests) type keyword;
-write output to nc1:"rttest/inverted-index-basic_ulist-jaccard.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_ulist-jaccard.adm";
for $c in dataset('Customers')
where similarity-jaccard($c.interests, {{"computers", "databases", "wine"}}) >= 0.7f
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-contains.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-contains.aql
index 3180470..191a9bf 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-contains.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-contains.aql
@@ -38,7 +38,7 @@
create index keyword_index on DBLP(title) type keyword;
-write output to nc1:"rttest/inverted-index-basic_word-contains.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_word-contains.adm";
// Contains cannot be answered with a word inverted index.
for $o in dataset('DBLP')
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-fuzzyeq-jaccard.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-fuzzyeq-jaccard.aql
index afd0b1b..ad2c577 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-fuzzyeq-jaccard.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-fuzzyeq-jaccard.aql
@@ -38,7 +38,7 @@
create index keyword_index on DBLP(title) type keyword;
-write output to nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_word-fuzzyeq-jaccard.adm";
set simfunction 'jaccard';
set simthreshold '0.5f';
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-jaccard-check.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-jaccard-check.aql
index 967e4d3..6f4497f 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-jaccard-check.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-jaccard-check.aql
@@ -38,7 +38,7 @@
create index keyword_index on DBLP(title) type keyword;
-write output to nc1:"rttest/inverted-index-basic_word-jaccard-check.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard-check.adm";
for $o in dataset('DBLP')
where similarity-jaccard-check(word-tokens($o.title), word-tokens("Transactions for Cooperative Environments"), 0.5f)[0]
diff --git a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-jaccard.aql b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-jaccard.aql
index 52debf0..c96de32 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-jaccard.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/inverted-index-basic/word-jaccard.aql
@@ -38,7 +38,7 @@
create index keyword_index on DBLP(title) type keyword;
-write output to nc1:"rttest/inverted-index-basic_word-jaccard.adm";
+write output to asterix_nc1:"rttest/inverted-index-basic_word-jaccard.adm";
for $o in dataset('DBLP')
where similarity-jaccard(word-tokens($o.title), word-tokens("Transactions for Cooperative Environments")) >= 0.5f