diff --git hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java index 72b3c1c..98e90f7 100644 --- hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java +++ 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; } diff --git hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java index a163bb0..080c145 100644 --- hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java +++ 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