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 [4/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/
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.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;
@@ -1121,16 +1124,20 @@ public class THBaseService {
return processMap;
}
- private static class exists<I extends Iface> extends org.apache.thrift.ProcessFunction<I, exists_args> {
+ public static class exists<I extends Iface> extends org.apache.thrift.ProcessFunction<I, exists_args> {
public exists() {
super("exists");
}
- protected exists_args getEmptyArgsInstance() {
+ public exists_args getEmptyArgsInstance() {
return new exists_args();
}
- protected exists_result getResult(I iface, exists_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public exists_result getResult(I iface, exists_args args) throws org.apache.thrift.TException {
exists_result result = new exists_result();
try {
result.success = iface.exists(args.table, args.get);
@@ -1142,16 +1149,20 @@ public class THBaseService {
}
}
- private static class get<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_args> {
+ public static class get<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_args> {
public get() {
super("get");
}
- protected get_args getEmptyArgsInstance() {
+ public get_args getEmptyArgsInstance() {
return new get_args();
}
- protected get_result getResult(I iface, get_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public get_result getResult(I iface, get_args args) throws org.apache.thrift.TException {
get_result result = new get_result();
try {
result.success = iface.get(args.table, args.get);
@@ -1162,16 +1173,20 @@ public class THBaseService {
}
}
- private static class getMultiple<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getMultiple_args> {
+ public static class getMultiple<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getMultiple_args> {
public getMultiple() {
super("getMultiple");
}
- protected getMultiple_args getEmptyArgsInstance() {
+ public getMultiple_args getEmptyArgsInstance() {
return new getMultiple_args();
}
- protected getMultiple_result getResult(I iface, getMultiple_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getMultiple_result getResult(I iface, getMultiple_args args) throws org.apache.thrift.TException {
getMultiple_result result = new getMultiple_result();
try {
result.success = iface.getMultiple(args.table, args.gets);
@@ -1182,16 +1197,20 @@ public class THBaseService {
}
}
- private static class put<I extends Iface> extends org.apache.thrift.ProcessFunction<I, put_args> {
+ public static class put<I extends Iface> extends org.apache.thrift.ProcessFunction<I, put_args> {
public put() {
super("put");
}
- protected put_args getEmptyArgsInstance() {
+ public put_args getEmptyArgsInstance() {
return new put_args();
}
- protected put_result getResult(I iface, put_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public put_result getResult(I iface, put_args args) throws org.apache.thrift.TException {
put_result result = new put_result();
try {
iface.put(args.table, args.put);
@@ -1202,16 +1221,20 @@ public class THBaseService {
}
}
- private static class checkAndPut<I extends Iface> extends org.apache.thrift.ProcessFunction<I, checkAndPut_args> {
+ public static class checkAndPut<I extends Iface> extends org.apache.thrift.ProcessFunction<I, checkAndPut_args> {
public checkAndPut() {
super("checkAndPut");
}
- protected checkAndPut_args getEmptyArgsInstance() {
+ public checkAndPut_args getEmptyArgsInstance() {
return new checkAndPut_args();
}
- protected checkAndPut_result getResult(I iface, checkAndPut_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public checkAndPut_result getResult(I iface, checkAndPut_args args) throws org.apache.thrift.TException {
checkAndPut_result result = new checkAndPut_result();
try {
result.success = iface.checkAndPut(args.table, args.row, args.family, args.qualifier, args.value, args.put);
@@ -1223,16 +1246,20 @@ public class THBaseService {
}
}
- private static class putMultiple<I extends Iface> extends org.apache.thrift.ProcessFunction<I, putMultiple_args> {
+ public static class putMultiple<I extends Iface> extends org.apache.thrift.ProcessFunction<I, putMultiple_args> {
public putMultiple() {
super("putMultiple");
}
- protected putMultiple_args getEmptyArgsInstance() {
+ public putMultiple_args getEmptyArgsInstance() {
return new putMultiple_args();
}
- protected putMultiple_result getResult(I iface, putMultiple_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public putMultiple_result getResult(I iface, putMultiple_args args) throws org.apache.thrift.TException {
putMultiple_result result = new putMultiple_result();
try {
iface.putMultiple(args.table, args.puts);
@@ -1243,16 +1270,20 @@ public class THBaseService {
}
}
- private static class deleteSingle<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteSingle_args> {
+ public static class deleteSingle<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteSingle_args> {
public deleteSingle() {
super("deleteSingle");
}
- protected deleteSingle_args getEmptyArgsInstance() {
+ public deleteSingle_args getEmptyArgsInstance() {
return new deleteSingle_args();
}
- protected deleteSingle_result getResult(I iface, deleteSingle_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public deleteSingle_result getResult(I iface, deleteSingle_args args) throws org.apache.thrift.TException {
deleteSingle_result result = new deleteSingle_result();
try {
iface.deleteSingle(args.table, args.deleteSingle);
@@ -1263,16 +1294,20 @@ public class THBaseService {
}
}
- private static class deleteMultiple<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteMultiple_args> {
+ public static class deleteMultiple<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteMultiple_args> {
public deleteMultiple() {
super("deleteMultiple");
}
- protected deleteMultiple_args getEmptyArgsInstance() {
+ public deleteMultiple_args getEmptyArgsInstance() {
return new deleteMultiple_args();
}
- protected deleteMultiple_result getResult(I iface, deleteMultiple_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public deleteMultiple_result getResult(I iface, deleteMultiple_args args) throws org.apache.thrift.TException {
deleteMultiple_result result = new deleteMultiple_result();
try {
result.success = iface.deleteMultiple(args.table, args.deletes);
@@ -1283,16 +1318,20 @@ public class THBaseService {
}
}
- private static class checkAndDelete<I extends Iface> extends org.apache.thrift.ProcessFunction<I, checkAndDelete_args> {
+ public static class checkAndDelete<I extends Iface> extends org.apache.thrift.ProcessFunction<I, checkAndDelete_args> {
public checkAndDelete() {
super("checkAndDelete");
}
- protected checkAndDelete_args getEmptyArgsInstance() {
+ public checkAndDelete_args getEmptyArgsInstance() {
return new checkAndDelete_args();
}
- protected checkAndDelete_result getResult(I iface, checkAndDelete_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public checkAndDelete_result getResult(I iface, checkAndDelete_args args) throws org.apache.thrift.TException {
checkAndDelete_result result = new checkAndDelete_result();
try {
result.success = iface.checkAndDelete(args.table, args.row, args.family, args.qualifier, args.value, args.deleteSingle);
@@ -1304,16 +1343,20 @@ public class THBaseService {
}
}
- private static class increment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, increment_args> {
+ public static class increment<I extends Iface> extends org.apache.thrift.ProcessFunction<I, increment_args> {
public increment() {
super("increment");
}
- protected increment_args getEmptyArgsInstance() {
+ public increment_args getEmptyArgsInstance() {
return new increment_args();
}
- protected increment_result getResult(I iface, increment_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public increment_result getResult(I iface, increment_args args) throws org.apache.thrift.TException {
increment_result result = new increment_result();
try {
result.success = iface.increment(args.table, args.increment);
@@ -1324,16 +1367,20 @@ public class THBaseService {
}
}
- private static class openScanner<I extends Iface> extends org.apache.thrift.ProcessFunction<I, openScanner_args> {
+ public static class openScanner<I extends Iface> extends org.apache.thrift.ProcessFunction<I, openScanner_args> {
public openScanner() {
super("openScanner");
}
- protected openScanner_args getEmptyArgsInstance() {
+ public openScanner_args getEmptyArgsInstance() {
return new openScanner_args();
}
- protected openScanner_result getResult(I iface, openScanner_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public openScanner_result getResult(I iface, openScanner_args args) throws org.apache.thrift.TException {
openScanner_result result = new openScanner_result();
try {
result.success = iface.openScanner(args.table, args.scan);
@@ -1345,16 +1392,20 @@ public class THBaseService {
}
}
- private static class getScannerRows<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getScannerRows_args> {
+ public static class getScannerRows<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getScannerRows_args> {
public getScannerRows() {
super("getScannerRows");
}
- protected getScannerRows_args getEmptyArgsInstance() {
+ public getScannerRows_args getEmptyArgsInstance() {
return new getScannerRows_args();
}
- protected getScannerRows_result getResult(I iface, getScannerRows_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getScannerRows_result getResult(I iface, getScannerRows_args args) throws org.apache.thrift.TException {
getScannerRows_result result = new getScannerRows_result();
try {
result.success = iface.getScannerRows(args.scannerId, args.numRows);
@@ -1367,16 +1418,20 @@ public class THBaseService {
}
}
- private static class closeScanner<I extends Iface> extends org.apache.thrift.ProcessFunction<I, closeScanner_args> {
+ public static class closeScanner<I extends Iface> extends org.apache.thrift.ProcessFunction<I, closeScanner_args> {
public closeScanner() {
super("closeScanner");
}
- protected closeScanner_args getEmptyArgsInstance() {
+ public closeScanner_args getEmptyArgsInstance() {
return new closeScanner_args();
}
- protected closeScanner_result getResult(I iface, closeScanner_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public closeScanner_result getResult(I iface, closeScanner_args args) throws org.apache.thrift.TException {
closeScanner_result result = new closeScanner_result();
try {
iface.closeScanner(args.scannerId);
@@ -1758,6 +1813,10 @@ public class THBaseService {
if (get == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'get' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
+ if (get != null) {
+ get.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1948,7 +2007,7 @@ public class THBaseService {
// isset id assignments
private static final int __SUCCESS_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -1977,8 +2036,7 @@ public class THBaseService {
* Performs a deep copy on <i>other</i>.
*/
public exists_result(exists_result other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.success = other.success;
if (other.isSetIo()) {
this.io = new TIOError(other.io);
@@ -2007,16 +2065,16 @@ public class THBaseService {
}
public void unsetSuccess() {
- __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
/** Returns true if field success is set (has been assigned a value) and false otherwise */
public boolean isSetSuccess() {
- return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
public void setSuccessIsSet(boolean value) {
- __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
}
public TIOError getIo() {
@@ -2195,6 +2253,7 @@ public class THBaseService {
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 {
@@ -2207,6 +2266,8 @@ public class THBaseService {
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_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);
@@ -2263,9 +2324,11 @@ public class THBaseService {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- oprot.writeBool(struct.success);
- oprot.writeFieldEnd();
+ if (struct.isSetSuccess()) {
+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+ oprot.writeBool(struct.success);
+ oprot.writeFieldEnd();
+ }
if (struct.io != null) {
oprot.writeFieldBegin(IO_FIELD_DESC);
struct.io.write(oprot);
@@ -2689,6 +2752,10 @@ public class THBaseService {
if (get == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'get' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
+ if (get != null) {
+ get.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -3127,6 +3194,10 @@ public class THBaseService {
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (success != null) {
+ success.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -3653,6 +3724,7 @@ public class THBaseService {
if (gets == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'gets' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -3704,7 +3776,7 @@ public class THBaseService {
struct.gets = new ArrayList<TGet>(_list48.size);
for (int _i49 = 0; _i49 < _list48.size; ++_i49)
{
- TGet _elem50; // optional
+ TGet _elem50; // required
_elem50 = new TGet();
_elem50.read(iprot);
struct.gets.add(_elem50);
@@ -3785,7 +3857,7 @@ public class THBaseService {
struct.gets = new ArrayList<TGet>(_list53.size);
for (int _i54 = 0; _i54 < _list53.size; ++_i54)
{
- TGet _elem55; // optional
+ TGet _elem55; // required
_elem55 = new TGet();
_elem55.read(iprot);
struct.gets.add(_elem55);
@@ -4143,6 +4215,7 @@ public class THBaseService {
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 {
@@ -4186,7 +4259,7 @@ public class THBaseService {
struct.success = new ArrayList<TResult>(_list56.size);
for (int _i57 = 0; _i57 < _list56.size; ++_i57)
{
- TResult _elem58; // optional
+ TResult _elem58; // required
_elem58 = new TResult();
_elem58.read(iprot);
struct.success.add(_elem58);
@@ -4288,7 +4361,7 @@ public class THBaseService {
struct.success = new ArrayList<TResult>(_list61.size);
for (int _i62 = 0; _i62 < _list61.size; ++_i62)
{
- TResult _elem63; // optional
+ TResult _elem63; // required
_elem63 = new TResult();
_elem63.read(iprot);
struct.success.add(_elem63);
@@ -4673,6 +4746,10 @@ public class THBaseService {
if (put == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'put' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
+ if (put != null) {
+ put.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -5034,6 +5111,7 @@ public class THBaseService {
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 {
@@ -5924,6 +6002,10 @@ public class THBaseService {
if (put == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'put' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
+ if (put != null) {
+ put.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -6188,7 +6270,7 @@ public class THBaseService {
// isset id assignments
private static final int __SUCCESS_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -6217,8 +6299,7 @@ public class THBaseService {
* Performs a deep copy on <i>other</i>.
*/
public checkAndPut_result(checkAndPut_result other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.success = other.success;
if (other.isSetIo()) {
this.io = new TIOError(other.io);
@@ -6247,16 +6328,16 @@ public class THBaseService {
}
public void unsetSuccess() {
- __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
/** Returns true if field success is set (has been assigned a value) and false otherwise */
public boolean isSetSuccess() {
- return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
public void setSuccessIsSet(boolean value) {
- __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
}
public TIOError getIo() {
@@ -6435,6 +6516,7 @@ public class THBaseService {
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 {
@@ -6447,6 +6529,8 @@ public class THBaseService {
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_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);
@@ -6503,9 +6587,11 @@ public class THBaseService {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- oprot.writeBool(struct.success);
- oprot.writeFieldEnd();
+ if (struct.isSetSuccess()) {
+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+ oprot.writeBool(struct.success);
+ oprot.writeFieldEnd();
+ }
if (struct.io != null) {
oprot.writeFieldBegin(IO_FIELD_DESC);
struct.io.write(oprot);
@@ -6949,6 +7035,7 @@ public class THBaseService {
if (puts == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'puts' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -7000,7 +7087,7 @@ public class THBaseService {
struct.puts = new ArrayList<TPut>(_list64.size);
for (int _i65 = 0; _i65 < _list64.size; ++_i65)
{
- TPut _elem66; // optional
+ TPut _elem66; // required
_elem66 = new TPut();
_elem66.read(iprot);
struct.puts.add(_elem66);
@@ -7081,7 +7168,7 @@ public class THBaseService {
struct.puts = new ArrayList<TPut>(_list69.size);
for (int _i70 = 0; _i70 < _list69.size; ++_i70)
{
- TPut _elem71; // optional
+ TPut _elem71; // required
_elem71 = new TPut();
_elem71.read(iprot);
struct.puts.add(_elem71);
@@ -7342,6 +7429,7 @@ public class THBaseService {
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 {
@@ -7815,6 +7903,10 @@ public class THBaseService {
if (deleteSingle == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'deleteSingle' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
+ if (deleteSingle != null) {
+ deleteSingle.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -8176,6 +8268,7 @@ public class THBaseService {
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 {
@@ -8669,6 +8762,7 @@ public class THBaseService {
if (deletes == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'deletes' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -8720,7 +8814,7 @@ public class THBaseService {
struct.deletes = new ArrayList<TDelete>(_list72.size);
for (int _i73 = 0; _i73 < _list72.size; ++_i73)
{
- TDelete _elem74; // optional
+ TDelete _elem74; // required
_elem74 = new TDelete();
_elem74.read(iprot);
struct.deletes.add(_elem74);
@@ -8801,7 +8895,7 @@ public class THBaseService {
struct.deletes = new ArrayList<TDelete>(_list77.size);
for (int _i78 = 0; _i78 < _list77.size; ++_i78)
{
- TDelete _elem79; // optional
+ TDelete _elem79; // required
_elem79 = new TDelete();
_elem79.read(iprot);
struct.deletes.add(_elem79);
@@ -9159,6 +9253,7 @@ public class THBaseService {
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 {
@@ -9202,7 +9297,7 @@ public class THBaseService {
struct.success = new ArrayList<TDelete>(_list80.size);
for (int _i81 = 0; _i81 < _list80.size; ++_i81)
{
- TDelete _elem82; // optional
+ TDelete _elem82; // required
_elem82 = new TDelete();
_elem82.read(iprot);
struct.success.add(_elem82);
@@ -9304,7 +9399,7 @@ public class THBaseService {
struct.success = new ArrayList<TDelete>(_list85.size);
for (int _i86 = 0; _i86 < _list85.size; ++_i86)
{
- TDelete _elem87; // optional
+ TDelete _elem87; // required
_elem87 = new TDelete();
_elem87.read(iprot);
struct.success.add(_elem87);
@@ -10106,6 +10201,10 @@ public class THBaseService {
if (deleteSingle == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'deleteSingle' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
+ if (deleteSingle != null) {
+ deleteSingle.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -10370,7 +10469,7 @@ public class THBaseService {
// isset id assignments
private static final int __SUCCESS_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -10399,8 +10498,7 @@ public class THBaseService {
* Performs a deep copy on <i>other</i>.
*/
public checkAndDelete_result(checkAndDelete_result other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.success = other.success;
if (other.isSetIo()) {
this.io = new TIOError(other.io);
@@ -10429,16 +10527,16 @@ public class THBaseService {
}
public void unsetSuccess() {
- __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
/** Returns true if field success is set (has been assigned a value) and false otherwise */
public boolean isSetSuccess() {
- return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
public void setSuccessIsSet(boolean value) {
- __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
}
public TIOError getIo() {
@@ -10617,6 +10715,7 @@ public class THBaseService {
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 {
@@ -10629,6 +10728,8 @@ public class THBaseService {
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_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);
@@ -10685,9 +10786,11 @@ public class THBaseService {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- oprot.writeBool(struct.success);
- oprot.writeFieldEnd();
+ if (struct.isSetSuccess()) {
+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+ oprot.writeBool(struct.success);
+ oprot.writeFieldEnd();
+ }
if (struct.io != null) {
oprot.writeFieldBegin(IO_FIELD_DESC);
struct.io.write(oprot);
@@ -11111,6 +11214,10 @@ public class THBaseService {
if (increment == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'increment' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
+ if (increment != null) {
+ increment.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -11549,6 +11656,10 @@ public class THBaseService {
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (success != null) {
+ success.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -12047,6 +12158,10 @@ public class THBaseService {
if (scan == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'scan' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
+ if (scan != null) {
+ scan.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -12237,7 +12352,7 @@ public class THBaseService {
// isset id assignments
private static final int __SUCCESS_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -12266,8 +12381,7 @@ public class THBaseService {
* Performs a deep copy on <i>other</i>.
*/
public openScanner_result(openScanner_result other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.success = other.success;
if (other.isSetIo()) {
this.io = new TIOError(other.io);
@@ -12296,16 +12410,16 @@ public class THBaseService {
}
public void unsetSuccess() {
- __isset_bit_vector.clear(__SUCCESS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
/** Returns true if field success is set (has been assigned a value) and false otherwise */
public boolean isSetSuccess() {
- return __isset_bit_vector.get(__SUCCESS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
}
public void setSuccessIsSet(boolean value) {
- __isset_bit_vector.set(__SUCCESS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
}
public TIOError getIo() {
@@ -12484,6 +12598,7 @@ public class THBaseService {
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 {
@@ -12496,6 +12611,8 @@ public class THBaseService {
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_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);
@@ -12552,9 +12669,11 @@ public class THBaseService {
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
- oprot.writeI32(struct.success);
- oprot.writeFieldEnd();
+ if (struct.isSetSuccess()) {
+ oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+ oprot.writeI32(struct.success);
+ oprot.writeFieldEnd();
+ }
if (struct.io != null) {
oprot.writeFieldBegin(IO_FIELD_DESC);
struct.io.write(oprot);
@@ -12702,7 +12821,7 @@ public class THBaseService {
// isset id assignments
private static final int __SCANNERID_ISSET_ID = 0;
private static final int __NUMROWS_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
+ 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);
@@ -12734,8 +12853,7 @@ public class THBaseService {
* Performs a deep copy on <i>other</i>.
*/
public getScannerRows_args(getScannerRows_args other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.scannerId = other.scannerId;
this.numRows = other.numRows;
}
@@ -12769,16 +12887,16 @@ public class THBaseService {
}
public void unsetScannerId() {
- __isset_bit_vector.clear(__SCANNERID_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANNERID_ISSET_ID);
}
/** Returns true if field scannerId is set (has been assigned a value) and false otherwise */
public boolean isSetScannerId() {
- return __isset_bit_vector.get(__SCANNERID_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __SCANNERID_ISSET_ID);
}
public void setScannerIdIsSet(boolean value) {
- __isset_bit_vector.set(__SCANNERID_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANNERID_ISSET_ID, value);
}
/**
@@ -12798,16 +12916,16 @@ public class THBaseService {
}
public void unsetNumRows() {
- __isset_bit_vector.clear(__NUMROWS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUMROWS_ISSET_ID);
}
/** Returns true if field numRows is set (has been assigned a value) and false otherwise */
public boolean isSetNumRows() {
- return __isset_bit_vector.get(__NUMROWS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __NUMROWS_ISSET_ID);
}
public void setNumRowsIsSet(boolean value) {
- __isset_bit_vector.set(__NUMROWS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUMROWS_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -12959,6 +13077,7 @@ public class THBaseService {
public void validate() throws org.apache.thrift.TException {
// check for required fields
// alas, we cannot check 'scannerId' because it's a primitive and you chose the non-beans generator.
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -12972,7 +13091,7 @@ public class THBaseService {
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);
@@ -13515,6 +13634,7 @@ public class THBaseService {
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 {
@@ -13558,7 +13678,7 @@ public class THBaseService {
struct.success = new ArrayList<TResult>(_list88.size);
for (int _i89 = 0; _i89 < _list88.size; ++_i89)
{
- TResult _elem90; // optional
+ TResult _elem90; // required
_elem90 = new TResult();
_elem90.read(iprot);
struct.success.add(_elem90);
@@ -13680,7 +13800,7 @@ public class THBaseService {
struct.success = new ArrayList<TResult>(_list93.size);
for (int _i94 = 0; _i94 < _list93.size; ++_i94)
{
- TResult _elem95; // optional
+ TResult _elem95; // required
_elem95 = new TResult();
_elem95.read(iprot);
struct.success.add(_elem95);
@@ -13782,7 +13902,7 @@ public class THBaseService {
// isset id assignments
private static final int __SCANNERID_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -13807,8 +13927,7 @@ public class THBaseService {
* Performs a deep copy on <i>other</i>.
*/
public closeScanner_args(closeScanner_args other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.scannerId = other.scannerId;
}
@@ -13839,16 +13958,16 @@ public class THBaseService {
}
public void unsetScannerId() {
- __isset_bit_vector.clear(__SCANNERID_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANNERID_ISSET_ID);
}
/** Returns true if field scannerId is set (has been assigned a value) and false otherwise */
public boolean isSetScannerId() {
- return __isset_bit_vector.get(__SCANNERID_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __SCANNERID_ISSET_ID);
}
public void setScannerIdIsSet(boolean value) {
- __isset_bit_vector.set(__SCANNERID_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANNERID_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -13964,6 +14083,7 @@ public class THBaseService {
public void validate() throws org.apache.thrift.TException {
// check for required fields
// alas, we cannot check 'scannerId' because it's a primitive and you chose the non-beans generator.
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -13977,7 +14097,7 @@ public class THBaseService {
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);
@@ -14399,6 +14519,7 @@ public class THBaseService {
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/thrift2/generated/TIOError.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.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;
@@ -32,7 +35,7 @@ import org.slf4j.LoggerFactory;
* to the HBase master or a HBase region server. Also used to return
* more general HBase error conditions.
*/
-public class TIOError extends Exception implements org.apache.thrift.TBase<TIOError, TIOError._Fields>, java.io.Serializable, Cloneable {
+public class TIOError extends TException implements org.apache.thrift.TBase<TIOError, TIOError._Fields>, java.io.Serializable, Cloneable {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIOError");
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);
@@ -277,6 +280,7 @@ public class TIOError extends Exception
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/thrift2/generated/TIllegalArgument.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.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;
* A TIllegalArgument exception indicates an illegal or invalid
* argument was passed into a procedure.
*/
-public class TIllegalArgument extends Exception implements org.apache.thrift.TBase<TIllegalArgument, TIllegalArgument._Fields>, java.io.Serializable, Cloneable {
+public class TIllegalArgument extends TException implements org.apache.thrift.TBase<TIllegalArgument, TIllegalArgument._Fields>, java.io.Serializable, Cloneable {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIllegalArgument");
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);
@@ -276,6 +279,7 @@ public class TIllegalArgument extends Ex
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/thrift2/generated/TIncrement.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.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;
@@ -116,7 +119,7 @@ public class TIncrement implements org.a
// isset id assignments
private static final int __WRITETOWAL_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.WRITE_TO_WAL};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
@@ -150,8 +153,7 @@ public class TIncrement implements org.a
* Performs a deep copy on <i>other</i>.
*/
public TIncrement(TIncrement other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
@@ -262,16 +264,16 @@ public class TIncrement implements org.a
}
public void unsetWriteToWal() {
- __isset_bit_vector.clear(__WRITETOWAL_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WRITETOWAL_ISSET_ID);
}
/** Returns true if field writeToWal is set (has been assigned a value) and false otherwise */
public boolean isSetWriteToWal() {
- return __isset_bit_vector.get(__WRITETOWAL_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __WRITETOWAL_ISSET_ID);
}
public void setWriteToWalIsSet(boolean value) {
- __isset_bit_vector.set(__WRITETOWAL_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WRITETOWAL_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -474,6 +476,7 @@ public class TIncrement implements org.a
if (columns == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'columns' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -487,7 +490,7 @@ public class TIncrement implements org.a
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);
@@ -527,7 +530,7 @@ public class TIncrement implements org.a
struct.columns = new ArrayList<TColumnIncrement>(_list32.size);
for (int _i33 = 0; _i33 < _list32.size; ++_i33)
{
- TColumnIncrement _elem34; // optional
+ TColumnIncrement _elem34; // required
_elem34 = new TColumnIncrement();
_elem34.read(iprot);
struct.columns.add(_elem34);
@@ -629,7 +632,7 @@ public class TIncrement implements org.a
struct.columns = new ArrayList<TColumnIncrement>(_list37.size);
for (int _i38 = 0; _i38 < _list37.size; ++_i38)
{
- TColumnIncrement _elem39; // optional
+ TColumnIncrement _elem39; // required
_elem39 = new TColumnIncrement();
_elem39.read(iprot);
struct.columns.add(_elem39);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.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;
@@ -127,7 +130,7 @@ public class TPut implements org.apache.
// isset id assignments
private static final int __TIMESTAMP_ISSET_ID = 0;
private static final int __WRITETOWAL_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
+ private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.WRITE_TO_WAL};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
@@ -163,8 +166,7 @@ public class TPut implements org.apache.
* Performs a deep copy on <i>other</i>.
*/
public TPut(TPut other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
@@ -278,16 +280,16 @@ public class TPut implements org.apache.
}
public void unsetTimestamp() {
- __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
}
/** Returns true if field timestamp is set (has been assigned a value) and false otherwise */
public boolean isSetTimestamp() {
- return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
}
public void setTimestampIsSet(boolean value) {
- __isset_bit_vector.set(__TIMESTAMP_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
}
public boolean isWriteToWal() {
@@ -301,16 +303,16 @@ public class TPut implements org.apache.
}
public void unsetWriteToWal() {
- __isset_bit_vector.clear(__WRITETOWAL_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WRITETOWAL_ISSET_ID);
}
/** Returns true if field writeToWal is set (has been assigned a value) and false otherwise */
public boolean isSetWriteToWal() {
- return __isset_bit_vector.get(__WRITETOWAL_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __WRITETOWAL_ISSET_ID);
}
public void setWriteToWalIsSet(boolean value) {
- __isset_bit_vector.set(__WRITETOWAL_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WRITETOWAL_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -551,6 +553,7 @@ public class TPut implements org.apache.
if (columnValues == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'columnValues' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -564,7 +567,7 @@ public class TPut implements org.apache.
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);
@@ -604,7 +607,7 @@ public class TPut implements org.apache.
struct.columnValues = new ArrayList<TColumnValue>(_list16.size);
for (int _i17 = 0; _i17 < _list16.size; ++_i17)
{
- TColumnValue _elem18; // optional
+ TColumnValue _elem18; // required
_elem18 = new TColumnValue();
_elem18.read(iprot);
struct.columnValues.add(_elem18);
@@ -725,7 +728,7 @@ public class TPut implements org.apache.
struct.columnValues = new ArrayList<TColumnValue>(_list21.size);
for (int _i22 = 0; _i22 < _list21.size; ++_i22)
{
- TColumnValue _elem23; // optional
+ TColumnValue _elem23; // required
_elem23 = new TColumnValue();
_elem23.read(iprot);
struct.columnValues.add(_elem23);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.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;
@@ -391,6 +394,7 @@ public class TResult implements org.apac
if (columnValues == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'columnValues' was not present! Struct: " + toString());
}
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -442,7 +446,7 @@ public class TResult implements org.apac
struct.columnValues = new ArrayList<TColumnValue>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
- TColumnValue _elem2; // optional
+ TColumnValue _elem2; // required
_elem2 = new TColumnValue();
_elem2.read(iprot);
struct.columnValues.add(_elem2);
@@ -530,7 +534,7 @@ public class TResult implements org.apac
struct.columnValues = new ArrayList<TColumnValue>(_list5.size);
for (int _i6 = 0; _i6 < _list5.size; ++_i6)
{
- TColumnValue _elem7; // optional
+ TColumnValue _elem7; // required
_elem7 = new TColumnValue();
_elem7.read(iprot);
struct.columnValues.add(_elem7);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.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;
@@ -130,7 +133,7 @@ public class TScan implements org.apache
// isset id assignments
private static final int __CACHING_ISSET_ID = 0;
private static final int __MAXVERSIONS_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
+ private byte __isset_bitfield = 0;
private _Fields optionals[] = {_Fields.START_ROW,_Fields.STOP_ROW,_Fields.COLUMNS,_Fields.CACHING,_Fields.MAX_VERSIONS,_Fields.TIME_RANGE};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
@@ -161,8 +164,7 @@ public class TScan implements org.apache
* Performs a deep copy on <i>other</i>.
*/
public TScan(TScan other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetStartRow()) {
this.startRow = org.apache.thrift.TBaseHelper.copyBinary(other.startRow);
;
@@ -319,16 +321,16 @@ public class TScan implements org.apache
}
public void unsetCaching() {
- __isset_bit_vector.clear(__CACHING_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CACHING_ISSET_ID);
}
/** Returns true if field caching is set (has been assigned a value) and false otherwise */
public boolean isSetCaching() {
- return __isset_bit_vector.get(__CACHING_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __CACHING_ISSET_ID);
}
public void setCachingIsSet(boolean value) {
- __isset_bit_vector.set(__CACHING_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CACHING_ISSET_ID, value);
}
public int getMaxVersions() {
@@ -342,16 +344,16 @@ public class TScan implements org.apache
}
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 TTimeRange getTimeRange() {
@@ -698,6 +700,10 @@ public class TScan implements org.apache
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (timeRange != null) {
+ timeRange.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -711,7 +717,7 @@ public class TScan implements org.apache
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);
@@ -759,7 +765,7 @@ public class TScan implements org.apache
struct.columns = new ArrayList<TColumn>(_list40.size);
for (int _i41 = 0; _i41 < _list40.size; ++_i41)
{
- TColumn _elem42; // optional
+ TColumn _elem42; // required
_elem42 = new TColumn();
_elem42.read(iprot);
struct.columns.add(_elem42);
@@ -937,7 +943,7 @@ public class TScan implements org.apache
struct.columns = new ArrayList<TColumn>(_list45.size);
for (int _i46 = 0; _i46 < _list45.size; ++_i46)
{
- TColumn _elem47; // optional
+ TColumn _elem47; // required
_elem47 = new TColumn();
_elem47.read(iprot);
struct.columns.add(_elem47);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.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;
@@ -106,7 +109,7 @@ public class TTimeRange implements org.a
// isset id assignments
private static final int __MINSTAMP_ISSET_ID = 0;
private static final int __MAXSTAMP_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
+ 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);
@@ -136,8 +139,7 @@ public class TTimeRange implements org.a
* Performs a deep copy on <i>other</i>.
*/
public TTimeRange(TTimeRange other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.minStamp = other.minStamp;
this.maxStamp = other.maxStamp;
}
@@ -165,16 +167,16 @@ public class TTimeRange implements org.a
}
public void unsetMinStamp() {
- __isset_bit_vector.clear(__MINSTAMP_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MINSTAMP_ISSET_ID);
}
/** Returns true if field minStamp is set (has been assigned a value) and false otherwise */
public boolean isSetMinStamp() {
- return __isset_bit_vector.get(__MINSTAMP_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __MINSTAMP_ISSET_ID);
}
public void setMinStampIsSet(boolean value) {
- __isset_bit_vector.set(__MINSTAMP_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MINSTAMP_ISSET_ID, value);
}
public long getMaxStamp() {
@@ -188,16 +190,16 @@ public class TTimeRange implements org.a
}
public void unsetMaxStamp() {
- __isset_bit_vector.clear(__MAXSTAMP_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXSTAMP_ISSET_ID);
}
/** Returns true if field maxStamp is set (has been assigned a value) and false otherwise */
public boolean isSetMaxStamp() {
- return __isset_bit_vector.get(__MAXSTAMP_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __MAXSTAMP_ISSET_ID);
}
public void setMaxStampIsSet(boolean value) {
- __isset_bit_vector.set(__MAXSTAMP_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXSTAMP_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -350,6 +352,7 @@ public class TTimeRange implements org.a
// check for required fields
// alas, we cannot check 'minStamp' because it's a primitive and you chose the non-beans generator.
// alas, we cannot check 'maxStamp' because it's a primitive and you chose the non-beans generator.
+ // check for sub-struct validity
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -363,7 +366,7 @@ public class TTimeRange implements org.a
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);
Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1400249&r1=1400248&r2=1400249&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Fri Oct 19 19:42:56 2012
@@ -841,7 +841,7 @@
<mockito-all.version>1.9.0</mockito-all.version>
<protobuf.version>2.4.1</protobuf.version>
<stax-api.version>1.0.1</stax-api.version>
- <thrift.version>0.8.0</thrift.version>
+ <thrift.version>0.9.0</thrift.version>
<zookeeper.version>3.4.3</zookeeper.version>
<hadoop-snappy.version>0.0.1-SNAPSHOT</hadoop-snappy.version>
<clover.version>2.6.3</clover.version>