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/parserts/queries/del-dataset.aql b/asterix-app/src/test/resources/parserts/queries/del-dataset.aql
index cf624a5..b2d7d22 100644
--- a/asterix-app/src/test/resources/parserts/queries/del-dataset.aql
+++ b/asterix-app/src/test/resources/parserts/queries/del-dataset.aql
@@ -39,7 +39,7 @@
city: string
}
-create nodegroup group1 if not exists on nc1, nc2;
+create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
create dataset Customers(CustomerType)
primary key cid on group1;
diff --git a/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql b/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql
index 8f113e0..cad7125 100644
--- a/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql
+++ b/asterix-app/src/test/resources/parserts/queries/load-del-dataset.aql
@@ -39,12 +39,12 @@
city: string
}
-create nodegroup group1 if not exists on nc1, nc2;
+create nodegroup group1 if not exists on asterix_nc1, asterix_nc2;
create dataset Customers(CustomerType)
primary key cid on group1;
load dataset Customers
using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/customerData.json"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1:///tmp/customerData.json"),("format"="adm")) pre-sorted;
diff --git a/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp b/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
index e9600e4..cf993bf 100644
--- a/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
+++ b/asterix-app/src/test/resources/parserts/queries_sqlpp/del-dataset.sqlpp
@@ -44,8 +44,8 @@
}
create nodegroup group1 if not exists on
- nc1,
- nc2
+ asterix_nc1,
+ asterix_nc2
;
create table Customers(CustomerType) primary key cid on group1;
diff --git a/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp b/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
index d08a13b..59abd97 100644
--- a/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
+++ b/asterix-app/src/test/resources/parserts/queries_sqlpp/load-del-dataset.sqlpp
@@ -44,10 +44,10 @@
}
create nodegroup group1 if not exists on
- nc1,
- nc2
+ asterix_nc1,
+ asterix_nc2
;
create table Customers(CustomerType) primary key cid on group1;
-load table Customers using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter" (("path"="nc1:///tmp/customerData.json"),("format"="adm")) pre-sorted;
+load table Customers using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter" (("path"="asterix_nc1:///tmp/customerData.json"),("format"="adm")) pre-sorted;