From fc7383538fff1d3665b9754bedc97abfee49af23 Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Fri, 5 Jun 2015 22:32:40 -0400 Subject: [PATCH] HIVE-8931 Move Accumulo qtests into their own module. There's no good way to not mess with the other tests but strip out the duplicated thrift dependencies across metastore and Accumulo. Allows us to remove the shaded hive-exec jar safely as well. Incorporates a property to specify the thrift version to use, as that does change from 0.9.0 to 0.9.1 in recent Accumulo release history. --- itests/pom.xml | 1 + itests/qtest-accumulo/pom.xml | 502 +++++++++++++++++++++ .../src/test/java/org/apache/hive/TestDummy.java | 31 ++ itests/qtest/pom.xml | 41 -- 4 files changed, 534 insertions(+), 41 deletions(-) create mode 100644 itests/qtest-accumulo/pom.xml create mode 100644 itests/qtest-accumulo/src/test/java/org/apache/hive/TestDummy.java diff --git a/itests/pom.xml b/itests/pom.xml index c505525..69435de 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -38,6 +38,7 @@ util test-serde qtest + qtest-accumulo hive-jmh diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml new file mode 100644 index 0000000..307d24d --- /dev/null +++ b/itests/qtest-accumulo/pom.xml @@ -0,0 +1,502 @@ + + + + 4.0.0 + + + org.apache.hive + hive-it + 1.3.0-SNAPSHOT + ../pom.xml + + + hive-it-qfile-accumulo + jar + Hive Integration - QFile Accumulo Tests + + + ../.. + + + + false + + + true + 0.9.0 + + + + + + + org.apache.hive + hive-ant + ${project.version} + test + + + org.apache.hive + hive-common + ${project.version} + test + + + org.apache.hive + hive-contrib + ${project.version} + test + + + org.apache.hive + hive-exec + + + + + org.apache.hive + hive-metastore + ${project.version} + test + + + org.apache.hive + hive-metastore + ${project.version} + tests + test + + + org.apache.hive + hive-it-custom-serde + ${project.version} + test + + + org.apache.hive + hive-it-util + ${project.version} + test + + + org.apache.hive + hive-exec + + + + + org.apache.hive + hive-serde + ${project.version} + test + + + org.apache.hive + hive-exec + ${project.version} + test + core + + + + junit + junit + ${junit.version} + test + + + + com.esotericsoftware.kryo + kryo + ${kryo.version} + test + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + test + + + + + + minimr + + + + + + hadoop-1 + + ${hadoop-20S.version} + -mkdir + + + + org.apache.hadoop + hadoop-core + ${hadoop-20S.version} + test + + + org.apache.hadoop + hadoop-test + ${hadoop-20S.version} + test + + + org.apache.hadoop + hadoop-tools + ${hadoop-20S.version} + test + + + org.apache.hbase + hbase-common + ${hbase.hadoop1.version} + test + + + org.apache.hbase + hbase-common + ${hbase.hadoop1.version} + test + tests + + + org.apache.hbase + hbase-hadoop-compat + ${hbase.hadoop1.version} + test + + + org.apache.hbase + hbase-hadoop-compat + ${hbase.hadoop1.version} + test + tests + + + org.apache.hbase + hbase-hadoop1-compat + ${hbase.hadoop1.version} + test + + + org.apache.hbase + hbase-hadoop1-compat + ${hbase.hadoop1.version} + test + tests + + + org.apache.hbase + hbase-server + ${hbase.hadoop1.version} + test + + + org.apache.hbase + hbase-server + ${hbase.hadoop1.version} + tests + test + + + + + hadoop-2 + + ${hadoop-23.version} + -mkdir -p + + + + com.sun.jersey + jersey-servlet + ${jersey.version} + test + + + org.apache.hadoop + hadoop-archives + ${hadoop-23.version} + test + + + org.apache.hadoop + hadoop-common + ${hadoop-23.version} + test + + + org.apache.hadoop + hadoop-common + ${hadoop-23.version} + tests + test + + + org.apache.hadoop + hadoop-hdfs + ${hadoop-23.version} + tests + test + + + org.apache.hadoop + hadoop-hdfs + ${hadoop-23.version} + test + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + ${hadoop-23.version} + tests + test + + + org.apache.hadoop + hadoop-mapreduce-client-hs + ${hadoop-23.version} + test + + + org.apache.hadoop + hadoop-mapreduce-client-core + ${hadoop-23.version} + test + + + commons-logging + commons-logging + ${commons-logging.version} + + + org.apache.hadoop + hadoop-yarn-server-tests + ${hadoop-23.version} + test + tests + + + org.apache.hadoop + hadoop-yarn-client + ${hadoop-23.version} + test + + + org.apache.hbase + hbase-common + ${hbase.hadoop2.version} + test + + + org.apache.hbase + hbase-common + ${hbase.hadoop2.version} + test + tests + + + org.apache.hbase + hbase-hadoop-compat + ${hbase.hadoop2.version} + test + + + org.apache.hbase + hbase-hadoop-compat + ${hbase.hadoop2.version} + test + tests + + + org.apache.hbase + hbase-hadoop2-compat + ${hbase.hadoop2.version} + test + + + org.apache.hbase + hbase-hadoop2-compat + ${hbase.hadoop2.version} + test + tests + + + org.apache.hbase + hbase-server + ${hbase.hadoop2.version} + test + + + org.apache.hbase + hbase-server + ${hbase.hadoop2.version} + tests + test + + + org.apache.tez + tez-tests + ${tez.version} + test-jar + + + org.apache.tez + tez-api + ${tez.version} + test + + + org.apache.tez + tez-runtime-library + ${tez.version} + test + + + org.apache.tez + tez-mapreduce + ${tez.version} + test + + + org.apache.tez + tez-dag + ${tez.version} + test + + + + + accumulo-tests + + + !skipAccumuloTests + + + + false + + + + org.apache.accumulo + accumulo-minicluster + test + + + + org.apache.thrift + libthrift + ${accumulo-thrift.version} + test + + + + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + initialize + + read-project-properties + + + + ${basedir}/../src/test/resources/testconfiguration.properties + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + generate-tests-sources + generate-test-sources + + + + + + + + + + + + + + + + + + + run + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${maven.build-helper.plugin.version} + + + add-test-sources + generate-test-sources + + add-test-source + + + + target/generated-test-sources/java + + + + + + + + + diff --git a/itests/qtest-accumulo/src/test/java/org/apache/hive/TestDummy.java b/itests/qtest-accumulo/src/test/java/org/apache/hive/TestDummy.java new file mode 100644 index 0000000..0f83345 --- /dev/null +++ b/itests/qtest-accumulo/src/test/java/org/apache/hive/TestDummy.java @@ -0,0 +1,31 @@ +/** + * 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.hive; + + +import org.junit.Test; + + +public class TestDummy { + + @Test + public void testDummy() throws Exception { + + } +} diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index 55b2b5e..615fdf8 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -36,9 +36,6 @@ false false - - true @@ -360,24 +357,6 @@ - - accumulo-tests - - - !skipAccumuloTests - - - - false - - - - org.apache.accumulo - accumulo-minicluster - test - - - @@ -613,26 +592,6 @@ initScript="q_test_init.sql" cleanupScript="q_test_cleanup.sql"/> - - - - - - - - - -- 2.1.2