Repository: hive Updated Branches: refs/heads/branch-1 0e47786f5 -> 82244ce67
HIVE-8931: Test TestAccumuloCliDriver is not completing Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/82244ce6 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/82244ce6 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/82244ce6 Branch: refs/heads/branch-1 Commit: 82244ce6764ac62b6d2c10863d315a523ab168a7 Parents: 0e47786 Author: Daniel Dai <da...@hortonworks.com> Authored: Tue Jun 9 20:20:45 2015 -0700 Committer: Daniel Dai <da...@hortonworks.com> Committed: Tue Jun 9 20:20:45 2015 -0700 ---------------------------------------------------------------------- itests/pom.xml | 1 + itests/qtest-accumulo/pom.xml | 508 +++++++++++++++++++ .../test/java/org/apache/hive/TestDummy.java | 31 ++ itests/qtest/pom.xml | 41 -- 4 files changed, 540 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/82244ce6/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index bf909eb..867fd87 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -38,6 +38,7 @@ <module>util</module> <module>test-serde</module> <module>qtest</module> + <module>qtest-accumulo</module> <module>hive-jmh</module> </modules> http://git-wip-us.apache.org/repos/asf/hive/blob/82244ce6/itests/qtest-accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml new file mode 100644 index 0000000..3298af3 --- /dev/null +++ b/itests/qtest-accumulo/pom.xml @@ -0,0 +1,508 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed 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> + <groupId>org.apache.hive</groupId> + <artifactId>hive-it</artifactId> + <version>1.3.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>hive-it-qfile-accumulo</artifactId> + <packaging>jar</packaging> + <name>Hive Integration - QFile Accumulo Tests</name> + + <properties> + <hive.path.to.root>../..</hive.path.to.root> + + <qfile></qfile> + <qfile_regex></qfile_regex> + <run_disabled>false</run_disabled> + <clustermode></clustermode> + <!-- Profile activation clause for accumulo-tests will flip skip.accumulo.tests to false + as long as -DskipAccumuloTests is not specified --> + <skip.accumulo.tests>true</skip.accumulo.tests> + <accumulo-thrift.version>0.9.0</accumulo-thrift.version> + </properties> + + <dependencies> + <!-- dependencies are always listed in sorted order by groupId, artifectId --> + <!-- test intra-project --> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-ant</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-common</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-contrib</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-metastore</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-metastore</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-it-custom-serde</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-it-util</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>core</classifier> + </dependency> + <!-- test inter-project --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <!-- Declare hive-exec dependencies that were shaded in instead of + being listed as dependencies --> + <dependency> + <groupId>com.esotericsoftware.kryo</groupId> + <artifactId>kryo</artifactId> + <version>${kryo.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>${commons-lang3.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javolution</groupId> + <artifactId>javolution</artifactId> + <version>${javolution.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + <profiles> + <profile> + <!-- replaces -Dclustermode=minimr which I am sure sure was used? --> + <id>minimr</id> + <properties> + <test.warehouse.scheme></test.warehouse.scheme> + </properties> + </profile> + <profile> + <id>hadoop-1</id> + <properties> + <active.hadoop.version>${hadoop-20S.version}</active.hadoop.version> + <test.dfs.mkdir>-mkdir</test.dfs.mkdir> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <version>${hadoop-20S.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> + <version>${hadoop-20S.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-tools</artifactId> + <version>${hadoop-20S.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase.hadoop1.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase.hadoop1.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase.hadoop1.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase.hadoop1.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop1-compat</artifactId> + <version>${hbase.hadoop1.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop1-compat</artifactId> + <version>${hbase.hadoop1.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.hadoop1.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.hadoop1.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>hadoop-2</id> + <properties> + <active.hadoop.version>${hadoop-23.version}</active.hadoop.version> + <test.dfs.mkdir>-mkdir -p</test.dfs.mkdir> + </properties> + <dependencies> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-servlet</artifactId> + <version>${jersey.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-archives</artifactId> + <version>${hadoop-23.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop-23.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop-23.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop-23.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <version>${hadoop-23.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-jobclient</artifactId> + <version>${hadoop-23.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-hs</artifactId> + <version>${hadoop-23.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <version>${hadoop-23.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-server-tests</artifactId> + <version>${hadoop-23.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-yarn-client</artifactId> + <version>${hadoop-23.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase.hadoop2.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-common</artifactId> + <version>${hbase.hadoop2.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase.hadoop2.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop-compat</artifactId> + <version>${hbase.hadoop2.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase.hadoop2.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-hadoop2-compat</artifactId> + <version>${hbase.hadoop2.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.hadoop2.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.hadoop2.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> + <artifactId>tez-tests</artifactId> + <version>${tez.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> + <artifactId>tez-api</artifactId> + <version>${tez.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> + <artifactId>tez-runtime-library</artifactId> + <version>${tez.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> + <artifactId>tez-mapreduce</artifactId> + <version>${tez.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> + <artifactId>tez-dag</artifactId> + <version>${tez.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>accumulo-tests</id> + <activation> + <property> + <name>!skipAccumuloTests</name> + </property> + </activation> + <properties> + <skip.accumulo.tests>false</skip.accumulo.tests> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-minicluster</artifactId> + <scope>test</scope> + </dependency> + <!-- Override the thrift dependency pulled in for metaserver --> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>${accumulo-thrift.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <executions> + <execution> + <phase>initialize</phase> + <goals> + <goal>read-project-properties</goal> + </goals> + <configuration> + <files> + <file>${basedir}/../src/test/resources/testconfiguration.properties</file> + </files> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-tests-sources</id> + <phase>generate-test-sources</phase> + <configuration> + <target> + <property name="test.classpath" refid="maven.test.classpath"/> + <echo message="${test.classpath}"/> + <taskdef resource="net/sf/antcontrib/antcontrib.properties" + classpathref="maven.plugin.classpath" /> + <taskdef name="qtestgen" classname="org.apache.hadoop.hive.ant.QTestGenTask" + classpath="${test.classpath}" /> + + <!-- Accumulo Positive --> + <if> + <equals arg1="${skip.accumulo.tests}" arg2="false" /> + <then> + <mkdir dir="${project.build.directory}/qfile-results/accumulo-handler/positive/" /> + <qtestgen hiveRootDirectory="${basedir}/${hive.path.to.root}/" + outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/" + templatePath="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/templates/" template="TestAccumuloCliDriver.vm" + queryDirectory="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/queries/positive/" + queryFile="${qfile}" + runDisabled="${run_disabled}" + clusterMode="${clustermode}" + resultsDirectory="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/results/positive/" className="TestAccumuloCliDriver" + logFile="${project.build.directory}/testaccumuloclidrivergen.log" + logDirectory="${project.build.directory}/qfile-results/accumulo-handler/positive/" + initScript="q_test_init.sql" + cleanupScript="q_test_cleanup.sql"/> + </then> + </if> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>${maven.build-helper.plugin.version}</version> + <executions> + <execution> + <id>add-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>target/generated-test-sources/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/hive/blob/82244ce6/itests/qtest-accumulo/src/test/java/org/apache/hive/TestDummy.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 { + + } +} http://git-wip-us.apache.org/repos/asf/hive/blob/82244ce6/itests/qtest/pom.xml ---------------------------------------------------------------------- diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index e90f6f4..1a60e8b 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -36,9 +36,6 @@ <run_disabled>false</run_disabled> <clustermode></clustermode> <execute.beeline.tests>false</execute.beeline.tests> - <!-- Profile activation clause for accumulo-tests will flip skip.accumulo.tests to false - as long as -DskipAccumuloTests is not specified --> - <skip.accumulo.tests>true</skip.accumulo.tests> </properties> <dependencies> @@ -360,24 +357,6 @@ </dependency> </dependencies> </profile> - <profile> - <id>accumulo-tests</id> - <activation> - <property> - <name>!skipAccumuloTests</name> - </property> - </activation> - <properties> - <skip.accumulo.tests>false</skip.accumulo.tests> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-minicluster</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </profile> </profiles> <build> @@ -613,26 +592,6 @@ initScript="q_test_init.sql" cleanupScript="q_test_cleanup.sql"/> - <!-- Accumulo Positive --> - <if> - <equals arg1="${skip.accumulo.tests}" arg2="false" /> - <then> - <mkdir dir="${project.build.directory}/qfile-results/accumulo-handler/positive/" /> - <qtestgen hiveRootDirectory="${basedir}/${hive.path.to.root}/" - outputDirectory="${project.build.directory}/generated-test-sources/java/org/apache/hadoop/hive/cli/" - templatePath="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/templates/" template="TestAccumuloCliDriver.vm" - queryDirectory="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/queries/positive/" - queryFile="${qfile}" - runDisabled="${run_disabled}" - clusterMode="${clustermode}" - resultsDirectory="${basedir}/${hive.path.to.root}/accumulo-handler/src/test/results/positive/" className="TestAccumuloCliDriver" - logFile="${project.build.directory}/testaccumuloclidrivergen.log" - logDirectory="${project.build.directory}/qfile-results/accumulo-handler/positive/" - initScript="q_test_init.sql" - cleanupScript="q_test_cleanup.sql"/> - </then> - </if> - <!-- Beeline --> <if> <equals arg1="${execute.beeline.tests}" arg2="true" />
