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/fuzzyjoin/users-visitors/010-load-users.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
index 34ee680..7ec7194 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
@@ -25,12 +25,12 @@
interests: {{string}}
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Users(UserType)
primary key uid on group1;
load dataset Users
using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///asterix/asterix-app/data/users-visitors-small/users.json"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1:///asterix/asterix-app/data/users-visitors-small/users.json"),("format"="adm")) pre-sorted;
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql
index fc4b2a4..4fd6787 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/020-drop-users.aql
@@ -25,7 +25,7 @@
interests: {{string}}
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Users(UserType)
primary key uid on group1;
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
index 3831c8c..a73db6e 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/030-filter-users.aql
@@ -25,12 +25,12 @@
interests: {{string}}
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Users(UserType)
primary key uid on group1;
-write output to nc1:'/tmp/users.adm';
+write output to asterix_nc1:'/tmp/users.adm';
for $u in dataset('Users')
// where $u.uid > 1
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
index 0c53df3..d59aed9 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
@@ -25,13 +25,13 @@
interests: {{string}}
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Visitors(VisitorType)
primary key vid on group1;
load dataset Visitors
using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///asterix/asterix-app/data/users-visitors-small/visitors.json"),("format"="asm")) pre-sorted;
+(("path"="asterix_nc1:///asterix/asterix-app/data/users-visitors-small/visitors.json"),("format"="asm")) pre-sorted;
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql
index 48c62b3..7be4c8e 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/050-drop-visitors.aql
@@ -25,7 +25,7 @@
interests: {{string}}
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Visitors(VisitorType)
primary key vid on group1;
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
index a54c00d..d5634e7 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/060-fililter-visitors.aql
@@ -25,12 +25,12 @@
interests: {{string}}
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Visitors(VisitorType)
primary key vid on group1;
-write output to nc1:'/tmp/visitors.adm';
+write output to asterix_nc1:'/tmp/visitors.adm';
for $v in dataset('Visitors')
// where $v.vid >= 10
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql
index 15c4e27..4cea4cf 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/070-join-aql-lottery_numbers.aql
@@ -32,14 +32,14 @@
interests: {{string}}
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Users(UserType)
primary key uid on group1;
declare dataset Visitors(VisitorType)
primary key vid on group1;
-write output to nc1:'/tmp/users-visitors.adm';
+write output to asterix_nc1:'/tmp/users-visitors.adm';
//
// -- - Stage 3 - --
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql
index 9c90fa9..c52bb2f 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/080-join-op-lottery_numbers.aql
@@ -32,14 +32,14 @@
interests: {{string}}
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Users(UserType)
primary key uid on group1;
declare dataset Visitors(VisitorType)
primary key vid on group1;
-write output to nc1:'/tmp/users-visitors.adm';
+write output to asterix_nc1:'/tmp/users-visitors.adm';
set simthreshold '.5';
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql
index 7167c3c..b1334c0 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/090-join-op-interests.aql
@@ -32,14 +32,14 @@
interests: {{string}}
}
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
declare dataset Users(UserType)
primary key uid on group1;
declare dataset Visitors(VisitorType)
primary key vid on group1;
-write output to nc1:'/tmp/users-visitors.adm';
+write output to asterix_nc1:'/tmp/users-visitors.adm';
set simthreshold '.5';