You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2014/02/27 07:23:20 UTC

git commit: Disable ClientKeyValue builder feature until it's tested

Repository: incubator-phoenix
Updated Branches:
  refs/heads/master b6a6787f7 -> 8bbce3c10


Disable ClientKeyValue builder feature until it's tested


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/8bbce3c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/8bbce3c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/8bbce3c1

Branch: refs/heads/master
Commit: 8bbce3c102cba4990e4df2621edb13ae3c993e00
Parents: b6a6787
Author: James Taylor <ja...@apache.org>
Authored: Wed Feb 26 22:23:10 2014 -0800
Committer: James Taylor <ja...@apache.org>
Committed: Wed Feb 26 22:23:10 2014 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/phoenix/client/KeyValueBuilder.java | 4 ++--
 pom.xml                                                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/8bbce3c1/phoenix-core/src/main/java/org/apache/phoenix/client/KeyValueBuilder.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/client/KeyValueBuilder.java b/phoenix-core/src/main/java/org/apache/phoenix/client/KeyValueBuilder.java
index 47d4f8e..93cef34 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/client/KeyValueBuilder.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/client/KeyValueBuilder.java
@@ -24,7 +24,6 @@ import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
-
 import org.apache.phoenix.util.MetaDataUtil;
 
 /**
@@ -62,7 +61,8 @@ public abstract class KeyValueBuilder {
         }
     }
 
-    private static final int CUSTOM_KEY_VALUE_MIN_VERSION = MetaDataUtil.encodeVersion("0.94.14");
+    // FIXME: Temporarily disabling usage of this pending more testing
+    private static final int CUSTOM_KEY_VALUE_MIN_VERSION = MetaDataUtil.encodeVersion("0.94.99");
 
     public static KeyValueBuilder get(String hbaseVersion) {
         int version = MetaDataUtil.encodeVersion(hbaseVersion);

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/8bbce3c1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 27167fb..f3d9103 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
     <hadoop-two.version>2.0.4-alpha</hadoop-two.version>
 
     <!-- Dependency versions -->
-    <hbase.version>0.94.12</hbase.version>
+    <hbase.version>0.94.16</hbase.version>
     <commons-cli.version>1.2</commons-cli.version>
     <hadoop.version>1.0.4</hadoop.version>
     <pig.version>0.12.0</pig.version>