You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/10/19 21:42:59 UTC
svn commit: r1400249 [1/4] - in /hbase/trunk: ./
hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/
hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/
Author: tedyu
Date: Fri Oct 19 19:42:56 2012
New Revision: 1400249
URL: http://svn.apache.org/viewvc?rev=1400249&view=rev
Log:
HBASE-7005 Upgrade Thrift lib to 0.9.0 (Jake Farrell)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/TScan.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDeleteType.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java
hbase/trunk/pom.xml
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java Fri Oct 19 19:42:56 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
import org.apache.thrift.scheme.TupleScheme;
import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -31,7 +34,7 @@ import org.slf4j.LoggerFactory;
* An AlreadyExists exceptions signals that a table with the specified
* name already exists
*/
-public class AlreadyExists extends Exception implements org.apache.thrift.TBase<AlreadyExists, AlreadyExists._Fields>, java.io.Serializable, Cloneable {
+public class AlreadyExists extends TException implements org.apache.thrift.TBase<AlreadyExists, AlreadyExists._Fields>, java.io.Serializable, Cloneable {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlreadyExists");
private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -280,6 +283,7 @@ public class AlreadyExists extends Excep
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java Fri Oct 19 19:42:56 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
import org.apache.thrift.scheme.TupleScheme;
import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -386,6 +389,7 @@ public class BatchMutation implements or
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -437,7 +441,7 @@ public class BatchMutation implements or
struct.mutations = new ArrayList<Mutation>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
- Mutation _elem2; // optional
+ Mutation _elem2; // required
_elem2 = new Mutation();
_elem2.read(iprot);
struct.mutations.add(_elem2);
@@ -534,7 +538,7 @@ public class BatchMutation implements or
struct.mutations = new ArrayList<Mutation>(_list5.size);
for (int _i6 = 0; _i6 < _list5.size; ++_i6)
{
- Mutation _elem7; // optional
+ Mutation _elem7; // required
_elem7 = new Mutation();
_elem7.read(iprot);
struct.mutations.add(_elem7);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java Fri Oct 19 19:42:56 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
import org.apache.thrift.scheme.TupleScheme;
import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
@@ -150,7 +153,7 @@ public class ColumnDescriptor implements
private static final int __BLOOMFILTERNBHASHES_ISSET_ID = 3;
private static final int __BLOCKCACHEENABLED_ISSET_ID = 4;
private static final int __TIMETOLIVE_ISSET_ID = 5;
- private BitSet __isset_bit_vector = new BitSet(6);
+ private byte __isset_bitfield = 0;
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -228,8 +231,7 @@ public class ColumnDescriptor implements
* Performs a deep copy on <i>other</i>.
*/
public ColumnDescriptor(ColumnDescriptor other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetName()) {
this.name = other.name;
}
@@ -317,16 +319,16 @@ public class ColumnDescriptor implements
}
public void unsetMaxVersions() {
- __isset_bit_vector.clear(__MAXVERSIONS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXVERSIONS_ISSET_ID);
}
/** Returns true if field maxVersions is set (has been assigned a value) and false otherwise */
public boolean isSetMaxVersions() {
- return __isset_bit_vector.get(__MAXVERSIONS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __MAXVERSIONS_ISSET_ID);
}
public void setMaxVersionsIsSet(boolean value) {
- __isset_bit_vector.set(__MAXVERSIONS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXVERSIONS_ISSET_ID, value);
}
public String getCompression() {
@@ -364,16 +366,16 @@ public class ColumnDescriptor implements
}
public void unsetInMemory() {
- __isset_bit_vector.clear(__INMEMORY_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INMEMORY_ISSET_ID);
}
/** Returns true if field inMemory is set (has been assigned a value) and false otherwise */
public boolean isSetInMemory() {
- return __isset_bit_vector.get(__INMEMORY_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __INMEMORY_ISSET_ID);
}
public void setInMemoryIsSet(boolean value) {
- __isset_bit_vector.set(__INMEMORY_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INMEMORY_ISSET_ID, value);
}
public String getBloomFilterType() {
@@ -411,16 +413,16 @@ public class ColumnDescriptor implements
}
public void unsetBloomFilterVectorSize() {
- __isset_bit_vector.clear(__BLOOMFILTERVECTORSIZE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __BLOOMFILTERVECTORSIZE_ISSET_ID);
}
/** Returns true if field bloomFilterVectorSize is set (has been assigned a value) and false otherwise */
public boolean isSetBloomFilterVectorSize() {
- return __isset_bit_vector.get(__BLOOMFILTERVECTORSIZE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __BLOOMFILTERVECTORSIZE_ISSET_ID);
}
public void setBloomFilterVectorSizeIsSet(boolean value) {
- __isset_bit_vector.set(__BLOOMFILTERVECTORSIZE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __BLOOMFILTERVECTORSIZE_ISSET_ID, value);
}
public int getBloomFilterNbHashes() {
@@ -434,16 +436,16 @@ public class ColumnDescriptor implements
}
public void unsetBloomFilterNbHashes() {
- __isset_bit_vector.clear(__BLOOMFILTERNBHASHES_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __BLOOMFILTERNBHASHES_ISSET_ID);
}
/** Returns true if field bloomFilterNbHashes is set (has been assigned a value) and false otherwise */
public boolean isSetBloomFilterNbHashes() {
- return __isset_bit_vector.get(__BLOOMFILTERNBHASHES_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __BLOOMFILTERNBHASHES_ISSET_ID);
}
public void setBloomFilterNbHashesIsSet(boolean value) {
- __isset_bit_vector.set(__BLOOMFILTERNBHASHES_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __BLOOMFILTERNBHASHES_ISSET_ID, value);
}
public boolean isBlockCacheEnabled() {
@@ -457,16 +459,16 @@ public class ColumnDescriptor implements
}
public void unsetBlockCacheEnabled() {
- __isset_bit_vector.clear(__BLOCKCACHEENABLED_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __BLOCKCACHEENABLED_ISSET_ID);
}
/** Returns true if field blockCacheEnabled is set (has been assigned a value) and false otherwise */
public boolean isSetBlockCacheEnabled() {
- return __isset_bit_vector.get(__BLOCKCACHEENABLED_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __BLOCKCACHEENABLED_ISSET_ID);
}
public void setBlockCacheEnabledIsSet(boolean value) {
- __isset_bit_vector.set(__BLOCKCACHEENABLED_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __BLOCKCACHEENABLED_ISSET_ID, value);
}
public int getTimeToLive() {
@@ -480,16 +482,16 @@ public class ColumnDescriptor implements
}
public void unsetTimeToLive() {
- __isset_bit_vector.clear(__TIMETOLIVE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMETOLIVE_ISSET_ID);
}
/** Returns true if field timeToLive is set (has been assigned a value) and false otherwise */
public boolean isSetTimeToLive() {
- return __isset_bit_vector.get(__TIMETOLIVE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __TIMETOLIVE_ISSET_ID);
}
public void setTimeToLiveIsSet(boolean value) {
- __isset_bit_vector.set(__TIMETOLIVE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMETOLIVE_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -904,6 +906,7 @@ public class ColumnDescriptor implements
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -917,7 +920,7 @@ public class ColumnDescriptor implements
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
// it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
+ __isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);