diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index 26e423c..f4bdf3d 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -89,6 +89,7 @@ org.apache.hive hive-streaming ${project.version} + ${hive.jdbc.driver.classifier} org.apache.hive.hcatalog diff --git a/streaming/pom.xml b/streaming/pom.xml index ccc55eb..cf6b0e5 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -37,8 +37,14 @@ org.apache.hive - hive-serde + hive-common + ${project.version} + + + org.apache.hive + hive-exec ${project.version} + core org.apache.hive @@ -47,10 +53,49 @@ org.apache.hive - hive-exec + hive-llap-common ${project.version} + org.apache.hive + hive-serde + ${project.version} + + + org.apache.hive + hive-standalone-metastore + ${project.version} + + + org.apache.hive + hive-storage-api + ${storage-api.version} + + + org.apache.hive.shims + hive-shims-common + ${project.version} + runtime + + + org.apache.hive.shims + hive-shims-0.23 + ${project.version} + runtime + + + + + com.google.guava + guava + ${guava.version} + + + org.apache.thrift + libthrift + ${libthrift.version} + + org.slf4j slf4j-api ${slf4j.version} @@ -58,24 +103,23 @@ org.apache.hadoop hadoop-common - true ${hadoop.version} org.apache.hadoop hadoop-mapreduce-client-core - true ${hadoop.version} - - - org.slf4j - slf4j-log4j12 - - - commmons-logging - commons-logging - - + + + org.apache.hive + hive-exec + ${project.version} + test + + + org.apache.orc + orc-core + ${orc.version} @@ -86,6 +130,12 @@ test + com.esotericsoftware + kryo + ${kryo.version} + test + + org.apache.hive hive-cli ${project.version} @@ -114,4 +164,198 @@ + + + dist + + ${hive.jdbc.driver.classifier} + + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + + + false + runtime + true + ${classifier.name} + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + core-default.xml + + + + + + org.apache.hive:hive-classification + org.eclipse.jetty:* + org.apache.logging.log4j:log4j-web + net.sf.jpam:* + com.tdunning:* + io.dropwizard.metrics:* + com.github.joshelser:* + org.apache.hive:hive-service-rpc + tomcat:* + javax.servlet:* + commons-el:* + org.apache.hadoop:hadoop-yarn-registry + org.apache.hadoop:hadoop-yarn-api + org.apache.hadoop:hadoop-yarn-server-resourcemanager + org.apache.hadoop:hadoop-yarn-server-common + org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice + org.apache.hadoop:hadoop-yarn-server-web-proxy + org.apache.hadoop:hadoop-yarn-client + org.apache.hadoop:hadoop-yarn-common + org.apache.hadoop:hadoop-distcp + org.apache.hadoop:hadoop-client + org.apache.hadoop:hadoop-mapreduce-client-jobclient + org.apache.hadoop:hadoop-mapreduce-client-common + org.apache.hadoop:hadoop-hdfs + org.apache.geronimo.specs:* + org.ehcache:* + com.microsoft.sqlserver:* + de.ruedigermoeller:* + com.cedarsoftware:* + org.fusesource.leveldbjni:* + commons-codec:* + commons-lang:* + org.apache.arrow:* + io.netty:* + com.carrotsearch:* + com.vlkan:* + org.codehaus.jackson:jackson-mapper-asl + com.thoughtworks.paranamer:* + org.apache.httpcomponents:* + net.sf.opencsv:* + org.apache.parquet:* + javax.transaction:* + sqlline:* + javolution:* + org.apache.hbase:* + org.apache.hbase.thirdparty:* + com.github.stephenc.findbugs:* + org.jruby.jcodings:* + org.jruby.joni:* + org.apache.yetus:* + commons-cli:* + org.apache.derby:* + org.antlr:* + co.cask.tephra:* + com.google.inject:* + javax.inject:* + aopalliance:* + com.google.inject.extensions:* + it.unimi.dsi:* + org.apache.twill:* + org.apache.hive:hive-vector-code-gen + org.apache.velocity:* + oro:* + org.apache.hive:hive-llap-tez + org.apache.hive:hive-llap-client + commons-httpclient:* + commons-io:* + ant:* + org.apache.ant:* + commons-daemon:* + dnsjava:* + org.apache.ivy:* + org.apache.zookeeper:* + org.apache.curator:* + com.fasterxml.jackson.core:* + org.apache.calcite:* + com.esri.geometry:* + com.yahoo.datasketches:* + org.codehaus.janino:* + com.google.code.gson:* + stax:* + commons-net:* + commons-collections:* + com.sun.jersey:* + javax.ws.rs:* + org.codehaus.jettison:* + com.sun.xml.bind:* + log4j:* + commons-beanutils:* + com.google.re2j:* + com.nimbusds:* + com.github.stephenc.jcip:* + net.minidev:* + org.ow2.asm:* + com.jcraft:* + org.apache.kerby:* + javax.xml.bind:* + com.fasterxml.jackson.module:* + com.fasterxml.jackson.jaxrs:* + com.squareup.okhttp:* + com.squareup.okio:* + jline:* + org.mockito:* + org.jamon:* + org.codehaus.groovy:* + org.antlr:* + org.apache.calcite:* + org.apache.calcite.avatica:* + javax.annotation:* + javax.jdo:* + commons-logging:* + com.sun.jersey.contribs:* + org.apache.hive:hive-spark-client + org.apache.spark:* + org.scala-lang:* + org.scala-lang.modules:* + net.java.dev.jets3t:* + com.jamesmurty.utils:* + org.bouncycastle:* + net.iharder:* + com.ning:* + io.druid:* + net.jpountz.lz4:* + net.jpountz.lz4.wso2:* + com.github.luben:* + org.roaringbitmap:* + org.json4s:* + org.scala-tools.testing:* + com.clearspring:* + com.clearspring.analytics:* + net.razorvine:* + net.sf.py4j + com.esotericsoftware:* + org.objenesis:* + org.apache.avro:avro-ipc + org.apache.orc:orc-tools + org.threeten:* + org.jodd:* + com.twitter:* + org.apache.xbean:* + com.sun.activation:* + javax.activation:* + org.glassfish:* + + + + + + + + + + diff --git a/streaming/src/java/org/apache/hive/streaming/StrictRegexWriter.java b/streaming/src/java/org/apache/hive/streaming/StrictRegexWriter.java index 3651fa1..52e89f3 100644 --- a/streaming/src/java/org/apache/hive/streaming/StrictRegexWriter.java +++ b/streaming/src/java/org/apache/hive/streaming/StrictRegexWriter.java @@ -20,13 +20,14 @@ import java.util.Properties; -import org.apache.commons.lang.StringUtils; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.RegexSerDe; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeUtils; import org.apache.hadoop.io.Text; +import com.google.common.base.Joiner; + /** * Streaming Writer handles text input data with regex. Uses * org.apache.hadoop.hive.serde2.RegexSerDe @@ -75,7 +76,7 @@ public RegexSerDe createSerde() throws SerializationError { try { Properties tableProps = table.getMetadata(); tableProps.setProperty(RegexSerDe.INPUT_REGEX, regex); - tableProps.setProperty(serdeConstants.LIST_COLUMNS, StringUtils.join(inputColumns, ",")); + tableProps.setProperty(serdeConstants.LIST_COLUMNS, Joiner.on(",").join(inputColumns)); RegexSerDe serde = new RegexSerDe(); SerDeUtils.initializeSerDe(serde, conf, tableProps, null); this.serde = serde;