From a588bd6a0bdebb92e901a9bae99951f53fd7c97d Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Wed, 8 Nov 2017 11:34:18 -0800 Subject: [PATCH] HIVE-18010 : Update hbase version --- .../src/java/org/apache/hadoop/hive/hbase/HiveHFileOutputFormat.java | 4 ++-- pom.xml | 2 +- testutils/ptest2/src/main/resources/source-prep.vm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHFileOutputFormat.java b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHFileOutputFormat.java index 223dbe192a..11ef3ad9cd 100644 --- a/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHFileOutputFormat.java +++ b/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HiveHFileOutputFormat.java @@ -35,7 +35,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.CellComparator; +import org.apache.hadoop.hbase.CellComparatorImpl; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; @@ -228,7 +228,7 @@ private void writePut(PutWritable put) throws IOException { ImmutableBytesWritable row = new ImmutableBytesWritable(put.getPut().getRow()); SortedMap> cells = put.getPut().getFamilyCellMap(); for (Map.Entry> entry : cells.entrySet()) { - Collections.sort(entry.getValue(), new CellComparator()); + Collections.sort(entry.getValue(), new CellComparatorImpl()); for (Cell c : entry.getValue()) { try { fileWriter.write(row, KeyValueUtil.copyToNewKeyValue(c)); diff --git a/pom.xml b/pom.xml index 4a8878a17e..0e9ae3d5c2 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 3.0.0-beta1 ${basedir}/${hive.path.to.root}/testutils/hadoop 1.3 - 2.0.0-alpha3 + 2.0.0-alpha4 3.3.0 2.6.1 diff --git a/testutils/ptest2/src/main/resources/source-prep.vm b/testutils/ptest2/src/main/resources/source-prep.vm index 7ad50248af..1df7ab1fcf 100644 --- a/testutils/ptest2/src/main/resources/source-prep.vm +++ b/testutils/ptest2/src/main/resources/source-prep.vm @@ -102,11 +102,11 @@ cd $workingDir/ fi done #end - mvn -B clean install -DskipTests -T 4 -q -Dmaven.repo.local=$workingDir/maven $mavenArgs $mavenBuildArgs + mvn -B clean install -DskipTests -q -U -Dmaven.repo.local=$workingDir/maven $mavenArgs $mavenBuildArgs if [[ -d "itests" ]] then cd itests - mvn -B clean install -DskipTests -T 4 -q -Dmaven.repo.local=$workingDir/maven $mavenArgs $mavenBuildArgs + mvn -B clean install -DskipTests -q -U -Dmaven.repo.local=$workingDir/maven $mavenArgs $mavenBuildArgs fi elif [[ "${buildTool}" == "ant" ]] then -- 2.13.6 (Apple Git-96)