Xikui Wang has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3022
Change subject: [NO ISSUE][BAD] BAD clean-ups
......................................................................
[NO ISSUE][BAD] BAD clean-ups
Details:
1. Cleaned up dependencies which are not used.
2. Changed logging to use log4j.
3. Refactored BADExecutionTest to be consistent with master.
4. Cleaned up test cases to make sure every test case is independent.
5. Unused file removed.
Change-Id: I76c5d201a95f71a8f9bfd2461620145c0c27a08d
---
M asterix-bad/pom.xml
M asterix-bad/src/main/java/org/apache/asterix/bad/BADJobService.java
M
asterix-bad/src/main/java/org/apache/asterix/bad/metadata/DeployedJobSpecEventListener.java
M
asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
M
asterix-bad/src/main/java/org/apache/asterix/bad/runtime/NotifyBrokerRuntime.java
D asterix-bad/src/main/resources/asterix-build-configuration.xml
M asterix-bad/src/main/resources/cc.conf
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
M asterix-bad/src/test/java/org/apache/asterix/bad/test/BADRecoveryTest.java
D asterix-bad/src/test/resources/conf/cluster.xml
D asterix-bad/src/test/resources/conf/hyracks-deployment.properties
A asterix-bad/src/test/resources/conf/log4j2-bad.xml
D asterix-bad/src/test/resources/conf/test.properties
A asterix-bad/src/test/resources/runtimets/only_bad.xml
M
asterix-bad/src/test/resources/runtimets/queries/channel/drop_function/drop_function.1.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/channel/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/channel/drop_index/drop_index.1.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/channel/drop_results/drop_results.1.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/channel/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp
A
asterix-bad/src/test/resources/runtimets/queries/procedure/create_procedure_check_metadata/create_procedure_check_metadata.3.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_dataset/delete_procedure_drop_dataset.1.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_function/delete_procedure_drop_function.1.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_index/delete_procedure_drop_index.1.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure_drop_dataset/insert_procedure_drop_dataset.1.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure_drop_dataverse/insert_procedure_drop_dataverse.1.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure_drop_dataset/query_procedure_drop_dataset.1.ddl.sqlpp
M
asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure_drop_function/query_procedure_drop_function.1.ddl.sqlpp
R asterix-bad/src/test/resources/runtimets/testsuite_bad.xml
29 files changed, 251 insertions(+), 405 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb-bad
refs/changes/22/3022/1
diff --git a/asterix-bad/pom.xml b/asterix-bad/pom.xml
index d6c0602..6396b36 100644
--- a/asterix-bad/pom.xml
+++ b/asterix-bad/pom.xml
@@ -28,7 +28,7 @@
<asterix.version>0.9.5-SNAPSHOT</asterix.version>
<hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
<source-format.skip>true</source-format.skip>
-
<testLog4jConfigFile>${root.dir}/../../asterix-app/src/test/resources/log4j2-test.xml</testLog4jConfigFile>
+
<testLog4jConfigFile>${root.dir}/src/test/resources/conf/log4j2-bad.xml</testLog4jConfigFile>
</properties>
<build>
<plugins>
@@ -153,25 +153,16 @@
<version>2.10</version>
<configuration>
<usedDependencies>
-
<usedDependency>org.apache.hadoop:hadoop-minicluster</usedDependency>
<usedDependency>org.apache.asterix:asterix-fuzzyjoin</usedDependency>
+
<usedDependency>org.apache.hyracks:hyracks-storage-am-lsm-btree-test</usedDependency>
+
<usedDependency>org.apache.asterix:asterix-common:test-jar</usedDependency>
</usedDependencies>
- <ignoredUnusedDeclaredDependencies>
-
<ignoredUnusedDeclaredDependency>org.apache.asterix:asterix-common</ignoredUnusedDeclaredDependency>
- </ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <version>${hadoop.version}</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-om</artifactId>
@@ -225,13 +216,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>${asterix.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-common</artifactId>
</dependency>
@@ -248,10 +232,6 @@
<groupId>org.apache.asterix</groupId>
<artifactId>asterix-lang-common</artifactId>
<version>${asterix.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -307,7 +287,22 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <!-- TODO: the following dependencies should go away if we figured out why
test needs them -->
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-storage-am-lsm-btree-test</artifactId>
+ <version>${hyracks.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.asterix</groupId>
@@ -316,13 +311,9 @@
<!-- TODO: scope could be test if BAD runtime does not depend on
fuzzyjoin functions... -->
</dependency>
<dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-storage-am-lsm-btree-test</artifactId>
- <version>${hyracks.version}</version>
+ <groupId>org.apache.asterix</groupId>
+ <artifactId>asterix-common</artifactId>
+ <version>${asterix.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git
a/asterix-bad/src/main/java/org/apache/asterix/bad/BADJobService.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/BADJobService.java
index 5ec4852..d5478ad 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/BADJobService.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/BADJobService.java
@@ -27,8 +27,6 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.asterix.active.ActivityState;
import org.apache.asterix.active.EntityId;
@@ -56,13 +54,16 @@
import org.apache.hyracks.api.job.JobSpecification;
import org.apache.hyracks.api.result.IResultSet;
import org.apache.hyracks.api.result.ResultSetId;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Provides functionality for channel jobs
*/
public class BADJobService {
- private static final Logger LOGGER =
Logger.getLogger(BADJobService.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
//pool size one (only running one thread at a time)
private static final int POOL_SIZE = 1;
@@ -97,7 +98,7 @@
scheduledExecutorService.shutdown();
}
} catch (Exception e) {
- LOGGER.log(Level.SEVERE, "Job Failed to run for " +
entityId.getExtensionName() + " "
+ LOGGER.log(Level.ERROR, "Job Failed to run for " +
entityId.getExtensionName() + " "
+ entityId.getDataverse() + "." +
entityId.getEntityName() + ".", e);
}
}
@@ -111,7 +112,7 @@
long executionMilliseconds = runDeployedJobSpec(distributedId, hcc,
null, jobParameters, entityId, txnIdFactory,
null, listener, null);
if (executionMilliseconds > period) {
- LOGGER.log(Level.SEVERE,
+ LOGGER.log(Level.ERROR,
"Periodic job for " + entityId.getExtensionName() + " " +
entityId.getDataverse() + "."
+ entityId.getEntityName() + " was unable to meet
the required period of " + period
+ " milliseconds. Actually took " +
executionMilliseconds + " execution will shutdown"
@@ -144,9 +145,11 @@
new IStatementExecutor.Stats(), null);
}
- LOGGER.log(Level.SEVERE,
- "Deployed Job execution completed for " +
entityId.getExtensionName() + " " + entityId.getDataverse()
- + "." + entityId.getEntityName() + ". Took " +
executionMilliseconds + " milliseconds ");
+ if (LOGGER.isTraceEnabled()) {
+ LOGGER.log(Level.TRACE,
+ "Deployed Job execution completed for " +
entityId.getExtensionName() + " " + entityId.getDataverse()
+ + "." + entityId.getEntityName() + ". Took " +
executionMilliseconds + " milliseconds ");
+ }
return executionMilliseconds;
@@ -213,7 +216,7 @@
DeployedJobSpecEventListener listener =
(DeployedJobSpecEventListener)
activeEventHandler.getListener(entityId);
if (listener == null) {
- LOGGER.severe("Tried to redeploy the job for " + entityId + " but
no listener exists.");
+ LOGGER.log(Level.ERROR, "Tried to redeploy the job for " +
entityId + " but no listener exists.");
return;
}
diff --git
a/asterix-bad/src/main/java/org/apache/asterix/bad/metadata/DeployedJobSpecEventListener.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/metadata/DeployedJobSpecEventListener.java
index 70e780e..87b6056 100644
---
a/asterix-bad/src/main/java/org/apache/asterix/bad/metadata/DeployedJobSpecEventListener.java
+++
b/asterix-bad/src/main/java/org/apache/asterix/bad/metadata/DeployedJobSpecEventListener.java
@@ -32,11 +32,12 @@
import org.apache.asterix.common.metadata.IDataset;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.job.DeployedJobSpecId;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class DeployedJobSpecEventListener implements
IActiveEntityEventsListener {
- private static final Logger LOGGER =
Logger.getLogger(DeployedJobSpecEventListener.class);
+ private static final Logger LOGGER = LogManager.getLogger();
public enum PrecompiledType {
CHANNEL,
@@ -67,6 +68,7 @@
this.statsUpdatedEvent = new ActiveEvent(null, Kind.STATS_UPDATED,
entityId, null);
this.stats = "{\"Stats\":\"N/A\"}";
this.type = type;
+ this.state = ActivityState.STOPPED;
}
public DeployedJobSpecId getDeployedJobSpecId() {
diff --git
a/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
index d2a6613..32c0ab0 100644
---
a/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
+++
b/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
@@ -23,8 +23,6 @@
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.asterix.active.EntityId;
import org.apache.asterix.active.IActiveEntityEventsListener;
@@ -58,10 +56,13 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.client.result.ResultSet;
import org.apache.hyracks.control.common.utils.HyracksThreadFactory;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class BADGlobalRecoveryManager extends GlobalRecoveryManager {
- private static final Logger LOGGER =
Logger.getLogger(BADGlobalRecoveryManager.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
public BADGlobalRecoveryManager(ICCServiceContext serviceCtx,
IHyracksClientConnection hcc,
IStorageComponentProvider componentProvider) {
@@ -71,7 +72,7 @@
@Override
protected void recover(ICcApplicationContext appCtx) throws
HyracksDataException {
try {
- LOGGER.info("Starting Global Recovery");
+ LOGGER.warn("Starting Global Recovery");
MetadataManager.INSTANCE.init();
MetadataTransactionContext mdTxnCtx =
MetadataManager.INSTANCE.beginTransaction();
mdTxnCtx = doRecovery(appCtx, mdTxnCtx);
@@ -81,7 +82,7 @@
deployJobs(appCtx, channels, procedures);
recoveryCompleted = true;
recovering = false;
- LOGGER.info("Global Recovery Completed. Refreshing cluster
state...");
+ LOGGER.warn("Global Recovery Completed. Refreshing cluster
state...");
appCtx.getClusterStateManager().refreshState();
} catch (Exception e) {
throw HyracksDataException.create(e);
@@ -131,7 +132,7 @@
listener.setExecutorService(ses);
metadataProvider.getLocks().unlock();
- LOGGER.log(Level.SEVERE, entityId.getExtensionName() + " " +
entityId.getDataverse() + "."
+ LOGGER.log(Level.WARN, entityId.getExtensionName() + " " +
entityId.getDataverse() + "."
+ entityId.getEntityName() + " was stopped by cluster
failure. It has restarted.");
}
@@ -153,7 +154,7 @@
true);
metadataProvider.getLocks().unlock();
//Log that the procedure stopped by cluster restart. Procedure is
available again now.
- LOGGER.log(Level.SEVERE, entityId.getExtensionName() + " " +
entityId.getDataverse() + "."
+ LOGGER.log(Level.WARN, entityId.getExtensionName() + " " +
entityId.getDataverse() + "."
+ entityId.getEntityName()
+ " was lost with cluster failure and any repetitive
instances have stopped. It is now available to run again.");
//TODO: allow repetitive procedures to restart execution
automatically
diff --git
a/asterix-bad/src/main/java/org/apache/asterix/bad/runtime/NotifyBrokerRuntime.java
b/asterix-bad/src/main/java/org/apache/asterix/bad/runtime/NotifyBrokerRuntime.java
index 9da9e03..43c0a55 100644
---
a/asterix-bad/src/main/java/org/apache/asterix/bad/runtime/NotifyBrokerRuntime.java
+++
b/asterix-bad/src/main/java/org/apache/asterix/bad/runtime/NotifyBrokerRuntime.java
@@ -31,8 +31,6 @@
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.asterix.active.EntityId;
import org.apache.asterix.bad.BADConstants;
@@ -59,9 +57,11 @@
import org.apache.hyracks.dataflow.common.data.accessors.FrameTupleReference;
import org.apache.hyracks.util.string.UTF8StringReader;
import org.apache.hyracks.util.string.UTF8StringWriter;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class NotifyBrokerRuntime extends
AbstractOneInputOneOutputOneFramePushRuntime {
- private static final Logger LOGGER =
Logger.getLogger(NotifyBrokerRuntime.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private final ByteBufferInputStream bbis = new ByteBufferInputStream();
private final DataInputStream di = new DataInputStream(bbis);
@@ -145,7 +145,7 @@
connection.setConnectTimeout(500);
DataOutputStream wr = new
DataOutputStream(connection.getOutputStream());
wr.writeBytes(urlParameters);
- if (LOGGER.isLoggable(Level.INFO)) {
+ if (LOGGER.isInfoEnabled()) {
int responseCode = connection.getResponseCode();
LOGGER.info("\nSending 'POST' request to URL : " + url);
LOGGER.info("Post parameters : " + urlParameters);
@@ -154,7 +154,7 @@
wr.close();
connection.disconnect();
} catch (Exception e) {
- LOGGER.log(Level.WARNING, "Channel Failed to connect to Broker.");
+ LOGGER.warn("Channel Failed to connect to Broker.");
}
}
diff --git a/asterix-bad/src/main/resources/asterix-build-configuration.xml
b/asterix-bad/src/main/resources/asterix-build-configuration.xml
deleted file mode 100644
index 6007416..0000000
--- a/asterix-bad/src/main/resources/asterix-build-configuration.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--
- ! 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.
- !-->
-<asterixConfiguration xmlns="asterixconf">
- <metadataNode>asterix_nc1</metadataNode>
- <store>
- <ncId>asterix_nc1</ncId>
- <storeDirs>iodevice0,iodevice1</storeDirs>
- </store>
- <store>
- <ncId>asterix_nc2</ncId>
- <storeDirs>iodevice0,iodevice1</storeDirs>
- </store>
- <transactionLogDir>
- <ncId>asterix_nc1</ncId>
- <txnLogDirPath>target/txnLogDir/asterix_nc1</txnLogDirPath>
- </transactionLogDir>
- <transactionLogDir>
- <ncId>asterix_nc2</ncId>
- <txnLogDirPath>target/txnLogDir/asterix_nc2</txnLogDirPath>
- </transactionLogDir>
- <extensions>
- <extension>
-
<extensionClassName>org.apache.asterix.bad.lang.BADQueryTranslatorExtension</extensionClassName>
- </extension>
- <extension>
-
<extensionClassName>org.apache.asterix.bad.lang.BADLangExtension</extensionClassName>
- </extension>
- <extension>
-
<extensionClassName>org.apache.asterix.bad.metadata.BADMetadataExtension</extensionClassName>
- </extension>
- </extensions>
- <property>
- <name>max.wait.active.cluster</name>
- <value>60</value>
- <description>Maximum wait (in seconds) for a cluster to be ACTIVE (all
- nodes are available)
- before a submitted query/statement can be
- executed. (Default = 60 seconds)
- </description>
- </property>
- <property>
- <name>log.level</name>
- <value>WARNING</value>
- <description>Log level for running tests/build</description>
- </property>
- <property>
- <name>compiler.framesize</name>
- <value>32KB</value>
- </property>
- <property>
- <name>compiler.sortmemory</name>
- <value>640KB</value>
- </property>
- <property>
- <name>compiler.groupmemory</name>
- <value>640KB</value>
- </property>
- <property>
- <name>compiler.joinmemory</name>
- <value>640KB</value>
- </property>
- <property>
- <name>compiler.pregelix.home</name>
- <value>~/pregelix</value>
- </property>
- <property>
- <name>storage.buffercache.pagesize</name>
- <value>32768</value>
- <description>The page size in bytes for pages in the buffer cache.
- (Default = "32768" // 32KB)
- </description>
- </property>
- <property>
- <name>storage.buffercache.size</name>
- <value>33554432</value>
- <description>The size of memory allocated to the disk buffer cache.
- The value should be a multiple of the buffer cache page size(Default
- = "33554432" // 32MB)
- </description>
- </property>
- <property>
- <name>storage.memorycomponent.numpages</name>
- <value>8</value>
- <description>The number of pages to allocate for a memory component.
- (Default = 8)
- </description>
- </property>
- <property>
- <name>plot.activate</name>
- <value>false</value>
- <description>Enabling plot of Algebricks plan to tmp folder. (Default =
false)
- </description>
- </property>
-</asterixConfiguration>
diff --git a/asterix-bad/src/main/resources/cc.conf
b/asterix-bad/src/main/resources/cc.conf
index 371cbe8..d6cc9b0 100644
--- a/asterix-bad/src/main/resources/cc.conf
+++ b/asterix-bad/src/main/resources/cc.conf
@@ -45,7 +45,8 @@
heartbeat.period=2000
[common]
-log.level = INFO
+log.dir = logs/
+log.level=INFO
compiler.framesize=32KB
compiler.sortmemory=320KB
compiler.groupmemory=160KB
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 f9a2e6e..fd6e6d8 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
@@ -18,19 +18,11 @@
*/
package org.apache.asterix.bad.test;
-import java.io.File;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.logging.Logger;
-import org.apache.asterix.api.common.AsterixHyracksIntegrationUtil;
-import org.apache.asterix.common.config.TransactionProperties;
import org.apache.asterix.test.common.TestExecutor;
-import org.apache.asterix.test.runtime.ExecutionTestUtil;
+import org.apache.asterix.test.runtime.LangExecutionUtil;
import org.apache.asterix.testframework.context.TestCaseContext;
-import org.apache.asterix.testframework.xml.TestGroup;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hyracks.storage.am.lsm.btree.impl.TestLsmBtreeLocalResource;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -44,48 +36,21 @@
@RunWith(Parameterized.class)
public class BADExecutionTest {
- protected static final Logger LOGGER =
Logger.getLogger(BADExecutionTest.class.getName());
-
- protected static final String PATH_ACTUAL = "target/rttest" +
File.separator;
- 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/cc.conf";
-
- protected static TransactionProperties txnProperties;
- private static final TestExecutor testExecutor = new TestExecutor();
- private static final boolean cleanupOnStart = true;
- private static final boolean cleanupOnStop = true;
-
- protected static TestGroup FailedGroup;
- protected TestLsmBtreeLocalResource resource = null;
@BeforeClass
public static void setUp() throws Exception {
- File outdir = new File(PATH_ACTUAL);
- outdir.mkdirs();
- ExecutionTestUtil.setUp(cleanupOnStart, TEST_CONFIG_FILE_NAME, new
AsterixHyracksIntegrationUtil(), false, null);
+ LangExecutionUtil.setUp(TEST_CONFIG_FILE_NAME, new TestExecutor());
}
@AfterClass
public static void tearDown() throws Exception {
- ExecutionTestUtil.tearDown(cleanupOnStop);
- ExecutionTestUtil.integrationUtil.removeTestStorageFiles();
+ LangExecutionUtil.tearDown();
}
@Parameters(name = "BADExecutionTest {index}: {0}")
public static Collection<Object[]> tests() throws Exception {
- return buildTestsInXml("testsuite.xml");
- }
-
- protected static Collection<Object[]> buildTestsInXml(String xmlfile)
throws Exception {
- Collection<Object[]> testArgs = new ArrayList<Object[]>();
- TestCaseContext.Builder b = new TestCaseContext.Builder();
- for (TestCaseContext ctx : b.build(new File(PATH_BASE), xmlfile)) {
- testArgs.add(new Object[] { ctx });
- }
- return testArgs;
-
+ return LangExecutionUtil.tests("only_bad.xml", "testsuite_bad.xml");
}
protected TestCaseContext tcCtx;
@@ -96,6 +61,6 @@
@Test
public void test() throws Exception {
- testExecutor.executeTest(PATH_ACTUAL, tcCtx, null, false, FailedGroup);
+ LangExecutionUtil.test(tcCtx);
}
}
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 090354d..6e83fef 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
@@ -34,8 +34,6 @@
@RunWith(Parameterized.class)
public class BADOptimizerTest extends OptimizerTest {
- private static final Logger LOGGER =
Logger.getLogger(BADOptimizerTest.class.getName());
-
@BeforeClass
public static void setUp() throws Exception {
final File outdir = new File(PATH_ACTUAL);
diff --git
a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADRecoveryTest.java
b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADRecoveryTest.java
index 277d718..889b55a 100644
--- a/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADRecoveryTest.java
+++ b/asterix-bad/src/test/java/org/apache/asterix/bad/test/BADRecoveryTest.java
@@ -19,7 +19,6 @@
package org.apache.asterix.bad.test;
import java.io.File;
-import java.io.FilenameFilter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
@@ -27,6 +26,8 @@
import org.apache.asterix.test.common.TestExecutor;
import org.apache.asterix.testframework.context.TestCaseContext;
import org.apache.commons.io.FileUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -37,8 +38,7 @@
@RunWith(Parameterized.class)
public class BADRecoveryTest {
- private static final java.util.logging.Logger LOGGER =
-
java.util.logging.Logger.getLogger(BADRecoveryTest.class.getName());
+ private static final Logger LOGGER = LogManager.getLogger();
private static final String PATH_ACTUAL = "target" + File.separator +
"rttest" + File.separator;
private static final String PATH_BASE = "src/test/resources/recoveryts/";
diff --git a/asterix-bad/src/test/resources/conf/cluster.xml
b/asterix-bad/src/test/resources/conf/cluster.xml
deleted file mode 100644
index 8f0b694..0000000
--- a/asterix-bad/src/test/resources/conf/cluster.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
- ! 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.
- !-->
-<cluster xmlns="cluster">
- <instance_name>asterix</instance_name>
- <store>storage</store>
-
- <data_replication>
- <enabled>false</enabled>
- <replication_port>2016</replication_port>
- <replication_factor>2</replication_factor>
- <auto_failover>false</auto_failover>
- <replication_time_out>30</replication_time_out>
- </data_replication>
-
- <master_node>
- <id>master</id>
- <client_ip>127.0.0.1</client_ip>
- <cluster_ip>127.0.0.1</cluster_ip>
- <client_port>1098</client_port>
- <cluster_port>1099</cluster_port>
- <http_port>8888</http_port>
- </master_node>
- <node>
- <id>nc1</id>
- <cluster_ip>127.0.0.1</cluster_ip>
- <replication_port>2016</replication_port>
- </node>
- <node>
- <id>nc2</id>
- <cluster_ip>127.0.0.1</cluster_ip>
- <replication_port>2017</replication_port>
- </node>
-</cluster>
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/conf/hyracks-deployment.properties
b/asterix-bad/src/test/resources/conf/hyracks-deployment.properties
deleted file mode 100644
index 17a6772..0000000
--- a/asterix-bad/src/test/resources/conf/hyracks-deployment.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#/*
-# 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.
-cc.bootstrap.class=org.apache.asterix.hyracks.bootstrap.CCBootstrapImpl
-nc.bootstrap.class=org.apache.asterix.hyracks.bootstrap.NCBootstrapImpl
-cc.ip=127.0.0.1
-cc.port=1098
diff --git a/asterix-bad/src/test/resources/conf/log4j2-bad.xml
b/asterix-bad/src/test/resources/conf/log4j2-bad.xml
new file mode 100644
index 0000000..2ea8d4a
--- /dev/null
+++ b/asterix-bad/src/test/resources/conf/log4j2-bad.xml
@@ -0,0 +1,40 @@
+<!--
+ ! 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 complianceo
+ ! 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.
+ !-->
+<Configuration status="WARN">
+ <CustomLevels>
+ <CustomLevel name="ACCESS" intLevel="550" />
+ </CustomLevels>
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n"/>
+ </Console>
+ <Console name="AccessLog" target="SYSTEM_OUT">
+ <PatternLayout pattern="%m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="WARN">
+ <AppenderRef ref="Console"/>
+ </Root>
+ <Logger name="org.apache.hyracks.control.nc.service" level="INFO"/>
+ <Logger name="org.apache.hyracks.http.server.CLFLogger" level="ACCESS"
additivity="false">
+ <AppenderRef ref="AccessLog"/>
+ </Logger>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/conf/test.properties
b/asterix-bad/src/test/resources/conf/test.properties
deleted file mode 100644
index 86269c8..0000000
--- a/asterix-bad/src/test/resources/conf/test.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#/*
-# 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.
-MetadataNode=nc1
-NewUniverse=true
-nc1.stores=nc1data
-nc2.stores=nc2data
-OutputDir=/tmp/asterix_output/
diff --git a/asterix-bad/src/test/resources/runtimets/only_bad.xml
b/asterix-bad/src/test/resources/runtimets/only_bad.xml
new file mode 100644
index 0000000..d6e89bb
--- /dev/null
+++ b/asterix-bad/src/test/resources/runtimets/only_bad.xml
@@ -0,0 +1,25 @@
+<!--
+ ! 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.
+ !-->
+<test-suite xmlns="urn:xml.testframework.asterix.apache.org"
+ ResultOffsetPath="results"
+ QueryOffsetPath="queries"
+ QueryFileExtension=".sqlpp">
+ <test-group name="failed">
+ </test-group>
+</test-suite>
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function/drop_function.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function/drop_function.1.ddl.sqlpp
index a5d3775..4f0e0ec 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function/drop_function.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function/drop_function.1.ddl.sqlpp
@@ -23,9 +23,9 @@
* Author : Steven Jacobs
*/
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type TweetMessageTypeuuid as closed {
tweetid: uuid,
@@ -48,10 +48,10 @@
and spatial_intersect(m.sender_location, place))
};
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
-create repetitive channel nearbyTweetChannel using
channels.NearbyTweetsContainingText@2 period duration("PT10M");
+create repetitive channel nearbyTweetChannel using
b_parent.NearbyTweetsContainingText@2 period duration("PT10M");
-use channels;
+use b_parent;
drop function NearbyTweetsContainingText@2;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp
index d1047b0..7d233f8 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_function_dataverse/drop_function_dataverse.1.ddl.sqlpp
@@ -23,9 +23,9 @@
* Author : Steven Jacobs
*/
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type TweetMessageTypeuuid as closed {
tweetid: uuid,
@@ -48,9 +48,9 @@
and spatial_intersect(m.sender_location, place))
};
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
-create repetitive channel nearbyTweetChannel using
channels.NearbyTweetsContainingText@2 period duration("PT10M");
+create repetitive channel nearbyTweetChannel using
b_parent.NearbyTweetsContainingText@2 period duration("PT10M");
-drop dataverse channels;
\ No newline at end of file
+drop dataverse b_parent;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_index/drop_index.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_index/drop_index.1.ddl.sqlpp
index ca01dd7..67e0e22 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_index/drop_index.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_index/drop_index.1.ddl.sqlpp
@@ -23,10 +23,10 @@
* Author : Steven Jacobs
*/
-drop dataverse two if exists;
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse a_child if exists;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type UserLocation as {
location: circle,
@@ -84,5 +84,5 @@
create repetitive channel EmergencyChannel using RecentEmergenciesNearUser@1
period duration("PT10S");
-use channels;
+use b_parent;
drop index Shelters.s_location;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_results/drop_results.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_results/drop_results.1.ddl.sqlpp
index 432f3c5..5dd2c1f 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_results/drop_results.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_results/drop_results.1.ddl.sqlpp
@@ -23,10 +23,10 @@
* Author : Steven Jacobs
*/
-drop dataverse two if exists;
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse a_child if exists;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type TweetMessageTypeuuid as closed {
tweetid: uuid,
@@ -49,9 +49,9 @@
and spatial_intersect(m.sender_location, place))
};
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
-create repetitive channel nearbyTweetChannel using
channels.NearbyTweetsContainingText@2 period duration("PT10M");
+create repetitive channel nearbyTweetChannel using
b_parent.NearbyTweetsContainingText@2 period duration("PT10M");
-drop dataset two.nearbyTweetChannelResults;
\ No newline at end of file
+drop dataset a_child.nearbyTweetChannelResults;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp
index f6dc2bf..1771e69 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/channel/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/channel/drop_subscriptions/drop_subscriptions.1.ddl.sqlpp
@@ -23,10 +23,10 @@
* Author : Steven Jacobs
*/
-drop dataverse two if exists;
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse a_child if exists;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type TweetMessageTypeuuid as closed {
tweetid: uuid,
@@ -49,9 +49,9 @@
and spatial_intersect(m.sender_location, place))
};
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
-create repetitive channel nearbyTweetChannel using
channels.NearbyTweetsContainingText@2 period duration("PT10M");
+create repetitive channel nearbyTweetChannel using
b_parent.NearbyTweetsContainingText@2 period duration("PT10M");
-drop dataset two.nearbyTweetChannelSubscriptions;
\ No newline at end of file
+drop dataset a_child.nearbyTweetChannelSubscriptions;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/procedure/create_procedure_check_metadata/create_procedure_check_metadata.3.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/procedure/create_procedure_check_metadata/create_procedure_check_metadata.3.ddl.sqlpp
new file mode 100644
index 0000000..d9f4d9c
--- /dev/null
+++
b/asterix-bad/src/test/resources/runtimets/queries/procedure/create_procedure_check_metadata/create_procedure_check_metadata.3.ddl.sqlpp
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+drop dataverse two if exists;
+drop dataverse channels if exists;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_dataset/delete_procedure_drop_dataset.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_dataset/delete_procedure_drop_dataset.1.ddl.sqlpp
index 1b88b19..0e2669f 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_dataset/delete_procedure_drop_dataset.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_dataset/delete_procedure_drop_dataset.1.ddl.sqlpp
@@ -23,10 +23,10 @@
* Author : Steven Jacobs
*/
-drop dataverse two if exists;
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse a_child if exists;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type myLocation as {
timeStamp: datetime,
@@ -37,12 +37,12 @@
create dataset UserLocations(myLocation)
primary key timeStamp;
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
create procedure deleteAll() {
-delete from channels.UserLocations
+delete from b_parent.UserLocations
};
-use channels;
+use b_parent;
drop dataset UserLocations;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_function/delete_procedure_drop_function.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_function/delete_procedure_drop_function.1.ddl.sqlpp
index 2322154..4dc427b 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_function/delete_procedure_drop_function.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_function/delete_procedure_drop_function.1.ddl.sqlpp
@@ -23,10 +23,10 @@
* Author : Steven Jacobs
*/
-drop dataverse two if exists;
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse a_child if exists;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type myLocation as {
id: int
};
@@ -39,15 +39,15 @@
{"id":3, "roomNumber":"jacob"}]
);
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
create function really_contains(word,letter){
contains(word,letter)
};
create procedure deleteSome(r, otherRoom) {
-delete from channels.UserLocations
+delete from b_parent.UserLocations
where roomNumber = r
or roomNumber = otherRoom
and really_contains(roomNumber,"l")
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_index/delete_procedure_drop_index.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_index/delete_procedure_drop_index.1.ddl.sqlpp
index ab66a22..4bef568 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_index/delete_procedure_drop_index.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/procedure/delete_procedure_drop_index/delete_procedure_drop_index.1.ddl.sqlpp
@@ -23,10 +23,10 @@
* Author : Steven Jacobs
*/
-drop dataverse two if exists;
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse a_child if exists;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type myLocation as {
timeStamp: datetime,
@@ -39,12 +39,12 @@
create index rooms on UserLocations(roomNumber);
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
create procedure deleteAll() {
-delete from channels.UserLocations
+delete from b_parent.UserLocations
};
-use channels;
+use b_parent;
drop index UserLocations.rooms;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure_drop_dataset/insert_procedure_drop_dataset.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure_drop_dataset/insert_procedure_drop_dataset.1.ddl.sqlpp
index 260afab..5d33c40 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure_drop_dataset/insert_procedure_drop_dataset.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure_drop_dataset/insert_procedure_drop_dataset.1.ddl.sqlpp
@@ -23,10 +23,11 @@
* Author : Steven Jacobs
*/
-drop dataverse two if exists;
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse b_parent if exists;
+drop dataverse a_child if exists;
+
+create dataverse b_parent;
+use b_parent;
create type myLocation as {
timeStamp: datetime,
@@ -37,14 +38,14 @@
create dataset UserLocations(myLocation)
primary key timeStamp;
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
create procedure addMe() {
- insert into channels.UserLocations([
+ insert into b_parent.UserLocations([
{"timeStamp":current_datetime(), "roomNumber":222}]
)
};
-use channels;
+use b_parent;
drop dataset UserLocations;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure_drop_dataverse/insert_procedure_drop_dataverse.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure_drop_dataverse/insert_procedure_drop_dataverse.1.ddl.sqlpp
index ad47b4e..0898a3a 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure_drop_dataverse/insert_procedure_drop_dataverse.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/procedure/insert_procedure_drop_dataverse/insert_procedure_drop_dataverse.1.ddl.sqlpp
@@ -23,10 +23,10 @@
* Author : Steven Jacobs
*/
-drop dataverse two if exists;
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse a_child if exists;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type myLocation as {
timeStamp: datetime,
@@ -37,13 +37,13 @@
create dataset UserLocations(myLocation)
primary key timeStamp;
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
create procedure addMe() {
- insert into channels.UserLocations([
+ insert into b_parent.UserLocations([
{"timeStamp":current_datetime(), "roomNumber":222}]
)
};
-drop dataverse channels;
\ No newline at end of file
+drop dataverse b_parent;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure_drop_dataset/query_procedure_drop_dataset.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure_drop_dataset/query_procedure_drop_dataset.1.ddl.sqlpp
index acb9f04..4a6cc79 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure_drop_dataset/query_procedure_drop_dataset.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure_drop_dataset/query_procedure_drop_dataset.1.ddl.sqlpp
@@ -23,10 +23,10 @@
* Author : Steven Jacobs
*/
-drop dataverse two if exists;
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse a_child if exists;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type myLocation as {
timeStamp: datetime,
@@ -37,13 +37,13 @@
create dataset UserLocations(myLocation)
primary key timeStamp;
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
create procedure findMe() {
-select roomNumber from channels.UserLocations
+select roomNumber from b_parent.UserLocations
order by timeStamp
};
-use channels;
+use b_parent;
drop dataset UserLocations;
\ No newline at end of file
diff --git
a/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure_drop_function/query_procedure_drop_function.1.ddl.sqlpp
b/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure_drop_function/query_procedure_drop_function.1.ddl.sqlpp
index 0e648cd..c05edbd 100644
---
a/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure_drop_function/query_procedure_drop_function.1.ddl.sqlpp
+++
b/asterix-bad/src/test/resources/runtimets/queries/procedure/query_procedure_drop_function/query_procedure_drop_function.1.ddl.sqlpp
@@ -23,10 +23,10 @@
* Author : Steven Jacobs
*/
-drop dataverse two if exists;
-drop dataverse channels if exists;
-create dataverse channels;
-use channels;
+drop dataverse a_child if exists;
+drop dataverse b_parent if exists;
+create dataverse b_parent;
+use b_parent;
create type myLocation as {
id: int
};
@@ -43,17 +43,17 @@
contains(word,letter)
};
-create dataverse two;
-use two;
+create dataverse a_child;
+use a_child;
create procedure selectSome(r, otherRoom) {
-select roomNumber from channels.UserLocations
+select roomNumber from b_parent.UserLocations
where roomNumber = r
or roomNumber = otherRoom
-and channels.really_contains(roomNumber,"l")
+and b_parent.really_contains(roomNumber,"l")
order by id
};
-use channels;
+use b_parent;
drop function really_contains@2;
\ No newline at end of file
diff --git a/asterix-bad/src/test/resources/runtimets/testsuite.xml
b/asterix-bad/src/test/resources/runtimets/testsuite_bad.xml
similarity index 82%
rename from asterix-bad/src/test/resources/runtimets/testsuite.xml
rename to asterix-bad/src/test/resources/runtimets/testsuite_bad.xml
index 4640af1..ae8350b 100644
--- a/asterix-bad/src/test/resources/runtimets/testsuite.xml
+++ b/asterix-bad/src/test/resources/runtimets/testsuite_bad.xml
@@ -59,43 +59,43 @@
<test-case FilePath="procedure">
<compilation-unit name="insert_procedure_drop_dataset">
<output-dir compare="Text">insert_procedure_drop_dataset</output-dir>
- <expected-error>Cannot alter dataset channels.UserLocations.
two.addMe(Procedure) depends on it!</expected-error>
+ <expected-error>Cannot alter dataset</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="procedure">
<compilation-unit name="insert_procedure_drop_dataverse">
<output-dir compare="Text">insert_procedure_drop_dataverse</output-dir>
- <expected-error>Cannot drop dataverse channels. two.addMe(Procedure)
depends on it!</expected-error>
+ <expected-error>Cannot drop dataverse</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="procedure">
<compilation-unit name="delete_procedure_drop_dataset">
<output-dir compare="Text">delete_procedure_drop_dataset</output-dir>
- <expected-error>Cannot alter dataset channels.UserLocations.
two.deleteAll(Procedure) depends on it!</expected-error>
+ <expected-error>Cannot alter dataset</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="procedure">
<compilation-unit name="delete_procedure_drop_function">
<output-dir compare="Text">delete_procedure_drop_function</output-dir>
- <expected-error>Cannot drop function two.really_contains@2.
two.deleteSome(Procedure) depends on it!</expected-error>
+ <expected-error>Cannot drop function</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="procedure">
<compilation-unit name="delete_procedure_drop_index">
<output-dir compare="Text">delete_procedure_drop_index</output-dir>
- <expected-error>Cannot alter dataset channels.UserLocations.
two.deleteAll(Procedure) depends on it!</expected-error>
+ <expected-error>Cannot alter dataset</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="procedure">
<compilation-unit name="query_procedure_drop_dataset">
<output-dir compare="Text">query_procedure_drop_dataset</output-dir>
- <expected-error>Cannot alter dataset channels.UserLocations.
two.findMe(Procedure) depends on it!</expected-error>
+ <expected-error>Cannot alter dataset</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="procedure">
<compilation-unit name="query_procedure_drop_function">
<output-dir compare="Text">query_procedure_drop_function</output-dir>
- <expected-error>Cannot drop function channels.really_contains@2.
two.selectSome(Procedure) depends on it!</expected-error>
+ <expected-error>Cannot drop function</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="procedure">
@@ -131,13 +131,13 @@
<test-case FilePath="channel">
<compilation-unit name="drop_function">
<output-dir compare="Text">drop_function</output-dir>
- <expected-error>Cannot drop function
channels.NearbyTweetsContainingText@2. two.nearbyTweetChannel(Channel) depends
on it!</expected-error>
+ <expected-error>Cannot drop function</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="channel">
<compilation-unit name="drop_index">
<output-dir compare="Text">drop_index</output-dir>
- <expected-error>Cannot drop index. channels.EmergencyChannel(Channel)
depends on it!</expected-error>
+ <expected-error>Cannot drop index</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="channel">
@@ -148,19 +148,19 @@
<test-case FilePath="channel">
<compilation-unit name="drop_results">
<output-dir compare="Text">drop_results</output-dir>
- <expected-error>Cannot alter dataset two.nearbyTweetChannelResults.
two.nearbyTweetChannel(Channel) depends on it!</expected-error>
+ <expected-error>Cannot alter dataset</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="channel">
<compilation-unit name="drop_subscriptions">
<output-dir compare="Text">drop_subscriptions</output-dir>
- <expected-error>Cannot alter dataset
two.nearbyTweetChannelSubscriptions. two.nearbyTweetChannel(Channel) depends on
it!</expected-error>
+ <expected-error>Cannot alter dataset</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="channel">
<compilation-unit name="drop_function_dataverse">
<output-dir compare="Text">drop_function_dataverse</output-dir>
- <expected-error>Cannot drop dataverse channels.
two.nearbyTweetChannel(Channel) depends on it!</expected-error>
+ <expected-error>Cannot drop dataverse</expected-error>
</compilation-unit>
</test-case>
<test-case FilePath="channel">
--
To view, visit https://asterix-gerrit.ics.uci.edu/3022
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76c5d201a95f71a8f9bfd2461620145c0c27a08d
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb-bad
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang <[email protected]>
