Ian Maxon has submitted this change and it was merged. Change subject: [NO ISSUE] Eliminate BAD dependency on managix ......................................................................
[NO ISSUE] Eliminate BAD dependency on managix Change-Id: I702b532a03a39ac9b53a4c1f2c4e5f3868cb7700 --- A asterix-bad/src/main/resources/cc.conf M asterix-bad/src/test/java/org/apache/asterix/bad/test/BADAsterixHyracksIntegrationUtil.java M asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java M asterix-bad/src/test/java/org/apache/asterix/bad/test/BADOptimizerTest.java 4 files changed, 62 insertions(+), 9 deletions(-) Approvals: Steven Jacobs: Looks good to me, approved Jenkins: Verified diff --git a/asterix-bad/src/main/resources/cc.conf b/asterix-bad/src/main/resources/cc.conf new file mode 100644 index 0000000..14005e8 --- /dev/null +++ b/asterix-bad/src/main/resources/cc.conf @@ -0,0 +1,59 @@ +; Licensed to the Apache Software Foundation (ASF) under one +; or more contributor license agreements. See the NOTICE file +; distributed with this work for additional information +; regarding copyright ownership. The ASF licenses this file +; to you under the Apache License, Version 2.0 (the +; "License"); you may not use this file except in compliance +; with the License. You may obtain a copy of the License at +; +; http://www.apache.org/licenses/LICENSE-2.0 +; +; Unless required by applicable law or agreed to in writing, +; software distributed under the License is distributed on an +; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +; KIND, either express or implied. See the License for the +; specific language governing permissions and limitations +; under the License. + +[nc/asterix_nc1] +txn.log.dir=target/tmp/asterix_nc1/txnlog +core.dump.dir=target/tmp/asterix_nc1/coredump +iodevices=target/tmp/asterix_nc1/iodevice1,../asterix-server/target/tmp/asterix_nc1/iodevice2 +#jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006 + +[nc/asterix_nc2] +ncservice.port=9091 +nc.api.port=19005 +txn.log.dir=target/tmp/asterix_nc2/txnlog +core.dump.dir=target/tmp/asterix_nc2/coredump +iodevices=target/tmp/asterix_nc2/iodevice1,../asterix-server/target/tmp/asterix_nc2/iodevice2 + +#jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5007 + +[nc] +address=127.0.0.1 +command=asterixnc +app.class=org.apache.asterix.hyracks.bootstrap.NCApplication +jvm.args=-Xmx4096m -Dnode.Resolver="org.apache.asterix.external.util.IdentitiyResolverFactory" +storage.buffercache.pagesize=32KB +storage.buffercache.size=48MB +storage.memorycomponent.numpages=16 +storage.memorycomponent.globalbudget=512MB + +[cc] +address = 127.0.0.1 +app.class=org.apache.asterix.hyracks.bootstrap.CCApplication +heartbeat.period=2000 + +[common] +log.level = INFO +compiler.framesize=32KB +compiler.sortmemory=320KB +compiler.groupmemory=160KB +compiler.joinmemory=256KB +messaging.frame.size=4096 +messaging.frame.count=512 + +[extension/org.apache.asterix.bad.lang.BADQueryTranslatorExtension] +[extension/org.apache.asterix.bad.lang.BADLangExtension] +[extension/org.apache.asterix.bad.metadata.BADMetadataExtension] diff --git a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADAsterixHyracksIntegrationUtil.java b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADAsterixHyracksIntegrationUtil.java index 65c184c..0a2beed 100644 --- a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADAsterixHyracksIntegrationUtil.java +++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADAsterixHyracksIntegrationUtil.java @@ -36,7 +36,6 @@ } } - @Override protected void run(boolean cleanupOnStart, boolean cleanupOnShutdown, String loadExternalLibs) throws Exception { Runtime.getRuntime().addShutdownHook(new Thread() { @Override @@ -48,10 +47,7 @@ } } }); - System.setProperty(GlobalConfig.CONFIG_FILE_PROPERTY, - "asterixdb/asterix-opt/asterix-bad/src/main/resources/asterix-build-configuration.xml"); - - init(cleanupOnStart); + init(cleanupOnStart, "asterixdb/asterix-opt/asterix-bad/src/main/resources/cc.conf"); while (true) { Thread.sleep(10000); } diff --git a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java index 57c9738..bc24e9f 100644 --- a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java +++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADExecutionTest.java @@ -48,7 +48,7 @@ protected static final String PATH_BASE = StringUtils.join(new String[] { "src", "test", "resources", "runtimets" }, File.separator); - protected static final String TEST_CONFIG_FILE_NAME = "src/main/resources/asterix-build-configuration.xml"; + protected static final String TEST_CONFIG_FILE_NAME = "src/main/resources/cc.conf"; protected static TransactionProperties txnProperties; private static final TestExecutor testExecutor = new TestExecutor(); diff --git a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADOptimizerTest.java b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADOptimizerTest.java index 36ba481..090354d 100644 --- a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADOptimizerTest.java +++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADOptimizerTest.java @@ -38,15 +38,13 @@ @BeforeClass public static void setUp() throws Exception { - TEST_CONFIG_FILE_NAME = "src/main/resources/asterix-build-configuration.xml"; - System.setProperty(GlobalConfig.CONFIG_FILE_PROPERTY, TEST_CONFIG_FILE_NAME); final File outdir = new File(PATH_ACTUAL); outdir.mkdirs(); extensionLangCompilationProvider = new BADCompilationProvider(); statementExecutorFactory = new BADQueryTranslatorFactory(); - integrationUtil.init(true); + integrationUtil.init(true,TEST_CONFIG_FILE_NAME); // 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, -- To view, visit https://asterix-gerrit.ics.uci.edu/2194 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I702b532a03a39ac9b53a4c1f2c4e5f3868cb7700 Gerrit-PatchSet: 5 Gerrit-Project: asterixdb-bad Gerrit-Branch: master Gerrit-Owner: Ian Maxon <ima...@apache.org> Gerrit-Reviewer: Ian Maxon <ima...@apache.org> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Steven Jacobs <sjaco...@ucr.edu>