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/metadata-transactions/check-state-queries/check_dataset.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataset.aql
index 87953a8..3f68ed8 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataset.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataset.aql
@@ -18,7 +18,7 @@
*/
use dataverse Metadata;
-write output to nc1:"rttest/check_dataset.adm";
+write output to asterix_nc1:"rttest/check_dataset.adm";
for $c in dataset('Dataset')
return $c
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_datatype.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_datatype.aql
index 5d6e16d..64b8318 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_datatype.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_datatype.aql
@@ -18,7 +18,7 @@
*/
use dataverse Metadata;
-write output to nc1:"rttest/check_datatype.adm";
+write output to asterix_nc1:"rttest/check_datatype.adm";
for $c in dataset('Datatype')
return $c
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataverse.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataverse.aql
index c7e7663..17eb021 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataverse.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_dataverse.aql
@@ -18,7 +18,7 @@
*/
use dataverse Metadata;
-write output to nc1:"rttest/check_dataverse.adm";
+write output to asterix_nc1:"rttest/check_dataverse.adm";
for $c in dataset('Dataverse')
return $c
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_index.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_index.aql
index a672d57..1796f9f 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_index.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_index.aql
@@ -18,7 +18,7 @@
*/
use dataverse Metadata;
-write output to nc1:"rttest/check_index.adm";
+write output to asterix_nc1:"rttest/check_index.adm";
for $c in dataset('Index')
return $c
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_node.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_node.aql
index 57a2569..bd42fa2 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_node.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_node.aql
@@ -18,7 +18,7 @@
*/
use dataverse Metadata;
-write output to nc1:"rttest/check_node.adm";
+write output to asterix_nc1:"rttest/check_node.adm";
for $c in dataset('Node')
return $c
diff --git a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_nodegroup.aql b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_nodegroup.aql
index 5841224..35cd7e0 100644
--- a/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_nodegroup.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/check-state-queries/check_nodegroup.aql
@@ -18,7 +18,7 @@
*/
use dataverse Metadata;
-write output to nc1:"rttest/check_nodegroup.adm";
+write output to asterix_nc1:"rttest/check_nodegroup.adm";
for $c in dataset('Nodegroup')
return $c
diff --git a/asterix-app/src/test/resources/metadata-transactions/init-state-queries/customers_orders.aql b/asterix-app/src/test/resources/metadata-transactions/init-state-queries/customers_orders.aql
index 74650ac..50d5d13 100644
--- a/asterix-app/src/test/resources/metadata-transactions/init-state-queries/customers_orders.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/init-state-queries/customers_orders.aql
@@ -59,7 +59,7 @@
} ]
}
-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, name on group1;
diff --git a/asterix-app/src/test/resources/metadata-transactions/queries/create_duplicate_nodegroup.aql b/asterix-app/src/test/resources/metadata-transactions/queries/create_duplicate_nodegroup.aql
index 2b15b2c..a6b09b5 100644
--- a/asterix-app/src/test/resources/metadata-transactions/queries/create_duplicate_nodegroup.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/queries/create_duplicate_nodegroup.aql
@@ -18,4 +18,4 @@
*/
use dataverse custord;
-create nodegroup group1 on nc1, nc2;
+create nodegroup group1 on asterix_nc1, asterix_nc2;
diff --git a/asterix-app/src/test/resources/metadata-transactions/queries/rollback_new_nodegroup.aql b/asterix-app/src/test/resources/metadata-transactions/queries/rollback_new_nodegroup.aql
index 672ca46..deaff04 100644
--- a/asterix-app/src/test/resources/metadata-transactions/queries/rollback_new_nodegroup.aql
+++ b/asterix-app/src/test/resources/metadata-transactions/queries/rollback_new_nodegroup.aql
@@ -19,7 +19,7 @@
use dataverse custord;
// Creating this nodegroup should succeed.
-create nodegroup newgroup if not exists on nc1, nc2;
+create nodegroup newgroup if not exists on asterix_nc1, asterix_nc2;
// Creating this duplicate type should fail, and rollback should remove the new nodegroup.
create type StreetType as closed {