You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2020/10/09 16:12:18 UTC
[asterixdb] branch master updated: [ASTERIXDB-2785][AQL] AQL
Removal Cleanup
This is an automated email from the ASF dual-hosted git repository.
mhubail pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new b777a52 [ASTERIXDB-2785][AQL] AQL Removal Cleanup
b777a52 is described below
commit b777a52e3ea82024cafe5b66d2a46e49d65725b3
Author: Murtadha Hubail <mh...@apache.org>
AuthorDate: Fri Oct 9 12:51:33 2020 +0300
[ASTERIXDB-2785][AQL] AQL Removal Cleanup
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Remove asterix-lang-aql module.
- Remove references to AQL.
Change-Id: I9fdc173aab0435e284c5364433c071d4cc1e19f0
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/8323
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Reviewed-by: Ali Alsuliman <al...@gmail.com>
---
asterixdb/asterix-algebra/pom.xml | 5 -
asterixdb/asterix-app/pom.xml | 5 -
.../src/main/resources/webui/querytemplate.html | 1 -
.../apache/asterix/test/common/TestExecutor.java | 33 +---
.../asterix/test/jsonplan/JsonLogicalPlanTest.java | 3 +-
.../asterix/test/optimizer/OptimizerTest.java | 3 +-
.../asterix/external/util/FeedConstants.java | 1 -
.../fuzzyjoin/tests/dataset/AbstractDataset.java | 5 -
asterixdb/asterix-lang-aql/pom.xml | 181 ---------------------
asterixdb/asterix-tools/pom.xml | 6 -
asterixdb/pom.xml | 1 -
11 files changed, 6 insertions(+), 238 deletions(-)
diff --git a/asterixdb/asterix-algebra/pom.xml b/asterixdb/asterix-algebra/pom.xml
index 1a1af8f..cf5802f 100644
--- a/asterixdb/asterix-algebra/pom.xml
+++ b/asterixdb/asterix-algebra/pom.xml
@@ -117,11 +117,6 @@
</dependency>
<dependency>
<groupId>org.apache.asterix</groupId>
- <artifactId>asterix-lang-aql</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
<artifactId>asterix-lang-sqlpp</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index e8f9575..4c5a882 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -580,11 +580,6 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-lang-aql</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-storage-am-lsm-btree</artifactId>
</dependency>
diff --git a/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html b/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
index 1157c27..cd803cf 100644
--- a/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
@@ -288,7 +288,6 @@ $(document).ready(function() {
<label id="query-language" class="optlabel"> Query Language:<br/>
<select name="query-language" class="btn btn-width">
<option selected value="SQLPP">SQL++</option>
- <option value="AQL">AQL</option>
</select>
</label>
<label id="output-format" class="optlabel"> Output Format:<br/>
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
index 690eac0..a0798c9 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
@@ -144,7 +144,6 @@ public class TestExecutor {
.with(DeserializationFeature.FAIL_ON_TRAILING_TOKENS, DeserializationFeature.FAIL_ON_READING_DUP_TREE_KEY);
private static final ObjectReader RESULT_NODE_READER =
JSON_NODE_READER.with(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
- private static final String AQL = "aql";
private static final String SQLPP = "sqlpp";
private static final String DEFAULT_PLAN_FORMAT = "string";
// see
@@ -1007,12 +1006,7 @@ public class TestExecutor {
switch (ctx.getType()) {
case "ddl":
ExtractedResult ddlExtractedResult;
- if (ctx.getFile().getName().endsWith("aql")) {
- ddlExtractedResult = executeAqlUpdateOrDdl(statement, OutputFormat.CLEAN_JSON);
- } else {
- ddlExtractedResult = executeSqlppUpdateOrDdl(statement, OutputFormat.CLEAN_JSON);
- }
-
+ ddlExtractedResult = executeSqlppUpdateOrDdl(statement, OutputFormat.CLEAN_JSON);
validateWarning(ddlExtractedResult, testCaseCtx, cUnit, testFile, expectedWarnings);
break;
case "update":
@@ -1020,11 +1014,7 @@ public class TestExecutor {
if (isDmlRecoveryTest && statement.contains("nc1://")) {
statement = statement.replaceAll("nc1://", "127.0.0.1://../../../../../../asterix-app/");
}
- if (ctx.getFile().getName().endsWith("aql")) {
- executeAqlUpdateOrDdl(statement, OutputFormat.forCompilationUnit(cUnit));
- } else {
- executeSqlppUpdateOrDdl(statement, OutputFormat.forCompilationUnit(cUnit));
- }
+ executeSqlppUpdateOrDdl(statement, OutputFormat.forCompilationUnit(cUnit));
break;
case "pollget":
case "pollquery":
@@ -1094,8 +1084,9 @@ public class TestExecutor {
runScriptAndCompareWithResult(testFile, qbcFile, qarFile, ComparisonEnum.TEXT, UTF_8, statement);
break;
case "txneu": // eu represents erroneous update
+ case "errddl":
try {
- executeAqlUpdateOrDdl(statement, OutputFormat.forCompilationUnit(cUnit));
+ executeSqlppUpdateOrDdl(statement, OutputFormat.forCompilationUnit(cUnit));
} catch (Exception e) {
// An exception is expected.
failed = true;
@@ -1120,18 +1111,6 @@ public class TestExecutor {
String[] lines = stripLineComments(statement).trim().split("\n");
Thread.sleep(Long.parseLong(lines[lines.length - 1].trim()));
break;
- case "errddl": // a ddlquery that expects error
- try {
- executeAqlUpdateOrDdl(statement, OutputFormat.forCompilationUnit(cUnit));
- } catch (Exception e) {
- // expected error happens
- failed = true;
- LOGGER.info("testFile {} raised an (expected) exception", testFile, e.toString());
- }
- if (!failed) {
- throw new Exception("Test \"" + testFile + "\" FAILED; an exception was expected");
- }
- break;
case "get":
case "post":
case "put":
@@ -1608,10 +1587,6 @@ public class TestExecutor {
return executeUpdateOrDdl(statement, outputFormat, getQueryServiceUri(SQLPP));
}
- private ExtractedResult executeAqlUpdateOrDdl(String statement, OutputFormat outputFormat) throws Exception {
- return executeUpdateOrDdl(statement, outputFormat, getQueryServiceUri(AQL));
- }
-
private ExtractedResult executeUpdateOrDdl(String statement, OutputFormat outputFormat, URI serviceUri)
throws Exception {
try (InputStream resultStream = executeQueryService(statement, serviceUri, outputFormat, UTF_8)) {
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/jsonplan/JsonLogicalPlanTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/jsonplan/JsonLogicalPlanTest.java
index 6779df3..28fca9c 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/jsonplan/JsonLogicalPlanTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/jsonplan/JsonLogicalPlanTest.java
@@ -77,7 +77,6 @@ public class JsonLogicalPlanTest {
}
protected static final String SEPARATOR = File.separator;
- private static final String EXTENSION_AQL = "aql";
private static final String EXTENSION_SQLPP = "sqlpp";
private static final String EXTENSION_RESULT = "plan.json";
private static final String FILENAME_IGNORE = "ignore.txt";
@@ -133,7 +132,7 @@ public class JsonLogicalPlanTest {
suiteBuildPerFile(innerfile, testArgs, subdir);
}
}
- if (file.isFile() && (file.getName().endsWith(EXTENSION_AQL) || file.getName().endsWith(EXTENSION_SQLPP))) {
+ if (file.isFile() && file.getName().endsWith(EXTENSION_SQLPP)) {
String resultFileName = AsterixTestHelper.extToResExt(file.getName(), EXTENSION_RESULT);
File actualFile = new File(PATH_ACTUAL + SEPARATOR + path + resultFileName);
testArgs.add(new Object[] { file, actualFile });
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 e8505be..dbf8f2c 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
@@ -72,7 +72,6 @@ public class OptimizerTest {
private static final Logger LOGGER = LogManager.getLogger();
private static final String SEPARATOR = File.separator;
- private static final String EXTENSION_AQL = "aql";
private static final String EXTENSION_SQLPP = "sqlpp";
private static final String EXTENSION_RESULT = "plan";
private static final String FILENAME_IGNORE = "ignore.txt";
@@ -132,7 +131,7 @@ public class OptimizerTest {
suiteBuildPerFile(innerfile, testArgs, subdir);
}
}
- if (file.isFile() && (file.getName().endsWith(EXTENSION_AQL) || file.getName().endsWith(EXTENSION_SQLPP))) {
+ if (file.isFile() && file.getName().endsWith(EXTENSION_SQLPP)) {
String resultFileName = AsterixTestHelper.extToResExt(file.getName(), EXTENSION_RESULT);
File expectedFile = new File(PATH_EXPECTED + path + resultFileName);
File actualFile = new File(PATH_ACTUAL + SEPARATOR + path + resultFileName);
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java
index a29d66c..72e2097 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java
@@ -39,7 +39,6 @@ public class FeedConstants {
public static final String DATAVERSE = "dataverse";
public static final String FEED = "feed";
public static final String DATASET = "dataset";
- public static final String AQL = "aql";
public static final String RUNTIME_TYPE = "runtime-type";
public static final String PARTITION = "partition";
public static final String INTAKE_PARTITION = "intake-partition";
diff --git a/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/AbstractDataset.java b/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/AbstractDataset.java
index fe77a38..d27d5ad 100644
--- a/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/AbstractDataset.java
+++ b/asterixdb/asterix-fuzzyjoin/src/test/java/org/apache/asterix/fuzzyjoin/tests/dataset/AbstractDataset.java
@@ -47,7 +47,6 @@ public abstract class AbstractDataset {
public static final String FILE_PART = "part-";
public static final String FILE_PART0 = FILE_PART + "00000";
public static final String FILE_EXPECTED = "expected.txt";
- public static final String AQL = "aql";
public static final String PATH_RAW = "raw";
public static final String PATH_RECORDPAIRS = "recordpairs";
@@ -72,7 +71,6 @@ public abstract class AbstractDataset {
(new File(paths[0] + getPathDirecotry(Directory.RECORDS_S, crtCopy))).mkdir();
(new File(paths[0] + getPathDirecotry(Directory.TOKENS, crtCopy))).mkdir();
(new File(paths[0] + getPathDirecotry(Directory.TOKENS_R, crtCopy))).mkdir();
- (new File(paths[0] + getPathDirecotry(Directory.TOKENS_R_AQL, crtCopy))).mkdir();
}
public abstract String getName();
@@ -122,9 +120,6 @@ public abstract class AbstractDataset {
case TOKENS_R:
path += AbstractDataset.PATH_TOKENS + "." + getSuffix(Relation.R);
break;
- case TOKENS_R_AQL:
- path += AbstractDataset.PATH_TOKENS + "." + getSuffix(Relation.R) + "." + AQL;
- break;
case RIDPAIRS:
path += AbstractDataset.PATH_RIDPAIRS;
break;
diff --git a/asterixdb/asterix-lang-aql/pom.xml b/asterixdb/asterix-lang-aql/pom.xml
deleted file mode 100644
index 80c0c73..0000000
--- a/asterixdb/asterix-lang-aql/pom.xml
+++ /dev/null
@@ -1,181 +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.
- !-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>apache-asterixdb</artifactId>
- <groupId>org.apache.asterix</groupId>
- <version>0.9.6-SNAPSHOT</version>
- </parent>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
-
- <artifactId>asterix-lang-aql</artifactId>
- <properties>
- <root.dir>${basedir}/..</root.dir>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>javacc</id>
- <goals>
- <goal>javacc</goal>
- </goals>
- <configuration>
- <isStatic>false</isStatic>
- <javaUnicodeEscape>true</javaUnicodeEscape>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources/javacc/</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.codehaus.mojo
- </groupId>
- <artifactId>
- javacc-maven-plugin
- </artifactId>
- <versionRange>
- [2.6,)
- </versionRange>
- <goals>
- <goal>jjdoc</goal>
- <goal>javacc</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>jjdoc</id>
- <activation>
- <property>
- <name>jjdoc.skip</name>
- <value>!true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>javacc-jjdoc</id>
- <goals>
- <goal>jjdoc</goal>
- </goals>
- <phase>generate-test-sources</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-lang-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-om</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-metadata</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>algebricks-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hyracks</groupId>
- <artifactId>hyracks-api</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/asterixdb/asterix-tools/pom.xml b/asterixdb/asterix-tools/pom.xml
index c1ed994..6203ace 100644
--- a/asterixdb/asterix-tools/pom.xml
+++ b/asterixdb/asterix-tools/pom.xml
@@ -86,12 +86,6 @@
<dependencies>
<dependency>
<groupId>org.apache.asterix</groupId>
- <artifactId>asterix-lang-aql</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
<artifactId>asterix-algebra</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index a512fbd..712dcc1 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -883,7 +883,6 @@
<modules>
<module>asterix-common</module>
<module>asterix-lang-common</module>
- <module>asterix-lang-aql</module>
<module>asterix-lang-sqlpp</module>
<module>asterix-algebra</module>
<module>asterix-app</module>