Optimized the use of HyracksConnection
git-svn-id: https://asterixdb.googlecode.com/svn/trunk/asterix@32 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java
index 754ccd0..ae29617 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/aql/TestsUtils.java
@@ -20,13 +20,13 @@
import edu.uci.ics.asterix.api.aqlj.client.IAQLJConnection;
import edu.uci.ics.asterix.api.aqlj.client.IAQLJResult;
import edu.uci.ics.asterix.api.aqlj.common.AQLJException;
-import edu.uci.ics.asterix.api.common.AsterixHyracksIntegrationUtil;
import edu.uci.ics.asterix.api.java.AsterixJavaClient;
import edu.uci.ics.asterix.common.exceptions.AsterixException;
import edu.uci.ics.asterix.om.base.IAObject;
import edu.uci.ics.asterix.om.types.ARecordType;
import edu.uci.ics.asterix.om.types.AbstractCollectionType;
import edu.uci.ics.asterix.om.types.IAType;
+import edu.uci.ics.hyracks.api.client.IHyracksClientConnection;
public class TestsUtils {
@@ -46,16 +46,16 @@
return path.delete();
}
- public static void runScriptAndCompareWithResult(File scriptFile, PrintWriter print, File expectedFile,
- File actualFile) throws Exception {
+ public static void runScriptAndCompareWithResult(IHyracksClientConnection hcc, File scriptFile, PrintWriter print,
+ File expectedFile, File actualFile) throws Exception {
Reader query = new BufferedReader(new FileReader(scriptFile));
- AsterixJavaClient asterix = new AsterixJavaClient(query, print);
+ AsterixJavaClient asterix = new AsterixJavaClient(hcc, query, print);
try {
asterix.compile(true, false, false, false, false, true, false);
} catch (AsterixException e) {
throw new Exception("Compile ERROR for " + scriptFile + ": " + e.getMessage(), e);
}
- asterix.execute(AsterixHyracksIntegrationUtil.DEFAULT_HYRACKS_CC_CLIENT_PORT);
+ asterix.execute();
query.close();
BufferedReader readerExpected = new BufferedReader(new FileReader(expectedFile));
BufferedReader readerActual = new BufferedReader(new FileReader(actualFile));
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/dml/DmlTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/dml/DmlTest.java
index 201b497..6864ec3 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/dml/DmlTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/dml/DmlTest.java
@@ -6,8 +6,6 @@
import java.io.PrintWriter;
import java.io.Reader;
-import org.junit.Test;
-
import edu.uci.ics.asterix.api.common.AsterixHyracksIntegrationUtil;
import edu.uci.ics.asterix.api.java.AsterixJavaClient;
import edu.uci.ics.asterix.common.exceptions.AsterixException;
@@ -37,13 +35,14 @@
AsterixHyracksIntegrationUtil.init();
Reader loadReader = new BufferedReader(new FileReader(LOAD_FOR_ENLIST_FILE));
- AsterixJavaClient asterixLoad = new AsterixJavaClient(loadReader, ERR);
+ AsterixJavaClient asterixLoad = new AsterixJavaClient(
+ AsterixHyracksIntegrationUtil.getHyracksClientConnection(), loadReader, ERR);
try {
asterixLoad.compile(true, false, false, false, false, true, false);
} catch (AsterixException e) {
throw new Exception("Compile ERROR for " + LOAD_FOR_ENLIST_FILE + ": " + e.getMessage(), e);
}
- asterixLoad.execute(AsterixHyracksIntegrationUtil.DEFAULT_HYRACKS_CC_CLIENT_PORT);
+ asterixLoad.execute();
AsterixHyracksIntegrationUtil.destroyApp();
AsterixHyracksIntegrationUtil.createApp();
@@ -51,7 +50,8 @@
String resultFileName = TestsUtils.aqlExtToResExt(enlistFile.getName());
File expectedFile = new File(PATH_EXPECTED + SEPARATOR + resultFileName);
File actualFile = new File(PATH_ACTUAL + SEPARATOR + resultFileName);
- TestsUtils.runScriptAndCompareWithResult(enlistFile, ERR, expectedFile, actualFile);
+ TestsUtils.runScriptAndCompareWithResult(AsterixHyracksIntegrationUtil.getHyracksClientConnection(),
+ enlistFile, ERR, expectedFile, actualFile);
AsterixHyracksIntegrationUtil.deinit();
for (String d : ASTERIX_DATA_DIRS) {
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java
index 46a068c..416734f 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java
@@ -145,7 +145,8 @@
@Test
public void test() throws Exception {
Reader query = new BufferedReader(new FileReader(queryFile));
- AsterixJavaClient asterix = new AsterixJavaClient(query, ERR);
+ AsterixJavaClient asterix = new AsterixJavaClient(AsterixHyracksIntegrationUtil.getHyracksClientConnection(),
+ query, ERR);
try {
LOGGER.info("Query is: " + queryFile);
asterix.compile(true, false, false, false, false, true, false);
@@ -153,7 +154,7 @@
} catch (AsterixException e) {
throw new Exception("Compile ERROR for " + queryFile + ": " + e.getMessage(), e);
}
- asterix.execute(AsterixHyracksIntegrationUtil.DEFAULT_HYRACKS_CC_CLIENT_PORT);
+ asterix.execute();
query.close();
if (actualFile.exists()) {
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTransactionsTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTransactionsTest.java
index 22cb378..5fc3599 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTransactionsTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTransactionsTest.java
@@ -81,13 +81,14 @@
String actualFileName = (String) queryTuple[2];
try {
Reader query = new BufferedReader(new FileReader(queryFileName));
- AsterixJavaClient asterix = new AsterixJavaClient(query, ERR);
+ AsterixJavaClient asterix = new AsterixJavaClient(
+ AsterixHyracksIntegrationUtil.getHyracksClientConnection(), query, ERR);
LOGGER.info("Query is: " + queryFileName);
asterix.compile(true, false, false, false, false, executeQuery, false);
// We don't want to execute a query if we expect only DDL
// modifications.
if (executeQuery) {
- asterix.execute(AsterixHyracksIntegrationUtil.DEFAULT_HYRACKS_CC_CLIENT_PORT);
+ asterix.execute();
}
query.close();
} catch (Exception e) {
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/optimizer/OptimizerTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/optimizer/OptimizerTest.java
index 6ca8aef..5d0071e 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/optimizer/OptimizerTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/optimizer/OptimizerTest.java
@@ -123,7 +123,7 @@
Reader query = new BufferedReader(new FileReader(queryFile));
PrintWriter plan = new PrintWriter(actualFile);
- AsterixJavaClient asterix = new AsterixJavaClient(query, plan);
+ AsterixJavaClient asterix = new AsterixJavaClient(null, query, plan);
try {
asterix.compile(true, false, false, false, true, true, false);
} catch (AsterixException e) {
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/RuntimeTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/RuntimeTest.java
index e101e2b..0aa755c 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/RuntimeTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/RuntimeTest.java
@@ -44,6 +44,7 @@
private static final String[] ASTERIX_DATA_DIRS = new String[] { "nc1data", "nc2data" };
private static final Logger LOGGER = Logger.getLogger(RuntimeTest.class.getName());
+
// private static NCBootstrapImpl _bootstrap = new NCBootstrapImpl();
private static ArrayList<String> readFile(String fileName) {
@@ -83,12 +84,10 @@
lsn.deleteOnExit();
AsterixHyracksIntegrationUtil.init();
- // _bootstrap.start();
}
@AfterClass
public static void tearDown() throws Exception {
- // _bootstrap.stop();
AsterixHyracksIntegrationUtil.deinit();
File outdir = new File(PATH_ACTUAL);
File[] files = outdir.listFiles();
@@ -151,7 +150,8 @@
}
Assume.assumeTrue(!TestHelper.isInPrefixList(ignore, queryFileShort));
LOGGER.severe("RUNNING TEST: " + queryFile + " \n");
- TestsUtils.runScriptAndCompareWithResult(queryFile, ERR, expectedFile, actualFile);
+ TestsUtils.runScriptAndCompareWithResult(AsterixHyracksIntegrationUtil.getHyracksClientConnection(),
+ queryFile, ERR, expectedFile, actualFile);
} catch (Exception e) {
if (!(e instanceof AssumptionViolatedException)) {
LOGGER.severe("Test \"" + queryFile.getPath() + "\" FAILED!");