You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2014/08/22 20:39:13 UTC
svn commit: r1619894 - in /pig/trunk: CHANGES.txt ivy/libraries.properties
src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java
test/org/apache/pig/test/TestHBaseStorage.java
Author: daijy
Date: Fri Aug 22 18:39:12 2014
New Revision: 1619894
URL: http://svn.apache.org/r1619894
Log:
Rollback PIG-4138: Upgrade hbase to hbase-0.98.4
Modified:
pig/trunk/CHANGES.txt
pig/trunk/ivy/libraries.properties
pig/trunk/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java
pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1619894&r1=1619893&r2=1619894&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Aug 22 18:39:12 2014
@@ -24,8 +24,6 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
-PIG-4138: Upgrade hbase to hbase-0.98.4 (fang fang chen via daijy)
-
PIG-4124: Command for Python streaming udf should be configurable (cheolsoo)
PIG-4114: Add Native operator to tez (daijy)
Modified: pig/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1619894&r1=1619893&r2=1619894&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Fri Aug 22 18:39:12 2014
@@ -45,7 +45,7 @@ hadoop-common.version=2.4.0
hadoop-hdfs.version=2.4.0
hadoop-mapreduce.version=2.4.0
hbase94.version=0.94.1
-hbase95.version=0.98.4-${hbase.hadoop.version}
+hbase95.version=0.96.0-${hbase.hadoop.version}
hsqldb.version=1.8.0.10
hive.version=0.14.0-SNAPSHOT
httpcomponents.version=4.1
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java?rev=1619894&r1=1619893&r2=1619894&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/hbase/HBaseStorage.java Fri Aug 22 18:39:12 2014
@@ -65,7 +65,6 @@ import org.apache.hadoop.hbase.mapreduce
import org.apache.hadoop.hbase.mapreduce.TableOutputFormat;
import org.apache.hadoop.hbase.mapreduce.TableSplit;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapreduce.InputFormat;
@@ -974,7 +973,7 @@ public class HBaseStorage extends LoadFu
Put put = new Put(objToBytes(key, type));
if(noWAL_) {
- put.setDurability(Durability.SKIP_WAL);
+ put.setWriteToWAL(false);
}
return put;
Modified: pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java?rev=1619894&r1=1619893&r2=1619894&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java Fri Aug 22 18:39:12 2014
@@ -36,7 +36,6 @@ import org.apache.hadoop.hbase.client.Re
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.client.Durability;
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
import org.apache.pig.backend.executionengine.ExecException;
@@ -978,7 +977,7 @@ public class TestHBaseStorage {
Object key = "somekey";
byte type = DataType.CHARARRAY;
- Assert.assertEquals(hbaseStorage.createPut(key, type).getDurability(), Durability.SKIP_WAL);
+ Assert.assertFalse(hbaseStorage.createPut(key, type).getWriteToWAL());
}
/**
@@ -992,7 +991,7 @@ public class TestHBaseStorage {
Object key = "somekey";
byte type = DataType.CHARARRAY;
- Assert.assertEquals(hbaseStorage.createPut(key, type).getDurability(), Durability.USE_DEFAULT);
+ Assert.assertTrue(hbaseStorage.createPut(key, type).getWriteToWAL());
}
/**