Till Westmann has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1083
Change subject: non-static AsterixHyracksIntegrationUtil
......................................................................
non-static AsterixHyracksIntegrationUtil
Change-Id: I52bb7c4059cd0c808e404619f9bcc02cb3eafd73
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
M asterixdb/asterix-app/src/main/java/org/apache/asterix/drivers/AsterixCLI.java
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dml/DmlTest.java
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTestUtil.java
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java
8 files changed, 47 insertions(+), 34 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/83/1083/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index cc50b75..0376a12 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -45,13 +45,13 @@
public static final int DEFAULT_HYRACKS_CC_CLIENT_PORT = 1098;
public static final int DEFAULT_HYRACKS_CC_CLUSTER_PORT = 1099;
- public static ClusterControllerService cc;
- public static NodeControllerService[] ncs;
- public static IHyracksClientConnection hcc;
+ public ClusterControllerService cc;
+ public NodeControllerService[] ncs;
+ public IHyracksClientConnection hcc;
- private static AsterixPropertiesAccessor propertiesAccessor;
+ private AsterixPropertiesAccessor propertiesAccessor;
- public static void init(boolean deleteOldInstanceData) throws Exception {
+ public void init(boolean deleteOldInstanceData) throws Exception {
propertiesAccessor = new AsterixPropertiesAccessor();
ncs = new
NodeControllerService[propertiesAccessor.getNodeNames().size()];
if (deleteOldInstanceData) {
@@ -68,7 +68,6 @@
ccConfig.resultTTL = 30000;
ccConfig.resultSweepThreshold = 1000;
ccConfig.appCCMainClass = CCApplicationEntryPoint.class.getName();
- // ccConfig.useJOL = true;
cc = new ClusterControllerService(ccConfig);
cc.start();
@@ -130,15 +129,15 @@
hcc = new HyracksConnection(cc.getConfig().clientNetIpAddress,
cc.getConfig().clientNetPort);
}
- public static String[] getNcNames() {
+ public String[] getNcNames() {
return propertiesAccessor.getNodeNames().toArray(new
String[propertiesAccessor.getNodeNames().size()]);
}
- public static IHyracksClientConnection getHyracksClientConnection() {
+ public IHyracksClientConnection getHyracksClientConnection() {
return hcc;
}
- public static void deinit(boolean deleteOldInstanceData) throws Exception {
+ public void deinit(boolean deleteOldInstanceData) throws Exception {
//stop NCs
ArrayList<Thread> stopNCThreads = new ArrayList<>();
for (int n = 0; n < ncs.length; ++n) {
@@ -174,14 +173,14 @@
}
}
- public static void runJob(JobSpecification spec) throws Exception {
+ public void runJob(JobSpecification spec) throws Exception {
GlobalConfig.ASTERIX_LOGGER.info(spec.toJSON().toString());
JobId jobId = hcc.startJob(spec, EnumSet.of(JobFlag.PROFILE_RUNTIME));
GlobalConfig.ASTERIX_LOGGER.info(jobId.toString());
hcc.waitForCompletion(jobId);
}
- public static void removeTestStorageFiles() {
+ public void removeTestStorageFiles() {
File dir = new File(System.getProperty(IO_DIR_KEY));
for (String ncName : propertiesAccessor.getNodeNames()) {
File ncDir = new File(dir, ncName);
@@ -189,7 +188,7 @@
}
}
- private static void deleteTransactionLogs() throws Exception {
+ private void deleteTransactionLogs() throws Exception {
for (String ncId : propertiesAccessor.getNodeNames()) {
File log = new
File(propertiesAccessor.getTransactionLogDirs().get(ncId));
if (log.exists()) {
@@ -206,11 +205,12 @@
* unused
*/
public static void main(String[] args) {
+ AsterixHyracksIntegrationUtil ahiu = new
AsterixHyracksIntegrationUtil();
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
try {
- deinit(false);
+ ahiu.deinit(false);
} catch (Exception e) {
e.printStackTrace();
}
@@ -219,7 +219,7 @@
try {
System.setProperty(GlobalConfig.CONFIG_FILE_PROPERTY,
"asterix-build-configuration.xml");
- init(false);
+ ahiu.init(false);
while (true) {
Thread.sleep(10000);
}
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/drivers/AsterixCLI.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/drivers/AsterixCLI.java
index cc4b40c..a5fdfe5 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/drivers/AsterixCLI.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/drivers/AsterixCLI.java
@@ -45,6 +45,8 @@
public List<String> args;
}
+ private static AsterixHyracksIntegrationUtil ahiu = new
AsterixHyracksIntegrationUtil();
+
public static void main(String args[]) throws Exception {
Options options = new Options();
CmdLineParser parser = new CmdLineParser(options);
@@ -55,7 +57,7 @@
for (String queryFile : options.args) {
Reader in = new FileReader(queryFile);
AsterixJavaClient ajc = new AsterixJavaClient(
-
AsterixHyracksIntegrationUtil.getHyracksClientConnection(), in,
compilationProvider);
+ ahiu.getHyracksClientConnection(), in,
compilationProvider);
try {
ajc.compile(true, false, false, false, false, true, false);
} finally {
@@ -80,11 +82,11 @@
File lsn = new File("last_checkpoint_lsn");
lsn.deleteOnExit();
- AsterixHyracksIntegrationUtil.init(false);
+ ahiu.init(false);
}
public static void tearDown() throws Exception {
- AsterixHyracksIntegrationUtil.deinit(false);
+ ahiu.deinit(false);
}
}
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
index 5c3aefe..2ef2044 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
@@ -105,6 +105,8 @@
private static final boolean cleanupOnStart = true;
private static final boolean cleanupOnStop = true;
+ private static AsterixHyracksIntegrationUtil ahiu = new
AsterixHyracksIntegrationUtil();
+
// Constants
public static final int DEFAULT_HYRACKS_CC_CLIENT_PORT = 1098;
public static final int DEFAULT_HYRACKS_CC_CLUSTER_PORT = 1099;
@@ -133,7 +135,7 @@
}
jobletCtx = Mockito.mock(IHyracksJobletContext.class);
Mockito.when(jobletCtx.getApplicationContext())
-
.thenReturn(AsterixHyracksIntegrationUtil.ncs[0].getApplicationContext());
+ .thenReturn(ahiu.ncs[0].getApplicationContext());
Mockito.when(jobletCtx.getJobId()).thenAnswer(new Answer<JobId>() {
@Override
public JobId answer(InvocationOnMock invocation) throws Throwable {
@@ -248,7 +250,7 @@
}
public ConstantFileSplitProvider getFileSplitProvider(Dataset dataset) {
- FileSplit fileSplit = new
FileSplit(AsterixHyracksIntegrationUtil.ncs[0].getId(),
+ FileSplit fileSplit = new FileSplit(ahiu.ncs[0].getId(),
dataset.getDataverseName() + File.separator +
dataset.getDatasetName());
return new ConstantFileSplitProvider(new FileSplit[] { fileSplit });
}
@@ -367,12 +369,12 @@
ctx = Mockito.spy(ctx);
Mockito.when(ctx.getJobletContext()).thenReturn(jobletCtx);
Mockito.when(ctx.getIOManager())
-
.thenReturn(AsterixHyracksIntegrationUtil.ncs[0].getRootContext().getIOManager());
+ .thenReturn(ahiu.ncs[0].getRootContext().getIOManager());
return ctx;
}
public TransactionSubsystem getTransactionSubsystem() {
- return (TransactionSubsystem) ((AsterixAppRuntimeContext)
AsterixHyracksIntegrationUtil.ncs[0]
+ return (TransactionSubsystem) ((AsterixAppRuntimeContext) ahiu.ncs[0]
.getApplicationContext().getApplicationObject()).getTransactionSubsystem();
}
@@ -381,7 +383,7 @@
}
public AsterixAppRuntimeContext getAppRuntimeContext() {
- return (AsterixAppRuntimeContext)
AsterixHyracksIntegrationUtil.ncs[0].getApplicationContext()
+ return (AsterixAppRuntimeContext) ahiu.ncs[0].getApplicationContext()
.getApplicationObject();
}
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dml/DmlTest.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dml/DmlTest.java
index 0a22f1c..b81e991 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dml/DmlTest.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dml/DmlTest.java
@@ -46,6 +46,8 @@
private static final PrintWriter ERR = new PrintWriter(System.err);
private final TestExecutor testExecutor = new TestExecutor();
+ private static AsterixHyracksIntegrationUtil ahiu = new
AsterixHyracksIntegrationUtil();
+
@Test
public void enlistTest() throws Exception {
File outdir = new File(PATH_ACTUAL);
@@ -54,11 +56,11 @@
}
outdir.mkdirs();
- AsterixHyracksIntegrationUtil.init(true);
+ ahiu.init(true);
Reader loadReader = new BufferedReader(
new InputStreamReader(new
FileInputStream(LOAD_FOR_ENLIST_FILE), "UTF-8"));
AsterixJavaClient asterixLoad = new AsterixJavaClient(
- AsterixHyracksIntegrationUtil.getHyracksClientConnection(),
loadReader, ERR,
+ ahiu.getHyracksClientConnection(), loadReader, ERR,
new AqlCompilationProvider());
try {
asterixLoad.compile(true, false, false, false, false, true, false);
@@ -69,7 +71,7 @@
}
asterixLoad.execute();
- AsterixHyracksIntegrationUtil.deinit(true);
+ ahiu.deinit(true);
for (String d : ASTERIX_DATA_DIRS) {
testExecutor.deleteRec(new File(d));
}
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java
index 4089646..a3629e6 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java
@@ -48,18 +48,19 @@
private static final String TEST_CONFIG_FILE_NAME =
"asterix-build-configuration.xml";
private static final TestExecutor testExecutor = new TestExecutor();
+ private static AsterixHyracksIntegrationUtil ahiu = new
AsterixHyracksIntegrationUtil();
@BeforeClass
public static void setUp() throws Exception {
System.setProperty(GlobalConfig.CONFIG_FILE_PROPERTY,
TEST_CONFIG_FILE_NAME);
File outdir = new File(PATH_ACTUAL);
outdir.mkdirs();
- AsterixHyracksIntegrationUtil.init(true);
+ ahiu.init(true);
}
@AfterClass
public static void tearDown() throws Exception {
- AsterixHyracksIntegrationUtil.deinit(true);
+ ahiu.deinit(true);
File outdir = new File(PATH_ACTUAL);
File[] files = outdir.listFiles();
if (files == null || files.length == 0) {
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java
index d0be428..7ff5e93 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java
@@ -73,6 +73,8 @@
private static final ILangCompilationProvider aqlCompilationProvider = new
AqlCompilationProvider();
private static final ILangCompilationProvider sqlppCompilationProvider =
new SqlppCompilationProvider();
+ private static AsterixHyracksIntegrationUtil ahiu = new
AsterixHyracksIntegrationUtil();
+
@BeforeClass
public static void setUp() throws Exception {
System.setProperty(GlobalConfig.CONFIG_FILE_PROPERTY,
TEST_CONFIG_FILE_NAME);
@@ -81,7 +83,7 @@
HDFSCluster.getInstance().setup();
- AsterixHyracksIntegrationUtil.init(true);
+ ahiu.init(true);
// Set the node resolver to be the identity resolver that expects node
names
// to be node controller ids; a valid assumption in test environment.
System.setProperty(ExternalDataConstants.NODE_RESOLVER_FACTORY_PROPERTY,
@@ -98,7 +100,7 @@
HDFSCluster.getInstance().cleanup();
- AsterixHyracksIntegrationUtil.deinit(true);
+ ahiu.deinit(true);
}
private static void suiteBuildPerFile(File file, Collection<Object[]>
testArgs, String path) {
@@ -168,7 +170,7 @@
PrintWriter plan = new PrintWriter(actualFile);
ILangCompilationProvider provider =
queryFile.getName().endsWith("aql") ? aqlCompilationProvider
: sqlppCompilationProvider;
- IHyracksClientConnection hcc =
AsterixHyracksIntegrationUtil.getHyracksClientConnection();
+ IHyracksClientConnection hcc = ahiu.getHyracksClientConnection();
AsterixJavaClient asterix = new AsterixJavaClient(hcc, query,
plan, provider);
try {
asterix.compile(true, false, false, true, true, false, false);
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTestUtil.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTestUtil.java
index 813def3..0544865 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTestUtil.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTestUtil.java
@@ -46,6 +46,8 @@
protected static TestGroup FailedGroup;
+ private static AsterixHyracksIntegrationUtil ahiu = new
AsterixHyracksIntegrationUtil();
+
public static List<ILibraryManager> setUp(boolean cleanup) throws
Exception {
System.out.println("Starting setup");
if (LOGGER.isLoggable(Level.INFO)) {
@@ -56,7 +58,7 @@
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("initializing pseudo cluster");
}
- AsterixHyracksIntegrationUtil.init(cleanup);
+ ahiu.init(cleanup);
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("initializing HDFS");
@@ -77,7 +79,7 @@
// Adds the library manager for CC.
libraryManagers.add(AsterixAppContextInfo.getInstance().getLibraryManager());
// Adds library managers for NCs, one-per-NC.
- for (NodeControllerService nc : AsterixHyracksIntegrationUtil.ncs) {
+ for (NodeControllerService nc : ahiu.ncs) {
IAsterixAppRuntimeContext runtimeCtx = (IAsterixAppRuntimeContext)
nc.getApplicationContext()
.getApplicationObject();
libraryManagers.add(runtimeCtx.getLibraryManager());
@@ -87,7 +89,7 @@
public static void tearDown(boolean cleanup) throws Exception {
// validateBufferCacheState(); <-- Commented out until bug is fixed -->
- AsterixHyracksIntegrationUtil.deinit(cleanup);
+ ahiu.deinit(cleanup);
File outdir = new File(PATH_ACTUAL);
File[] files = outdir.listFiles();
if (files == null || files.length == 0) {
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java
index b827a0d..de6a213 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppExecutionTest.java
@@ -55,6 +55,8 @@
private static final boolean cleanupOnStart = true;
private static final boolean cleanupOnStop = true;
+ private static AsterixHyracksIntegrationUtil ahiu = new
AsterixHyracksIntegrationUtil();
+
protected static TestGroup FailedGroup;
@BeforeClass
@@ -67,7 +69,7 @@
@AfterClass
public static void tearDown() throws Exception {
ExecutionTestUtil.tearDown(cleanupOnStop);
- AsterixHyracksIntegrationUtil.removeTestStorageFiles();
+ ahiu.removeTestStorageFiles();
}
@Parameters(name = "SqlppExecutionTest {index}: {0}")
--
To view, visit https://asterix-gerrit.ics.uci.edu/1083
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52bb7c4059cd0c808e404619f9bcc02cb3eafd73
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <[email protected]>
