Michael Blow has submitted this change and it was merged. Change subject: [NO ISSUE] Enable Build/Run w/ Java 11 ......................................................................
[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 <mhub...@apache.org> Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-on: https://asterix-gerrit.ics.uci.edu/3030 Reviewed-by: Till Westmann <ti...@apache.org> --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ExecutionTestUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java A asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppHdfsExecutionTest.java A asterixdb/asterix-app/src/test/resources/runtimets/only_sqlpp_hdfs.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml A asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_hdfs.xml M asterixdb/asterix-external-data/pom.xml M asterixdb/asterix-metadata/pom.xml M asterixdb/asterix-om/pom.xml M asterixdb/asterix-test-framework/pom.xml M asterixdb/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java M asterixdb/pom.xml M hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml M hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml M hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseUtil.java M hyracks-fullstack/pom.xml 18 files changed, 328 insertions(+), 282 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; No violations found; Verified 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> 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 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, 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 @@ 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 @@ } 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 @@ // 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); 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); + } +} 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> 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"> @@ -3724,28 +3670,6 @@ <test-case FilePath="nested-open-index/index-selection"> <compilation-unit name="rtree-secondary-index"> <output-dir compare="Text">rtree-secondary-index</output-dir> - </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> @@ -3976,28 +3900,6 @@ <test-case FilePath="nested-index/index-selection"> <compilation-unit name="rtree-secondary-index-open"> <output-dir compare="Text">rtree-secondary-index-open</output-dir> - </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> @@ -6639,40 +6541,8 @@ </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> 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 0127896..f5a2ab4 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml @@ -4195,28 +4195,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"> @@ -4408,28 +4386,6 @@ <test-case FilePath="nested-open-index/index-selection"> <compilation-unit name="rtree-secondary-index"> <output-dir compare="Text">rtree-secondary-index</output-dir> - </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> @@ -4670,28 +4626,6 @@ <test-case FilePath="nested-index/index-selection"> <compilation-unit name="rtree-secondary-index-optional"> <output-dir compare="Text">rtree-secondary-index-open</output-dir> - </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> @@ -6848,11 +6782,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> @@ -8815,11 +8744,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> @@ -9085,28 +9009,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"> @@ -9131,38 +9033,6 @@ <test-case FilePath="big-object"> <compilation-unit name="big_object_load_20M"> <output-dir compare="Text">big_object_load_20M</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> 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> 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> 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> 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> 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> 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.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(); 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> 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> 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> 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 @@ 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); diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 1d52cc8..a734ffc 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> @@ -215,6 +215,11 @@ <groupId>org.mockito</groupId> <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> @@ -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> -- To view, visit https://asterix-gerrit.ics.uci.edu/3030 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04377b91ea7535bd358c396fbd9fcb019c734814 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-Owner: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Murtadha Hubail <mhub...@apache.org> Gerrit-Reviewer: Till Westmann <ti...@apache.org>