hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject git commit: HBASE-11391 Thrift table creation will fail with default TTL with sanity checks
Date Wed, 25 Jun 2014 00:53:06 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 06be16919 -> b09061c5f


HBASE-11391 Thrift table creation will fail with default TTL with sanity checks


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b09061c5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b09061c5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b09061c5

Branch: refs/heads/0.98
Commit: b09061c5f2778265f4e496e322a5526b6c2bd5b8
Parents: 06be169
Author: Enis Soztutar <enis@apache.org>
Authored: Tue Jun 24 17:23:42 2014 -0700
Committer: Enis Soztutar <enis@apache.org>
Committed: Tue Jun 24 17:52:53 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java     | 2 +-
 .../apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java   | 4 ++--
 .../main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/b09061c5/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java
index d8d0ae8..2d4d5ee 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java
@@ -68,7 +68,7 @@ public class ThriftUtilities {
         .setCompressionType(comp)
         .setInMemory(in.inMemory)
         .setBlockCacheEnabled(in.blockCacheEnabled)
-        .setTimeToLive(in.timeToLive)
+        .setTimeToLive(in.timeToLive > 0 ? in.timeToLive : Integer.MAX_VALUE)
         .setBloomFilterType(bt);
     return col;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/b09061c5/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
index a163bb0..080c145 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
@@ -194,7 +194,7 @@ public class ColumnDescriptor implements org.apache.thrift.TBase<ColumnDescripto
 
     this.blockCacheEnabled = false;
 
-    this.timeToLive = -1;
+    this.timeToLive = 2147483647;
 
   }
 
@@ -270,7 +270,7 @@ public class ColumnDescriptor implements org.apache.thrift.TBase<ColumnDescripto
 
     this.blockCacheEnabled = false;
 
-    this.timeToLive = -1;
+    this.timeToLive = 2147483647;
 
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/b09061c5/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift b/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift
index 2f1f4bc..9fe6468 100644
--- a/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift
+++ b/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift
@@ -75,7 +75,7 @@ struct ColumnDescriptor {
   6:i32 bloomFilterVectorSize = 0,
   7:i32 bloomFilterNbHashes = 0,
   8:bool blockCacheEnabled = 0,
-  9:i32 timeToLive = -1
+  9:i32 timeToLive = 0x7fffffff
 }
 
 /**


Mime
View raw message