You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/10/05 00:09:12 UTC
asterixdb git commit: [NO ISSUE] Enable Build/Run w/ Java 11
Repository: asterixdb
Updated Branches:
refs/heads/master 850d6f694 -> 3477a2b79
[NO ISSUE] Enable Build/Run w/ Java 11
- upgrade hadoop libraries (2.2.0 -> 2.8.5)
Change-Id: I04377b91ea7535bd358c396fbd9fcb019c734814
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2986
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/3477a2b7
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/3477a2b7
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/3477a2b7
Branch: refs/heads/master
Commit: 3477a2b793d41c56036b352d8671ac831c061c9e
Parents: 850d6f6
Author: Michael Blow <mb...@apache.org>
Authored: Thu Oct 4 17:17:35 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Thu Oct 4 17:04:08 2018 -0700
----------------------------------------------------------------------
asterixdb/asterix-app/pom.xml | 5 +-
.../asterix/test/runtime/ExecutionTestUtil.java | 2 +-
.../asterix/test/runtime/LangExecutionUtil.java | 12 +-
.../test/runtime/SqlppHdfsExecutionTest.java | 64 ++++++++
.../resources/runtimets/only_sqlpp_hdfs.xml | 23 +++
.../src/test/resources/runtimets/testsuite.xml | 130 ---------------
.../resources/runtimets/testsuite_sqlpp.xml | 130 ---------------
.../runtimets/testsuite_sqlpp_hdfs.xml | 160 +++++++++++++++++++
asterixdb/asterix-external-data/pom.xml | 14 +-
asterixdb/asterix-metadata/pom.xml | 8 +-
asterixdb/asterix-om/pom.xml | 5 +
asterixdb/asterix-test-framework/pom.xml | 8 +
.../testframework/xml/TestSuiteParser.java | 12 +-
asterixdb/pom.xml | 12 +-
.../hyracks/hyracks-dataflow-common/pom.xml | 5 +
hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 6 +
.../hyracks/maven/license/LicenseUtil.java | 2 +-
hyracks-fullstack/pom.xml | 14 +-
18 files changed, 329 insertions(+), 283 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-app/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 440ef14..8c25235 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -476,6 +476,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-data</artifactId>
</dependency>
@@ -494,7 +498,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTestUtil.java
----------------------------------------------------------------------
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 62c882d..4ed36c6 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
@@ -52,7 +52,7 @@ public class ExecutionTestUtil {
}
public static List<ILibraryManager> setUp(boolean cleanup, String configFile) throws Exception {
- return setUp(cleanup, configFile, integrationUtil, true, null);
+ return setUp(cleanup, configFile, integrationUtil, false, null);
}
public static List<ILibraryManager> setUp(boolean cleanup, String configFile,
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
index cd270cd..75eccfd 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
@@ -19,6 +19,7 @@
package org.apache.asterix.test.runtime;
+import static org.apache.asterix.test.runtime.ExecutionTestUtil.integrationUtil;
import static org.apache.hyracks.util.ThreadDumpUtil.takeDumpJSONString;
import java.io.BufferedReader;
@@ -61,10 +62,15 @@ public class LangExecutionUtil {
private static boolean checkStorageDistribution = true;
public static void setUp(String configFile, TestExecutor executor) throws Exception {
+ setUp(configFile, executor, false);
+ }
+
+ public static void setUp(String configFile, TestExecutor executor, boolean startHdfs) throws Exception {
testExecutor = executor;
File outdir = new File(PATH_ACTUAL);
outdir.mkdirs();
- List<ILibraryManager> libraryManagers = ExecutionTestUtil.setUp(cleanupOnStart, configFile);
+ List<ILibraryManager> libraryManagers =
+ ExecutionTestUtil.setUp(cleanupOnStart, configFile, integrationUtil, startHdfs, null);
ExternalUDFLibrarian.removeLibraryDir();
librarian = new ExternalUDFLibrarian(libraryManagers);
testExecutor.setLibrarian(librarian);
@@ -82,7 +88,7 @@ public class LangExecutionUtil {
} finally {
ExternalUDFLibrarian.removeLibraryDir();
ExecutionTestUtil.tearDown(cleanupOnStop);
- ExecutionTestUtil.integrationUtil.removeTestStorageFiles();
+ integrationUtil.removeTestStorageFiles();
if (!badTestCases.isEmpty()) {
System.out.println("The following test cases left some data");
for (String testCase : badTestCases) {
@@ -140,7 +146,7 @@ public class LangExecutionUtil {
// Checks whether data files are uniformly distributed among io devices.
private static void checkStorageFiles() throws Exception {
- NodeControllerService[] ncs = ExecutionTestUtil.integrationUtil.ncs;
+ NodeControllerService[] ncs = integrationUtil.ncs;
// Checks that dataset files are uniformly distributed across each io device.
for (NodeControllerService nc : ncs) {
checkNcStore(nc);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppHdfsExecutionTest.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppHdfsExecutionTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppHdfsExecutionTest.java
new file mode 100644
index 0000000..6ea87ef
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppHdfsExecutionTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+package org.apache.asterix.test.runtime;
+
+import java.util.Collection;
+
+import org.apache.asterix.test.common.TestExecutor;
+import org.apache.asterix.testframework.context.TestCaseContext;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Runs the SQL++ runtime tests with the storage parallelism.
+ */
+@RunWith(Parameterized.class)
+public class SqlppHdfsExecutionTest {
+ protected static final String TEST_CONFIG_FILE_NAME = "src/main/resources/cc.conf";
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ LangExecutionUtil.setUp(TEST_CONFIG_FILE_NAME, new TestExecutor(), true);
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ LangExecutionUtil.tearDown();
+ }
+
+ @Parameters(name = "SqlppHdfsExecutionTest {index}: {0}")
+ public static Collection<Object[]> tests() throws Exception {
+ return LangExecutionUtil.tests("only_sqlpp_hdfs.xml", "testsuite_sqlpp_hdfs.xml");
+ }
+
+ protected TestCaseContext tcCtx;
+
+ public SqlppHdfsExecutionTest(TestCaseContext tcCtx) {
+ this.tcCtx = tcCtx;
+ }
+
+ @Test
+ public void test() throws Exception {
+ LangExecutionUtil.test(tcCtx);
+ }
+}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-app/src/test/resources/runtimets/only_sqlpp_hdfs.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/only_sqlpp_hdfs.xml b/asterixdb/asterix-app/src/test/resources/runtimets/only_sqlpp_hdfs.xml
new file mode 100644
index 0000000..334dd52
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/only_sqlpp_hdfs.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ ! 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_sqlpp" QueryFileExtension=".sqlpp">
+ <test-group name="failed">
+ </test-group>
+</test-suite>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
index d42cfce..91becf7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -39,38 +39,6 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="external-indexing">
- <test-case FilePath="external-indexing">
- <compilation-unit name="text-format">
- <output-dir compare="Text">text-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="sequence-format">
- <output-dir compare="Text">sequence-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="rc-format">
- <output-dir compare="Text">rc-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="rtree-index">
- <output-dir compare="Text">rtree-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="leftouterjoin">
- <output-dir compare="Text">leftouterjoin</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="leftouterjoin-rtree">
- <output-dir compare="Text">leftouterjoin-rtree</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
<test-group name="upsert">
<test-case FilePath="upsert">
<compilation-unit name="filtered-dataset">
@@ -3545,28 +3513,6 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="open-index-enforced/external-indexing">
- <test-case FilePath="open-index-enforced/external-indexing">
- <compilation-unit name="adm-format">
- <output-dir compare="Text">adm-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="open-index-enforced/external-indexing">
- <compilation-unit name="rtree-index">
- <output-dir compare="Text">rtree-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="open-index-enforced/external-indexing">
- <compilation-unit name="leftouterjoin">
- <output-dir compare="Text">leftouterjoin</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="open-index-enforced/external-indexing">
- <compilation-unit name="leftouterjoin-rtree">
- <output-dir compare="Text">leftouterjoin-rtree</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
<test-group name="open-index-enforced/type-checking">
<test-case FilePath="open-index-enforced/type-checking">
<compilation-unit name="enforced-type-delete">
@@ -3727,28 +3673,6 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="nested-open-index/external-indexing">
- <test-case FilePath="nested-open-index/external-indexing">
- <compilation-unit name="adm-format">
- <output-dir compare="Text">adm-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-open-index/external-indexing">
- <compilation-unit name="rtree-index">
- <output-dir compare="Text">rtree-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-open-index/external-indexing">
- <compilation-unit name="leftouterjoin">
- <output-dir compare="Text">leftouterjoin</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-open-index/external-indexing">
- <compilation-unit name="leftouterjoin-rtree">
- <output-dir compare="Text">leftouterjoin-rtree</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
<test-group name="highly-open-highly-nested">
<test-case FilePath="nested-open-index/highly-open-highly-nested">
<compilation-unit name="bottom-closed-top-closed">
@@ -3979,28 +3903,6 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="nested-index/external-indexing">
- <test-case FilePath="nested-index/external-indexing">
- <compilation-unit name="adm-format">
- <output-dir compare="Text">adm-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-index/external-indexing">
- <compilation-unit name="rtree-index">
- <output-dir compare="Text">rtree-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-index/external-indexing">
- <compilation-unit name="leftouterjoin">
- <output-dir compare="Text">leftouterjoin</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-index/external-indexing">
- <compilation-unit name="leftouterjoin-rtree">
- <output-dir compare="Text">leftouterjoin-rtree</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
</test-group>
<test-group name="nested-index-dml">
<test-case FilePath="nested-index-dml">
@@ -6639,43 +6541,11 @@
</compilation-unit>
</test-case>
<test-case FilePath="hints">
- <compilation-unit name="issue_251_dataset_hint_6">
- <output-dir compare="Text">issue_251_dataset_hint_6</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="hints">
<compilation-unit name="issue_251_dataset_hint_7">
<output-dir compare="Text">issue_251_dataset_hint_7</output-dir>
</compilation-unit>
</test-case>
</test-group>
- <test-group name="hdfs">
- <test-case FilePath="hdfs">
- <compilation-unit name="large-record">
- <output-dir compare="Text">large-record</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="hdfs">
- <compilation-unit name="hdfs_shortcircuit">
- <output-dir compare="Text">hdfs_shortcircuit</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="hdfs">
- <compilation-unit name="issue_245_hdfs">
- <output-dir compare="Text">issue_245_hdfs</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="hdfs">
- <compilation-unit name="hdfs_02">
- <output-dir compare="Text">hdfs_02</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="hdfs">
- <compilation-unit name="hdfs_03">
- <output-dir compare="Text">hdfs_03</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
<test-group name="big-object">
<test-case FilePath="big-object">
<compilation-unit name="big_object_sort">
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index 35b1a93..398b58b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -4205,28 +4205,6 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="open-index-enforced/external-indexing">
- <test-case FilePath="open-index-enforced/external-indexing">
- <compilation-unit name="adm-format">
- <output-dir compare="Text">adm-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="open-index-enforced/external-indexing">
- <compilation-unit name="rtree-index">
- <output-dir compare="Text">rtree-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="open-index-enforced/external-indexing">
- <compilation-unit name="leftouterjoin">
- <output-dir compare="Text">leftouterjoin</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="open-index-enforced/external-indexing">
- <compilation-unit name="leftouterjoin-rtree">
- <output-dir compare="Text">leftouterjoin-rtree</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
<test-group name="open-index-enforced/type-checking">
<test-case FilePath="open-index-enforced/type-checking">
<compilation-unit name="enforced-type-delete">
@@ -4421,28 +4399,6 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="nested-open-index/external-indexing">
- <test-case FilePath="nested-open-index/external-indexing">
- <compilation-unit name="adm-format">
- <output-dir compare="Text">adm-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-open-index/external-indexing">
- <compilation-unit name="rtree-index">
- <output-dir compare="Text">rtree-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-open-index/external-indexing">
- <compilation-unit name="leftouterjoin">
- <output-dir compare="Text">leftouterjoin</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-open-index/external-indexing">
- <compilation-unit name="leftouterjoin-rtree">
- <output-dir compare="Text">leftouterjoin-rtree</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
<test-group name="nested-open-index/highly-open-highly-nested">
<test-case FilePath="nested-open-index/highly-open-highly-nested">
<compilation-unit name="bottom-closed-top-closed">
@@ -4683,28 +4639,6 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="nested-index/external-indexing">
- <test-case FilePath="nested-index/external-indexing">
- <compilation-unit name="adm-format">
- <output-dir compare="Text">adm-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-index/external-indexing">
- <compilation-unit name="rtree-index">
- <output-dir compare="Text">rtree-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-index/external-indexing">
- <compilation-unit name="leftouterjoin">
- <output-dir compare="Text">leftouterjoin</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="nested-index/external-indexing">
- <compilation-unit name="leftouterjoin-rtree">
- <output-dir compare="Text">leftouterjoin-rtree</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
</test-group>
<test-group name="nested-index-dml">
<test-case FilePath="nested-index-dml">
@@ -6866,11 +6800,6 @@
</compilation-unit>
</test-case>
<test-case FilePath="subquery">
- <compilation-unit name="decorrelate_with_unique_id_2">
- <output-dir compare="Text">decorrelate_with_unique_id_2</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="subquery">
<compilation-unit name="exists">
<output-dir compare="Text">exists</output-dir>
</compilation-unit>
@@ -8833,11 +8762,6 @@
</compilation-unit>
</test-case>
<test-case FilePath="hints">
- <compilation-unit name="issue_251_dataset_hint_6">
- <output-dir compare="Text">issue_251_dataset_hint_6</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="hints">
<compilation-unit name="issue_251_dataset_hint_7">
<output-dir compare="Text">issue_251_dataset_hint_7</output-dir>
</compilation-unit>
@@ -9103,28 +9027,6 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="hdfs">
- <test-case FilePath="hdfs">
- <compilation-unit name="hdfs_shortcircuit">
- <output-dir compare="Text">hdfs_shortcircuit</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="hdfs">
- <compilation-unit name="issue_245_hdfs">
- <output-dir compare="Text">issue_245_hdfs</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="hdfs">
- <compilation-unit name="hdfs_02">
- <output-dir compare="Text">hdfs_02</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="hdfs">
- <compilation-unit name="hdfs_03">
- <output-dir compare="Text">hdfs_03</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
<test-group name="big-object">
<test-case FilePath="big-object">
<compilation-unit name="big_object_sort">
@@ -9152,38 +9054,6 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="external-indexing">
- <test-case FilePath="external-indexing">
- <compilation-unit name="text-format">
- <output-dir compare="Text">text-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="sequence-format">
- <output-dir compare="Text">sequence-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="rc-format">
- <output-dir compare="Text">rc-format</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="rtree-index">
- <output-dir compare="Text">rtree-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="leftouterjoin">
- <output-dir compare="Text">leftouterjoin</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="external-indexing">
- <compilation-unit name="leftouterjoin-rtree">
- <output-dir compare="Text">leftouterjoin-rtree</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
<test-group name="temporal">
<test-case FilePath="temporal">
<compilation-unit name="overlap_bins_gby_3">
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_hdfs.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_hdfs.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_hdfs.xml
new file mode 100644
index 0000000..45b36d0
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_hdfs.xml
@@ -0,0 +1,160 @@
+<!--
+ ! 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_sqlpp" QueryFileExtension=".sqlpp" SourceLocation="true">
+ <test-group name="open-index-enforced">
+ <test-group name="open-index-enforced/external-indexing">
+ <test-case FilePath="open-index-enforced/external-indexing">
+ <compilation-unit name="adm-format">
+ <output-dir compare="Text">adm-format</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="open-index-enforced/external-indexing">
+ <compilation-unit name="rtree-index">
+ <output-dir compare="Text">rtree-index</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="open-index-enforced/external-indexing">
+ <compilation-unit name="leftouterjoin">
+ <output-dir compare="Text">leftouterjoin</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="open-index-enforced/external-indexing">
+ <compilation-unit name="leftouterjoin-rtree">
+ <output-dir compare="Text">leftouterjoin-rtree</output-dir>
+ </compilation-unit>
+ </test-case>
+ </test-group>
+ </test-group>
+ <test-group name="nested-open-index">
+ <test-group name="nested-open-index/external-indexing">
+ <test-case FilePath="nested-open-index/external-indexing">
+ <compilation-unit name="adm-format">
+ <output-dir compare="Text">adm-format</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="nested-open-index/external-indexing">
+ <compilation-unit name="rtree-index">
+ <output-dir compare="Text">rtree-index</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="nested-open-index/external-indexing">
+ <compilation-unit name="leftouterjoin">
+ <output-dir compare="Text">leftouterjoin</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="nested-open-index/external-indexing">
+ <compilation-unit name="leftouterjoin-rtree">
+ <output-dir compare="Text">leftouterjoin-rtree</output-dir>
+ </compilation-unit>
+ </test-case>
+ </test-group>
+ </test-group>
+ <test-group name="nested-index">
+ <test-group name="nested-index/external-indexing">
+ <test-case FilePath="nested-index/external-indexing">
+ <compilation-unit name="adm-format">
+ <output-dir compare="Text">adm-format</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="nested-index/external-indexing">
+ <compilation-unit name="rtree-index">
+ <output-dir compare="Text">rtree-index</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="nested-index/external-indexing">
+ <compilation-unit name="leftouterjoin">
+ <output-dir compare="Text">leftouterjoin</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="nested-index/external-indexing">
+ <compilation-unit name="leftouterjoin-rtree">
+ <output-dir compare="Text">leftouterjoin-rtree</output-dir>
+ </compilation-unit>
+ </test-case>
+ </test-group>
+ </test-group>
+ <test-group name="subquery">
+ <test-case FilePath="subquery">
+ <compilation-unit name="decorrelate_with_unique_id_2">
+ <output-dir compare="Text">decorrelate_with_unique_id_2</output-dir>
+ </compilation-unit>
+ </test-case>
+ </test-group>
+ <test-group name="hints">
+ <test-case FilePath="hints">
+ <compilation-unit name="issue_251_dataset_hint_6">
+ <output-dir compare="Text">issue_251_dataset_hint_6</output-dir>
+ </compilation-unit>
+ </test-case>
+ </test-group>
+ <test-group name="hdfs">
+ <test-case FilePath="hdfs">
+ <compilation-unit name="hdfs_shortcircuit">
+ <output-dir compare="Text">hdfs_shortcircuit</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="hdfs">
+ <compilation-unit name="issue_245_hdfs">
+ <output-dir compare="Text">issue_245_hdfs</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="hdfs">
+ <compilation-unit name="hdfs_02">
+ <output-dir compare="Text">hdfs_02</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="hdfs">
+ <compilation-unit name="hdfs_03">
+ <output-dir compare="Text">hdfs_03</output-dir>
+ </compilation-unit>
+ </test-case>
+ </test-group>
+ <test-group name="external-indexing">
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="text-format">
+ <output-dir compare="Text">text-format</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="sequence-format">
+ <output-dir compare="Text">sequence-format</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="rc-format">
+ <output-dir compare="Text">rc-format</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="rtree-index">
+ <output-dir compare="Text">rtree-index</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="leftouterjoin">
+ <output-dir compare="Text">leftouterjoin</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="external-indexing">
+ <compilation-unit name="leftouterjoin-rtree">
+ <output-dir compare="Text">leftouterjoin-rtree</output-dir>
+ </compilation-unit>
+ </test-case>
+ </test-group>
+</test-suite>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-external-data/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml
index a73ac92..74d2def 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -420,10 +420,14 @@
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
</dependency>
- <dependency>
- <groupId>com.esri.geometry</groupId>
- <artifactId>esri-geometry-api</artifactId>
- <version>2.0.0</version>
- </dependency>
+ <dependency>
+ <groupId>com.esri.geometry</groupId>
+ <artifactId>esri-geometry-api</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/pom.xml b/asterixdb/asterix-metadata/pom.xml
index 94c2668..510bae0 100644
--- a/asterixdb/asterix-metadata/pom.xml
+++ b/asterixdb/asterix-metadata/pom.xml
@@ -169,15 +169,15 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-om/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-om/pom.xml b/asterixdb/asterix-om/pom.xml
index 3be3e2f..75628b7 100644
--- a/asterixdb/asterix-om/pom.xml
+++ b/asterixdb/asterix-om/pom.xml
@@ -127,5 +127,10 @@
<artifactId>esri-geometry-api</artifactId>
<version>2.0.0</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-test-framework/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-test-framework/pom.xml b/asterixdb/asterix-test-framework/pom.xml
index 2025d5a..188e4d9 100644
--- a/asterixdb/asterix-test-framework/pom.xml
+++ b/asterixdb/asterix-test-framework/pom.xml
@@ -78,6 +78,14 @@
<groupId>com.sun.activation</groupId>
<artifactId>javax.activation</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java b/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java
index 201945c..8939bd1 100644
--- a/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java
+++ b/asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java
@@ -29,17 +29,27 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.sax.SAXSource;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
public class TestSuiteParser {
+ private static final Logger LOGGER = LogManager.getLogger();
+
public TestSuite parse(File testSuiteCatalog) throws SAXException, JAXBException, ParserConfigurationException {
SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
saxParserFactory.setNamespaceAware(true);
saxParserFactory.setXIncludeAware(true);
SAXParser saxParser = saxParserFactory.newSAXParser();
- saxParser.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "file");
+ try {
+ saxParser.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "file");
+ } catch (SAXNotRecognizedException | SAXNotSupportedException e) {
+ LOGGER.warn("ignoring exception setting sax parser property", e);
+ }
JAXBContext ctx = JAXBContext.newInstance(TestSuite.class);
Unmarshaller um = ctx.createUnmarshaller();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/asterixdb/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 3d8d805..0c7c19d 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -75,7 +75,7 @@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<algebricks.version>0.3.4-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.4-SNAPSHOT</hyracks.version>
- <hadoop.version>2.2.0</hadoop.version>
+ <hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
@@ -321,7 +321,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
@@ -798,7 +798,8 @@
<jdk>11</jdk>
</activation>
<properties>
- <target.jdk.version>11</target.jdk.version>
+ <!-- several plugins do not yet support Java 11 classes (maven-plugin-plugin, maven-dependency-plugin) -->
+ <target.jdk.version>10</target.jdk.version>
</properties>
</profile>
<profile>
@@ -936,6 +937,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<classifier>tests</classifier>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
index 61235ca..406f566 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
@@ -83,6 +83,11 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
index 409abbd..9c6d09d 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
@@ -192,5 +192,11 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.04</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java
index 2a34fc7..1476326 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java
@@ -109,7 +109,7 @@ public class LicenseUtil {
while (trimmed.length() > wrapLength) {
int cut = trimmed.lastIndexOf(' ', wrapLength);
cut = Math.max(cut, trimmed.lastIndexOf('\t', wrapLength));
- if (cut != -1) {
+ if (cut != -1 && cut > leadingWS) {
out.append(trimmed.substring(0, cut));
out.append('\n');
trimmed = trimmed.substring(cut + 1);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3477a2b7/hyracks-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 1de4c6b..58562a7 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -65,7 +65,7 @@
<test.includes>${global.test.includes}</test.includes>
<test.excludes>${global.test.excludes}</test.excludes>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <hadoop.version>2.2.0</hadoop.version>
+ <hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
@@ -216,6 +216,11 @@
<artifactId>mockito-all</artifactId>
<version>2.0.2-beta</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
@@ -425,7 +430,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -730,7 +735,8 @@
<jdk>11</jdk>
</activation>
<properties>
- <target.jdk.version>11</target.jdk.version>
+ <!-- several plugins do not yet support Java 11 classes (maven-plugin-plugin, maven-dependency-plugin) -->
+ <target.jdk.version>10</target.jdk.version>
</properties>
</profile>
<profile>
@@ -764,4 +770,4 @@
<module>algebricks</module>
<module>hyracks-fullstack-license</module>
</modules>
-</project>
\ No newline at end of file
+</project>