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/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index 990decc..0145651 100644
--- a/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++ b/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -107,7 +107,7 @@
public static String[] getNcNames() {
String[] names = new String[NODES];
for (int n = 0; n < NODES; ++n) {
- names[n] = "nc" + (n + 1);
+ names[n] = "asterix_nc" + (n + 1);
}
return names;
}
@@ -115,7 +115,7 @@
public static String[] getDataDirs() {
String[] names = new String[NODES];
for (int n = 0; n < NODES; ++n) {
- names[n] = "nc" + (n + 1) + "data";
+ names[n] = "asterix_nc" + (n + 1) + "data";
}
return names;
}
diff --git a/asterix-app/src/main/resources/asterix-build-configuration.xml b/asterix-app/src/main/resources/asterix-build-configuration.xml
index 8d0b7f3..fa20099 100644
--- a/asterix-app/src/main/resources/asterix-build-configuration.xml
+++ b/asterix-app/src/main/resources/asterix-build-configuration.xml
@@ -17,22 +17,22 @@
! under the License.
!-->
<asterixConfiguration xmlns="asterixconf">
- <metadataNode>nc1</metadataNode>
+ <metadataNode>asterix_nc1</metadataNode>
<store>
- <ncId>nc1</ncId>
- <storeDirs>nc1data</storeDirs>
+ <ncId>asterix_nc1</ncId>
+ <storeDirs>asterix_nc1data</storeDirs>
</store>
<store>
- <ncId>nc2</ncId>
- <storeDirs>nc2data</storeDirs>
+ <ncId>asterix_nc2</ncId>
+ <storeDirs>asterix_nc2data</storeDirs>
</store>
<transactionLogDir>
- <ncId>nc1</ncId>
- <txnLogDirPath>target/txnLogDir/nc1</txnLogDirPath>
+ <ncId>asterix_nc1</ncId>
+ <txnLogDirPath>target/txnLogDir/asterix_nc1</txnLogDirPath>
</transactionLogDir>
<transactionLogDir>
- <ncId>nc2</ncId>
- <txnLogDirPath>target/txnLogDir/nc2</txnLogDirPath>
+ <ncId>asterix_nc2</ncId>
+ <txnLogDirPath>target/txnLogDir/asterix_nc2</txnLogDirPath>
</transactionLogDir>
<property>
@@ -56,7 +56,7 @@
</property>
<property>
<name>compiler.sortmemory</name>
- <value>163840</value>
+ <value>327680</value>
</property>
<property>
<name>compiler.groupmemory</name>