You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2014/06/25 02:30:40 UTC
git commit: HBASE-11391 Thrift table creation will fail with default
TTL with sanity checks
Repository: hbase
Updated Branches:
refs/heads/master 05c1b27e6 -> 13bad28e9
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/13bad28e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/13bad28e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/13bad28e
Branch: refs/heads/master
Commit: 13bad28e9337c705b23c472392de941f7821ac9d
Parents: 05c1b27
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Jun 24 17:23:42 2014 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Jun 24 17:29:28 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/13bad28e/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 72b3c1c..98e90f7 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
@@ -72,7 +72,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/13bad28e/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/13bad28e/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 e9836cd..f4e48ff 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
}
/**