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/demo1112/local/01-load-cust.aql b/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
index 9f3f7e3..15d4d78 100644
--- a/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
+++ b/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
@@ -35,12 +35,12 @@
city: string
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Customers(CustomerType)
primary key cid on group1;
load dataset Customers
using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
+(("path"="asterix_nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
diff --git a/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql b/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
index c46d422..5feb7ac 100644
--- a/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
+++ b/asterix-app/src/test/resources/demo1112/local/02-filter-cust.aql
@@ -35,12 +35,12 @@
city: string
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Customers(CustomerType)
primary key cid on group1;
-write output to nc1:"/tmp/mycustomers.adm";
+write output to asterix_nc1:"/tmp/mycustomers.adm";
for $c in dataset('Customers')
where $c.age < 21
diff --git a/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql b/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
index 75edfa9..367d1d6 100644
--- a/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
+++ b/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
@@ -27,11 +27,11 @@
total: float
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Orders(OrderType)
primary key oid on group1;
load dataset Orders
using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/orderData.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1:///tmp/orderData.adm"),("format"="adm")) pre-sorted;
diff --git a/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql b/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
index d492520..90d5543 100644
--- a/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
+++ b/asterix-app/src/test/resources/demo1112/local/04-join-custord.aql
@@ -45,14 +45,14 @@
total: float
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Customers(CustomerType)
primary key cid on group1;
declare dataset Orders(OrderType)
primary key oid on group1;
-write output to nc1:"/tmp/custorder.adm";
+write output to asterix_nc1:"/tmp/custorder.adm";
for $c in dataset('Customers')
for $o in dataset('Orders')