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/skip-index/dont-skip-primary-index.aql b/asterix-app/src/test/resources/optimizerts/queries/skip-index/dont-skip-primary-index.aql
index 66685fa..69f2f24 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/skip-index/dont-skip-primary-index.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/skip-index/dont-skip-primary-index.aql
@@ -27,7 +27,7 @@
create dataverse test;
use dataverse test;
-write output to nc1:"rttest/btree-index_btree-primary-16.adm";
+write output to asterix_nc1:"rttest/btree-index_btree-primary-16.adm";
create type TestType as open {
fname : string,
diff --git a/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-ngram-index.aql b/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-ngram-index.aql
index 0758ea0..e52276f 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-ngram-index.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-ngram-index.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 /*+ skip-index */ test.contains($o.title, "Multimedia")
diff --git a/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql b/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql
index 3ffac85..537c9a0 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-rtree-secondary-index.aql
@@ -38,19 +38,19 @@
circle: circle
}
-create nodegroup group1 if not exists on nc1, nc2;
+create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
create dataset MyData(MyRecord)
primary key id on group1;
load dataset MyData
using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
create index rtree_index_point on MyData(point) type rtree;
-write output to nc1:"rttest/index_rtree-secondary-index.adm";
+write output to asterix_nc1:"rttest/index_rtree-secondary-index.adm";
for $o in dataset('MyData')
where /*+ skip-index */ spatial-intersect($o.point, create-polygon([4.0,1.0,4.0,4.0,12.0,4.0,12.0,1.0]))
diff --git a/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index-2.aql b/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index-2.aql
index c5047b2..b8c7a8a 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index-2.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index-2.aql
@@ -26,7 +26,7 @@
create dataverse test;
use dataverse test;
-write output to nc1:"rttest/btree-index_btree-secondary-57.adm";
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
create type TestType as open {
id : int32,
diff --git a/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index.aql b/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index.aql
index 4cd3c54..fedb963 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-secondary-btree-index.aql
@@ -26,7 +26,7 @@
create dataverse test;
use dataverse test;
-write output to nc1:"rttest/btree-index_btree-secondary-57.adm";
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-57.adm";
create type TestType as open {
id : int32,
diff --git a/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-word-index.aql b/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-word-index.aql
index 30726c5..5347b38 100644
--- a/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-word-index.aql
+++ b/asterix-app/src/test/resources/optimizerts/queries/skip-index/skip-word-index.aql
@@ -39,7 +39,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')
let $jacc := /*+ skip-index */ similarity-jaccard(word-tokens($o.title), word-tokens("Transactions for Cooperative Environments"))