From 29b3cd2a98dba63bc6a26202ff1b084dac5aa5d3 Mon Sep 17 00:00:00 2001
From: Peter MacKinnon <pmackinn@redhat.com>
Date: Wed, 8 Jan 2014 12:08:10 -0500
Subject: [PATCH 04/10] ql mods
---
ql/build.xml | 101 +--------------------
ql/ivy.xml | 4 +-
.../apache/hadoop/hive/ql/exec/ExplainTask.java | 6 +-
.../hadoop/hive/ql/io/orc/RecordReaderImpl.java | 8 +-
.../apache/hadoop/hive/ql/io/orc/SnappyCodec.java | 2 +-
.../org/apache/hadoop/hive/ql/parse/EximUtil.java | 6 +-
.../generic/AbstractGenericUDFEWAHBitmapBop.java | 2 +-
.../hive/ql/udf/generic/GenericUDAFEWAHBitmap.java | 2 +-
.../ql/udf/generic/GenericUDFEWAHBitmapAnd.java | 2 +-
.../ql/udf/generic/GenericUDFEWAHBitmapEmpty.java | 2 +-
.../ql/udf/generic/GenericUDFEWAHBitmapOr.java | 2 +-
11 files changed, 20 insertions(+), 117 deletions(-)
diff --git a/ql/build.xml b/ql/build.xml
index 64e7b59..95344fd 100644
--- a/ql/build.xml
+++ b/ql/build.xml
@@ -197,7 +197,10 @@
deprecation="${javac.deprecation}"
includeantruntime="false">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
- <classpath refid="classpath"/>
+ <classpath>
+ <pathelement location="${build.ivy.lib.dir}/default/jline-${jline.version}.jar"/>
+ <path refid="classpath"/>
+ </classpath>
</javac>
<copy todir="${build.classes}" failonerror="false">
<fileset dir="${src.dir}/conf"/>
@@ -208,108 +211,12 @@
<target name="jar" depends="make-pom,compile">
<echo message="Project: ${ant.project.name}"/>
- <unzip src="${build.ivy.lib.dir}/default/libthrift-${libthrift.version}.jar" dest="${build.dir.hive}/thrift/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
- <unzip src="${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar" dest="${build.dir.hive}/commons-lang/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
- <unzip src="${build.ivy.lib.dir}/default/json-${json.version}.jar" dest="${build.dir.hive}/json/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
- <unzip src="${build.ivy.lib.dir}/default/JavaEWAH-${javaewah.version}.jar" dest="${build.dir.hive}/javaewah/classes">
- <patternset>
- <exclude name="meta-inf"/>
- <exclude name="meta-inf/manifest.mf"/>
- </patternset>
- </unzip>
- <unzip src="${build.ivy.lib.dir}/default/avro-${avro.version}.jar" dest="${build.dir.hive}/avro/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
- <unzip src="${build.ivy.lib.dir}/default/avro-mapred-${avro.version}.jar" dest="${build.dir.hive}/avro-mapred/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
- <unzip src="${build.ivy.lib.dir}/default/javolution-${javolution.version}.jar" dest="${build.dir.hive}/javolution/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
- <unzip
- src="${build.ivy.lib.dir}/default/protobuf-java-${protobuf.version}.jar"
- dest="${build.dir.hive}/protobuf-java/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
- <unzip
- src="${build.ivy.lib.dir}/default/guava-${guava.version}.jar"
- dest="${build.dir.hive}/guava/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
-
- <unzip
- src="${build.ivy.lib.dir}/default/snappy-${snappy.version}.jar"
- dest="${build.dir.hive}/snappy/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
- <unzip
- src="${build.ivy.lib.dir}/default/jackson-core-asl-${jackson.version}.jar"
- dest="${build.dir.hive}/jackson-core-asl/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
- <unzip
- src="${build.ivy.lib.dir}/default/jackson-mapper-asl-${jackson.version}.jar"
- dest="${build.dir.hive}/jackson-mapper-asl/classes">
- <patternset>
- <exclude name="META-INF"/>
- <exclude name="META-INF/MANIFEST.MF"/>
- </patternset>
- </unzip>
<!-- jar jarfile="${build.dir}/hive_${name}.jar" basedir="${build.classes}" / -->
<jar jarfile="${build.dir}/hive-exec-${version}.jar">
<fileset dir="${build.dir.hive}/common/classes" includes="**/*.class"/>
<fileset dir="${build.dir.hive}/ql/classes" includes="**/*.class,**/*.properties"/>
<fileset dir="${build.dir.hive}/serde/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/thrift/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/commons-lang/classes" includes="**/StringUtils.class,**/WordUtils.class"/>
- <fileset dir="${build.dir.hive}/json/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/avro/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/avro-mapred/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/shims/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/javaewah/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/javolution/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/protobuf-java/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/snappy/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/jackson-core-asl/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/jackson-mapper-asl/classes" includes="**/*.class"/>
- <fileset dir="${build.dir.hive}/guava/classes" includes="**/*.class"/>
<manifest>
<!-- Not putting these in their own manifest section, since that inserts
a new-line, which breaks the reading of the attributes. -->
diff --git a/ql/ivy.xml b/ql/ivy.xml
index 08a8d6f..6fe43b4 100644
--- a/ql/ivy.xml
+++ b/ql/ivy.xml
@@ -44,10 +44,10 @@
</dependency>
<dependency org="com.google.protobuf" name="protobuf-java"
rev="${protobuf.version}" transitive="false"/>
- <dependency org="org.iq80.snappy" name="snappy"
+ <dependency org="org.xerial.snappy" name="snappy-java"
rev="${snappy.version}" transitive="false"/>
- <dependency org="org.json" name="json" rev="${json.version}"/>
+ <dependency org="net.sf.json-lib" name="json-lib" rev="${json.version}"/>
<dependency org="commons-collections" name="commons-collections" rev="${commons-collections.version}"/>
<dependency org="commons-configuration" name="commons-configuration" rev="${commons-configuration.version}"
transitive="false"/>
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java
index 7e1f6ef..e5178b6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java
@@ -48,9 +48,9 @@
import org.apache.hadoop.hive.ql.plan.api.StageType;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.util.StringUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
/**
* ExplainTask implementation.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
index 5beb48e..db0b623 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderImpl.java
@@ -1129,9 +1129,7 @@ Object next(Object previous) throws IOException {
void seek(PositionProvider[] index) throws IOException {
super.seek(index);
for(TreeReader kid: fields) {
- if (kid != null) {
- kid.seek(index);
- }
+ kid.seek(index);
}
}
@@ -1177,9 +1175,7 @@ void startStripe(Map<StreamName, InStream> streams,
void skipRows(long items) throws IOException {
items = countNonNulls(items);
for(TreeReader field: fields) {
- if (field != null) {
- field.skipRows(items);
- }
+ field.skipRows(items);
}
}
}
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/SnappyCodec.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/SnappyCodec.java
index e3131a3..c8324ad 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/SnappyCodec.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/SnappyCodec.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hive.ql.io.orc;
-import org.iq80.snappy.Snappy;
+import org.xerial.snappy.Snappy;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/EximUtil.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/EximUtil.java
index 3031d1c..222f276 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/EximUtil.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/EximUtil.java
@@ -47,9 +47,9 @@
import org.apache.thrift.TException;
import org.apache.thrift.TSerializer;
import org.apache.thrift.protocol.TJSONProtocol;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
/**
*
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java
index 58ea3ba..198bab5 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/AbstractGenericUDFEWAHBitmapBop.java
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
-import javaewah.EWAHCompressedBitmap;
+import com.googlecode.javaewah.EWAHCompressedBitmap;
import org.apache.hadoop.hive.ql.exec.UDFArgumentException;
import org.apache.hadoop.hive.ql.exec.UDFArgumentLengthException;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEWAHBitmap.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEWAHBitmap.java
index e4b412e..bb8afe7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEWAHBitmap.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEWAHBitmap.java
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.util.ArrayList;
-import javaewah.EWAHCompressedBitmap;
+import com.googlecode.javaewah.EWAHCompressedBitmap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapAnd.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapAnd.java
index 7838b54..b942988 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapAnd.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapAnd.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hive.ql.udf.generic;
-import javaewah.EWAHCompressedBitmap;
+import com.googlecode.javaewah.EWAHCompressedBitmap;
import org.apache.hadoop.hive.ql.exec.Description;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapEmpty.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapEmpty.java
index 4a14a65..f0617c1 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapEmpty.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapEmpty.java
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.util.ArrayList;
-import javaewah.EWAHCompressedBitmap;
+import com.googlecode.javaewah.EWAHCompressedBitmap;
import org.apache.hadoop.hive.ql.exec.Description;
import org.apache.hadoop.hive.ql.exec.UDFArgumentException;
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapOr.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapOr.java
index d438f82..47e9447 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapOr.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEWAHBitmapOr.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hive.ql.udf.generic;
-import javaewah.EWAHCompressedBitmap;
+import com.googlecode.javaewah.EWAHCompressedBitmap;
import org.apache.hadoop.hive.ql.exec.Description;
--
1.8.5.2