From e02139dca78ea913d8530cd80bb2973531629054 Mon Sep 17 00:00:00 2001 From: Zhihong Yu Date: Fri, 19 Oct 2012 19:42:56 +0000 Subject: [PATCH] HBASE-7005 Upgrade Thrift lib to 0.9.0 (Jake Farrell) git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1400249 13f79535-47bb-0310-9956-ffa450edef68 --- .../hbase/thrift/generated/AlreadyExists.java | 8 +- .../hbase/thrift/generated/BatchMutation.java | 10 +- .../thrift/generated/ColumnDescriptor.java | 49 +- .../hadoop/hbase/thrift/generated/Hbase.java | 1058 +++++++++++------ .../hbase/thrift/generated/IOError.java | 8 +- .../thrift/generated/IllegalArgument.java | 8 +- .../hbase/thrift/generated/Mutation.java | 25 +- .../hadoop/hbase/thrift/generated/TCell.java | 19 +- .../hbase/thrift/generated/TIncrement.java | 19 +- .../hbase/thrift/generated/TRegionInfo.java | 31 +- .../hbase/thrift/generated/TRowResult.java | 8 +- .../hadoop/hbase/thrift/generated/TScan.java | 29 +- .../hbase/thrift2/generated/TColumn.java | 19 +- .../thrift2/generated/TColumnIncrement.java | 19 +- .../hbase/thrift2/generated/TColumnValue.java | 19 +- .../hbase/thrift2/generated/TDelete.java | 29 +- .../hbase/thrift2/generated/TDeleteType.java | 2 +- .../hadoop/hbase/thrift2/generated/TGet.java | 32 +- .../thrift2/generated/THBaseService.java | 331 ++++-- .../hbase/thrift2/generated/TIOError.java | 8 +- .../thrift2/generated/TIllegalArgument.java | 8 +- .../hbase/thrift2/generated/TIncrement.java | 23 +- .../hadoop/hbase/thrift2/generated/TPut.java | 29 +- .../hbase/thrift2/generated/TResult.java | 10 +- .../hadoop/hbase/thrift2/generated/TScan.java | 32 +- .../hbase/thrift2/generated/TTimeRange.java | 25 +- pom.xml | 2 +- 27 files changed, 1166 insertions(+), 694 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java index a5b81f5b850..029645c4864 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java @@ -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.StandardScheme; 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, java.io.Serializable, Cloneable { +public class AlreadyExists extends TException implements org.apache.thrift.TBase, 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 Exception implements org.apache.thrift.TBase< 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 { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java index d5df9407756..8566ea40b70 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java @@ -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.StandardScheme; 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 org.apache.thrift.TBase(_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 org.apache.thrift.TBase(_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); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java index 4ce85e7ed5e..a163bb0b12a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java @@ -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.StandardScheme; 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 org.apache.thrift.TBase 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 org.apache.thrift.TBaseother. */ 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 org.apache.thrift.TBase extends org.apache.thrift.ProcessFunction { + public static class enableTable extends org.apache.thrift.ProcessFunction { public enableTable() { super("enableTable"); } - protected enableTable_args getEmptyArgsInstance() { + public enableTable_args getEmptyArgsInstance() { return new enableTable_args(); } - protected enableTable_result getResult(I iface, enableTable_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public enableTable_result getResult(I iface, enableTable_args args) throws org.apache.thrift.TException { enableTable_result result = new enableTable_result(); try { iface.enableTable(args.tableName); @@ -3646,16 +3653,20 @@ public class Hbase { } } - private static class disableTable extends org.apache.thrift.ProcessFunction { + public static class disableTable extends org.apache.thrift.ProcessFunction { public disableTable() { super("disableTable"); } - protected disableTable_args getEmptyArgsInstance() { + public disableTable_args getEmptyArgsInstance() { return new disableTable_args(); } - protected disableTable_result getResult(I iface, disableTable_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public disableTable_result getResult(I iface, disableTable_args args) throws org.apache.thrift.TException { disableTable_result result = new disableTable_result(); try { iface.disableTable(args.tableName); @@ -3666,16 +3677,20 @@ public class Hbase { } } - private static class isTableEnabled extends org.apache.thrift.ProcessFunction { + public static class isTableEnabled extends org.apache.thrift.ProcessFunction { public isTableEnabled() { super("isTableEnabled"); } - protected isTableEnabled_args getEmptyArgsInstance() { + public isTableEnabled_args getEmptyArgsInstance() { return new isTableEnabled_args(); } - protected isTableEnabled_result getResult(I iface, isTableEnabled_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public isTableEnabled_result getResult(I iface, isTableEnabled_args args) throws org.apache.thrift.TException { isTableEnabled_result result = new isTableEnabled_result(); try { result.success = iface.isTableEnabled(args.tableName); @@ -3687,16 +3702,20 @@ public class Hbase { } } - private static class compact extends org.apache.thrift.ProcessFunction { + public static class compact extends org.apache.thrift.ProcessFunction { public compact() { super("compact"); } - protected compact_args getEmptyArgsInstance() { + public compact_args getEmptyArgsInstance() { return new compact_args(); } - protected compact_result getResult(I iface, compact_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public compact_result getResult(I iface, compact_args args) throws org.apache.thrift.TException { compact_result result = new compact_result(); try { iface.compact(args.tableNameOrRegionName); @@ -3707,16 +3726,20 @@ public class Hbase { } } - private static class majorCompact extends org.apache.thrift.ProcessFunction { + public static class majorCompact extends org.apache.thrift.ProcessFunction { public majorCompact() { super("majorCompact"); } - protected majorCompact_args getEmptyArgsInstance() { + public majorCompact_args getEmptyArgsInstance() { return new majorCompact_args(); } - protected majorCompact_result getResult(I iface, majorCompact_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public majorCompact_result getResult(I iface, majorCompact_args args) throws org.apache.thrift.TException { majorCompact_result result = new majorCompact_result(); try { iface.majorCompact(args.tableNameOrRegionName); @@ -3727,16 +3750,20 @@ public class Hbase { } } - private static class getTableNames extends org.apache.thrift.ProcessFunction { + public static class getTableNames extends org.apache.thrift.ProcessFunction { public getTableNames() { super("getTableNames"); } - protected getTableNames_args getEmptyArgsInstance() { + public getTableNames_args getEmptyArgsInstance() { return new getTableNames_args(); } - protected getTableNames_result getResult(I iface, getTableNames_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getTableNames_result getResult(I iface, getTableNames_args args) throws org.apache.thrift.TException { getTableNames_result result = new getTableNames_result(); try { result.success = iface.getTableNames(); @@ -3747,16 +3774,20 @@ public class Hbase { } } - private static class getColumnDescriptors extends org.apache.thrift.ProcessFunction { + public static class getColumnDescriptors extends org.apache.thrift.ProcessFunction { public getColumnDescriptors() { super("getColumnDescriptors"); } - protected getColumnDescriptors_args getEmptyArgsInstance() { + public getColumnDescriptors_args getEmptyArgsInstance() { return new getColumnDescriptors_args(); } - protected getColumnDescriptors_result getResult(I iface, getColumnDescriptors_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getColumnDescriptors_result getResult(I iface, getColumnDescriptors_args args) throws org.apache.thrift.TException { getColumnDescriptors_result result = new getColumnDescriptors_result(); try { result.success = iface.getColumnDescriptors(args.tableName); @@ -3767,16 +3798,20 @@ public class Hbase { } } - private static class getTableRegions extends org.apache.thrift.ProcessFunction { + public static class getTableRegions extends org.apache.thrift.ProcessFunction { public getTableRegions() { super("getTableRegions"); } - protected getTableRegions_args getEmptyArgsInstance() { + public getTableRegions_args getEmptyArgsInstance() { return new getTableRegions_args(); } - protected getTableRegions_result getResult(I iface, getTableRegions_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getTableRegions_result getResult(I iface, getTableRegions_args args) throws org.apache.thrift.TException { getTableRegions_result result = new getTableRegions_result(); try { result.success = iface.getTableRegions(args.tableName); @@ -3787,16 +3822,20 @@ public class Hbase { } } - private static class createTable extends org.apache.thrift.ProcessFunction { + public static class createTable extends org.apache.thrift.ProcessFunction { public createTable() { super("createTable"); } - protected createTable_args getEmptyArgsInstance() { + public createTable_args getEmptyArgsInstance() { return new createTable_args(); } - protected createTable_result getResult(I iface, createTable_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public createTable_result getResult(I iface, createTable_args args) throws org.apache.thrift.TException { createTable_result result = new createTable_result(); try { iface.createTable(args.tableName, args.columnFamilies); @@ -3811,16 +3850,20 @@ public class Hbase { } } - private static class deleteTable extends org.apache.thrift.ProcessFunction { + public static class deleteTable extends org.apache.thrift.ProcessFunction { public deleteTable() { super("deleteTable"); } - protected deleteTable_args getEmptyArgsInstance() { + public deleteTable_args getEmptyArgsInstance() { return new deleteTable_args(); } - protected deleteTable_result getResult(I iface, deleteTable_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public deleteTable_result getResult(I iface, deleteTable_args args) throws org.apache.thrift.TException { deleteTable_result result = new deleteTable_result(); try { iface.deleteTable(args.tableName); @@ -3831,16 +3874,20 @@ public class Hbase { } } - private static class get extends org.apache.thrift.ProcessFunction { + public static class get extends org.apache.thrift.ProcessFunction { 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.tableName, args.row, args.column, args.attributes); @@ -3851,16 +3898,20 @@ public class Hbase { } } - private static class getVer extends org.apache.thrift.ProcessFunction { + public static class getVer extends org.apache.thrift.ProcessFunction { public getVer() { super("getVer"); } - protected getVer_args getEmptyArgsInstance() { + public getVer_args getEmptyArgsInstance() { return new getVer_args(); } - protected getVer_result getResult(I iface, getVer_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getVer_result getResult(I iface, getVer_args args) throws org.apache.thrift.TException { getVer_result result = new getVer_result(); try { result.success = iface.getVer(args.tableName, args.row, args.column, args.numVersions, args.attributes); @@ -3871,16 +3922,20 @@ public class Hbase { } } - private static class getVerTs extends org.apache.thrift.ProcessFunction { + public static class getVerTs extends org.apache.thrift.ProcessFunction { public getVerTs() { super("getVerTs"); } - protected getVerTs_args getEmptyArgsInstance() { + public getVerTs_args getEmptyArgsInstance() { return new getVerTs_args(); } - protected getVerTs_result getResult(I iface, getVerTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getVerTs_result getResult(I iface, getVerTs_args args) throws org.apache.thrift.TException { getVerTs_result result = new getVerTs_result(); try { result.success = iface.getVerTs(args.tableName, args.row, args.column, args.timestamp, args.numVersions, args.attributes); @@ -3891,16 +3946,20 @@ public class Hbase { } } - private static class getRow extends org.apache.thrift.ProcessFunction { + public static class getRow extends org.apache.thrift.ProcessFunction { public getRow() { super("getRow"); } - protected getRow_args getEmptyArgsInstance() { + public getRow_args getEmptyArgsInstance() { return new getRow_args(); } - protected getRow_result getResult(I iface, getRow_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getRow_result getResult(I iface, getRow_args args) throws org.apache.thrift.TException { getRow_result result = new getRow_result(); try { result.success = iface.getRow(args.tableName, args.row, args.attributes); @@ -3911,16 +3970,20 @@ public class Hbase { } } - private static class getRowWithColumns extends org.apache.thrift.ProcessFunction { + public static class getRowWithColumns extends org.apache.thrift.ProcessFunction { public getRowWithColumns() { super("getRowWithColumns"); } - protected getRowWithColumns_args getEmptyArgsInstance() { + public getRowWithColumns_args getEmptyArgsInstance() { return new getRowWithColumns_args(); } - protected getRowWithColumns_result getResult(I iface, getRowWithColumns_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getRowWithColumns_result getResult(I iface, getRowWithColumns_args args) throws org.apache.thrift.TException { getRowWithColumns_result result = new getRowWithColumns_result(); try { result.success = iface.getRowWithColumns(args.tableName, args.row, args.columns, args.attributes); @@ -3931,16 +3994,20 @@ public class Hbase { } } - private static class getRowTs extends org.apache.thrift.ProcessFunction { + public static class getRowTs extends org.apache.thrift.ProcessFunction { public getRowTs() { super("getRowTs"); } - protected getRowTs_args getEmptyArgsInstance() { + public getRowTs_args getEmptyArgsInstance() { return new getRowTs_args(); } - protected getRowTs_result getResult(I iface, getRowTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getRowTs_result getResult(I iface, getRowTs_args args) throws org.apache.thrift.TException { getRowTs_result result = new getRowTs_result(); try { result.success = iface.getRowTs(args.tableName, args.row, args.timestamp, args.attributes); @@ -3951,16 +4018,20 @@ public class Hbase { } } - private static class getRowWithColumnsTs extends org.apache.thrift.ProcessFunction { + public static class getRowWithColumnsTs extends org.apache.thrift.ProcessFunction { public getRowWithColumnsTs() { super("getRowWithColumnsTs"); } - protected getRowWithColumnsTs_args getEmptyArgsInstance() { + public getRowWithColumnsTs_args getEmptyArgsInstance() { return new getRowWithColumnsTs_args(); } - protected getRowWithColumnsTs_result getResult(I iface, getRowWithColumnsTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getRowWithColumnsTs_result getResult(I iface, getRowWithColumnsTs_args args) throws org.apache.thrift.TException { getRowWithColumnsTs_result result = new getRowWithColumnsTs_result(); try { result.success = iface.getRowWithColumnsTs(args.tableName, args.row, args.columns, args.timestamp, args.attributes); @@ -3971,16 +4042,20 @@ public class Hbase { } } - private static class getRows extends org.apache.thrift.ProcessFunction { + public static class getRows extends org.apache.thrift.ProcessFunction { public getRows() { super("getRows"); } - protected getRows_args getEmptyArgsInstance() { + public getRows_args getEmptyArgsInstance() { return new getRows_args(); } - protected getRows_result getResult(I iface, getRows_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getRows_result getResult(I iface, getRows_args args) throws org.apache.thrift.TException { getRows_result result = new getRows_result(); try { result.success = iface.getRows(args.tableName, args.rows, args.attributes); @@ -3991,16 +4066,20 @@ public class Hbase { } } - private static class getRowsWithColumns extends org.apache.thrift.ProcessFunction { + public static class getRowsWithColumns extends org.apache.thrift.ProcessFunction { public getRowsWithColumns() { super("getRowsWithColumns"); } - protected getRowsWithColumns_args getEmptyArgsInstance() { + public getRowsWithColumns_args getEmptyArgsInstance() { return new getRowsWithColumns_args(); } - protected getRowsWithColumns_result getResult(I iface, getRowsWithColumns_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getRowsWithColumns_result getResult(I iface, getRowsWithColumns_args args) throws org.apache.thrift.TException { getRowsWithColumns_result result = new getRowsWithColumns_result(); try { result.success = iface.getRowsWithColumns(args.tableName, args.rows, args.columns, args.attributes); @@ -4011,16 +4090,20 @@ public class Hbase { } } - private static class getRowsTs extends org.apache.thrift.ProcessFunction { + public static class getRowsTs extends org.apache.thrift.ProcessFunction { public getRowsTs() { super("getRowsTs"); } - protected getRowsTs_args getEmptyArgsInstance() { + public getRowsTs_args getEmptyArgsInstance() { return new getRowsTs_args(); } - protected getRowsTs_result getResult(I iface, getRowsTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getRowsTs_result getResult(I iface, getRowsTs_args args) throws org.apache.thrift.TException { getRowsTs_result result = new getRowsTs_result(); try { result.success = iface.getRowsTs(args.tableName, args.rows, args.timestamp, args.attributes); @@ -4031,16 +4114,20 @@ public class Hbase { } } - private static class getRowsWithColumnsTs extends org.apache.thrift.ProcessFunction { + public static class getRowsWithColumnsTs extends org.apache.thrift.ProcessFunction { public getRowsWithColumnsTs() { super("getRowsWithColumnsTs"); } - protected getRowsWithColumnsTs_args getEmptyArgsInstance() { + public getRowsWithColumnsTs_args getEmptyArgsInstance() { return new getRowsWithColumnsTs_args(); } - protected getRowsWithColumnsTs_result getResult(I iface, getRowsWithColumnsTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getRowsWithColumnsTs_result getResult(I iface, getRowsWithColumnsTs_args args) throws org.apache.thrift.TException { getRowsWithColumnsTs_result result = new getRowsWithColumnsTs_result(); try { result.success = iface.getRowsWithColumnsTs(args.tableName, args.rows, args.columns, args.timestamp, args.attributes); @@ -4051,16 +4138,20 @@ public class Hbase { } } - private static class mutateRow extends org.apache.thrift.ProcessFunction { + public static class mutateRow extends org.apache.thrift.ProcessFunction { public mutateRow() { super("mutateRow"); } - protected mutateRow_args getEmptyArgsInstance() { + public mutateRow_args getEmptyArgsInstance() { return new mutateRow_args(); } - protected mutateRow_result getResult(I iface, mutateRow_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public mutateRow_result getResult(I iface, mutateRow_args args) throws org.apache.thrift.TException { mutateRow_result result = new mutateRow_result(); try { iface.mutateRow(args.tableName, args.row, args.mutations, args.attributes); @@ -4073,16 +4164,20 @@ public class Hbase { } } - private static class mutateRowTs extends org.apache.thrift.ProcessFunction { + public static class mutateRowTs extends org.apache.thrift.ProcessFunction { public mutateRowTs() { super("mutateRowTs"); } - protected mutateRowTs_args getEmptyArgsInstance() { + public mutateRowTs_args getEmptyArgsInstance() { return new mutateRowTs_args(); } - protected mutateRowTs_result getResult(I iface, mutateRowTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public mutateRowTs_result getResult(I iface, mutateRowTs_args args) throws org.apache.thrift.TException { mutateRowTs_result result = new mutateRowTs_result(); try { iface.mutateRowTs(args.tableName, args.row, args.mutations, args.timestamp, args.attributes); @@ -4095,16 +4190,20 @@ public class Hbase { } } - private static class mutateRows extends org.apache.thrift.ProcessFunction { + public static class mutateRows extends org.apache.thrift.ProcessFunction { public mutateRows() { super("mutateRows"); } - protected mutateRows_args getEmptyArgsInstance() { + public mutateRows_args getEmptyArgsInstance() { return new mutateRows_args(); } - protected mutateRows_result getResult(I iface, mutateRows_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public mutateRows_result getResult(I iface, mutateRows_args args) throws org.apache.thrift.TException { mutateRows_result result = new mutateRows_result(); try { iface.mutateRows(args.tableName, args.rowBatches, args.attributes); @@ -4117,16 +4216,20 @@ public class Hbase { } } - private static class mutateRowsTs extends org.apache.thrift.ProcessFunction { + public static class mutateRowsTs extends org.apache.thrift.ProcessFunction { public mutateRowsTs() { super("mutateRowsTs"); } - protected mutateRowsTs_args getEmptyArgsInstance() { + public mutateRowsTs_args getEmptyArgsInstance() { return new mutateRowsTs_args(); } - protected mutateRowsTs_result getResult(I iface, mutateRowsTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public mutateRowsTs_result getResult(I iface, mutateRowsTs_args args) throws org.apache.thrift.TException { mutateRowsTs_result result = new mutateRowsTs_result(); try { iface.mutateRowsTs(args.tableName, args.rowBatches, args.timestamp, args.attributes); @@ -4139,16 +4242,20 @@ public class Hbase { } } - private static class atomicIncrement extends org.apache.thrift.ProcessFunction { + public static class atomicIncrement extends org.apache.thrift.ProcessFunction { public atomicIncrement() { super("atomicIncrement"); } - protected atomicIncrement_args getEmptyArgsInstance() { + public atomicIncrement_args getEmptyArgsInstance() { return new atomicIncrement_args(); } - protected atomicIncrement_result getResult(I iface, atomicIncrement_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public atomicIncrement_result getResult(I iface, atomicIncrement_args args) throws org.apache.thrift.TException { atomicIncrement_result result = new atomicIncrement_result(); try { result.success = iface.atomicIncrement(args.tableName, args.row, args.column, args.value); @@ -4162,16 +4269,20 @@ public class Hbase { } } - private static class deleteAll extends org.apache.thrift.ProcessFunction { + public static class deleteAll extends org.apache.thrift.ProcessFunction { public deleteAll() { super("deleteAll"); } - protected deleteAll_args getEmptyArgsInstance() { + public deleteAll_args getEmptyArgsInstance() { return new deleteAll_args(); } - protected deleteAll_result getResult(I iface, deleteAll_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public deleteAll_result getResult(I iface, deleteAll_args args) throws org.apache.thrift.TException { deleteAll_result result = new deleteAll_result(); try { iface.deleteAll(args.tableName, args.row, args.column, args.attributes); @@ -4182,16 +4293,20 @@ public class Hbase { } } - private static class deleteAllTs extends org.apache.thrift.ProcessFunction { + public static class deleteAllTs extends org.apache.thrift.ProcessFunction { public deleteAllTs() { super("deleteAllTs"); } - protected deleteAllTs_args getEmptyArgsInstance() { + public deleteAllTs_args getEmptyArgsInstance() { return new deleteAllTs_args(); } - protected deleteAllTs_result getResult(I iface, deleteAllTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public deleteAllTs_result getResult(I iface, deleteAllTs_args args) throws org.apache.thrift.TException { deleteAllTs_result result = new deleteAllTs_result(); try { iface.deleteAllTs(args.tableName, args.row, args.column, args.timestamp, args.attributes); @@ -4202,16 +4317,20 @@ public class Hbase { } } - private static class deleteAllRow extends org.apache.thrift.ProcessFunction { + public static class deleteAllRow extends org.apache.thrift.ProcessFunction { public deleteAllRow() { super("deleteAllRow"); } - protected deleteAllRow_args getEmptyArgsInstance() { + public deleteAllRow_args getEmptyArgsInstance() { return new deleteAllRow_args(); } - protected deleteAllRow_result getResult(I iface, deleteAllRow_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public deleteAllRow_result getResult(I iface, deleteAllRow_args args) throws org.apache.thrift.TException { deleteAllRow_result result = new deleteAllRow_result(); try { iface.deleteAllRow(args.tableName, args.row, args.attributes); @@ -4222,16 +4341,20 @@ public class Hbase { } } - private static class increment extends org.apache.thrift.ProcessFunction { + public static class increment extends org.apache.thrift.ProcessFunction { 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 { iface.increment(args.increment); @@ -4242,16 +4365,20 @@ public class Hbase { } } - private static class incrementRows extends org.apache.thrift.ProcessFunction { + public static class incrementRows extends org.apache.thrift.ProcessFunction { public incrementRows() { super("incrementRows"); } - protected incrementRows_args getEmptyArgsInstance() { + public incrementRows_args getEmptyArgsInstance() { return new incrementRows_args(); } - protected incrementRows_result getResult(I iface, incrementRows_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public incrementRows_result getResult(I iface, incrementRows_args args) throws org.apache.thrift.TException { incrementRows_result result = new incrementRows_result(); try { iface.incrementRows(args.increments); @@ -4262,16 +4389,20 @@ public class Hbase { } } - private static class deleteAllRowTs extends org.apache.thrift.ProcessFunction { + public static class deleteAllRowTs extends org.apache.thrift.ProcessFunction { public deleteAllRowTs() { super("deleteAllRowTs"); } - protected deleteAllRowTs_args getEmptyArgsInstance() { + public deleteAllRowTs_args getEmptyArgsInstance() { return new deleteAllRowTs_args(); } - protected deleteAllRowTs_result getResult(I iface, deleteAllRowTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public deleteAllRowTs_result getResult(I iface, deleteAllRowTs_args args) throws org.apache.thrift.TException { deleteAllRowTs_result result = new deleteAllRowTs_result(); try { iface.deleteAllRowTs(args.tableName, args.row, args.timestamp, args.attributes); @@ -4282,16 +4413,20 @@ public class Hbase { } } - private static class scannerOpenWithScan extends org.apache.thrift.ProcessFunction { + public static class scannerOpenWithScan extends org.apache.thrift.ProcessFunction { public scannerOpenWithScan() { super("scannerOpenWithScan"); } - protected scannerOpenWithScan_args getEmptyArgsInstance() { + public scannerOpenWithScan_args getEmptyArgsInstance() { return new scannerOpenWithScan_args(); } - protected scannerOpenWithScan_result getResult(I iface, scannerOpenWithScan_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public scannerOpenWithScan_result getResult(I iface, scannerOpenWithScan_args args) throws org.apache.thrift.TException { scannerOpenWithScan_result result = new scannerOpenWithScan_result(); try { result.success = iface.scannerOpenWithScan(args.tableName, args.scan, args.attributes); @@ -4303,16 +4438,20 @@ public class Hbase { } } - private static class scannerOpen extends org.apache.thrift.ProcessFunction { + public static class scannerOpen extends org.apache.thrift.ProcessFunction { public scannerOpen() { super("scannerOpen"); } - protected scannerOpen_args getEmptyArgsInstance() { + public scannerOpen_args getEmptyArgsInstance() { return new scannerOpen_args(); } - protected scannerOpen_result getResult(I iface, scannerOpen_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public scannerOpen_result getResult(I iface, scannerOpen_args args) throws org.apache.thrift.TException { scannerOpen_result result = new scannerOpen_result(); try { result.success = iface.scannerOpen(args.tableName, args.startRow, args.columns, args.attributes); @@ -4324,16 +4463,20 @@ public class Hbase { } } - private static class scannerOpenWithStop extends org.apache.thrift.ProcessFunction { + public static class scannerOpenWithStop extends org.apache.thrift.ProcessFunction { public scannerOpenWithStop() { super("scannerOpenWithStop"); } - protected scannerOpenWithStop_args getEmptyArgsInstance() { + public scannerOpenWithStop_args getEmptyArgsInstance() { return new scannerOpenWithStop_args(); } - protected scannerOpenWithStop_result getResult(I iface, scannerOpenWithStop_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public scannerOpenWithStop_result getResult(I iface, scannerOpenWithStop_args args) throws org.apache.thrift.TException { scannerOpenWithStop_result result = new scannerOpenWithStop_result(); try { result.success = iface.scannerOpenWithStop(args.tableName, args.startRow, args.stopRow, args.columns, args.attributes); @@ -4345,16 +4488,20 @@ public class Hbase { } } - private static class scannerOpenWithPrefix extends org.apache.thrift.ProcessFunction { + public static class scannerOpenWithPrefix extends org.apache.thrift.ProcessFunction { public scannerOpenWithPrefix() { super("scannerOpenWithPrefix"); } - protected scannerOpenWithPrefix_args getEmptyArgsInstance() { + public scannerOpenWithPrefix_args getEmptyArgsInstance() { return new scannerOpenWithPrefix_args(); } - protected scannerOpenWithPrefix_result getResult(I iface, scannerOpenWithPrefix_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public scannerOpenWithPrefix_result getResult(I iface, scannerOpenWithPrefix_args args) throws org.apache.thrift.TException { scannerOpenWithPrefix_result result = new scannerOpenWithPrefix_result(); try { result.success = iface.scannerOpenWithPrefix(args.tableName, args.startAndPrefix, args.columns, args.attributes); @@ -4366,16 +4513,20 @@ public class Hbase { } } - private static class scannerOpenTs extends org.apache.thrift.ProcessFunction { + public static class scannerOpenTs extends org.apache.thrift.ProcessFunction { public scannerOpenTs() { super("scannerOpenTs"); } - protected scannerOpenTs_args getEmptyArgsInstance() { + public scannerOpenTs_args getEmptyArgsInstance() { return new scannerOpenTs_args(); } - protected scannerOpenTs_result getResult(I iface, scannerOpenTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public scannerOpenTs_result getResult(I iface, scannerOpenTs_args args) throws org.apache.thrift.TException { scannerOpenTs_result result = new scannerOpenTs_result(); try { result.success = iface.scannerOpenTs(args.tableName, args.startRow, args.columns, args.timestamp, args.attributes); @@ -4387,16 +4538,20 @@ public class Hbase { } } - private static class scannerOpenWithStopTs extends org.apache.thrift.ProcessFunction { + public static class scannerOpenWithStopTs extends org.apache.thrift.ProcessFunction { public scannerOpenWithStopTs() { super("scannerOpenWithStopTs"); } - protected scannerOpenWithStopTs_args getEmptyArgsInstance() { + public scannerOpenWithStopTs_args getEmptyArgsInstance() { return new scannerOpenWithStopTs_args(); } - protected scannerOpenWithStopTs_result getResult(I iface, scannerOpenWithStopTs_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public scannerOpenWithStopTs_result getResult(I iface, scannerOpenWithStopTs_args args) throws org.apache.thrift.TException { scannerOpenWithStopTs_result result = new scannerOpenWithStopTs_result(); try { result.success = iface.scannerOpenWithStopTs(args.tableName, args.startRow, args.stopRow, args.columns, args.timestamp, args.attributes); @@ -4408,16 +4563,20 @@ public class Hbase { } } - private static class scannerGet extends org.apache.thrift.ProcessFunction { + public static class scannerGet extends org.apache.thrift.ProcessFunction { public scannerGet() { super("scannerGet"); } - protected scannerGet_args getEmptyArgsInstance() { + public scannerGet_args getEmptyArgsInstance() { return new scannerGet_args(); } - protected scannerGet_result getResult(I iface, scannerGet_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public scannerGet_result getResult(I iface, scannerGet_args args) throws org.apache.thrift.TException { scannerGet_result result = new scannerGet_result(); try { result.success = iface.scannerGet(args.id); @@ -4430,16 +4589,20 @@ public class Hbase { } } - private static class scannerGetList extends org.apache.thrift.ProcessFunction { + public static class scannerGetList extends org.apache.thrift.ProcessFunction { public scannerGetList() { super("scannerGetList"); } - protected scannerGetList_args getEmptyArgsInstance() { + public scannerGetList_args getEmptyArgsInstance() { return new scannerGetList_args(); } - protected scannerGetList_result getResult(I iface, scannerGetList_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public scannerGetList_result getResult(I iface, scannerGetList_args args) throws org.apache.thrift.TException { scannerGetList_result result = new scannerGetList_result(); try { result.success = iface.scannerGetList(args.id, args.nbRows); @@ -4452,16 +4615,20 @@ public class Hbase { } } - private static class scannerClose extends org.apache.thrift.ProcessFunction { + public static class scannerClose extends org.apache.thrift.ProcessFunction { public scannerClose() { super("scannerClose"); } - protected scannerClose_args getEmptyArgsInstance() { + public scannerClose_args getEmptyArgsInstance() { return new scannerClose_args(); } - protected scannerClose_result getResult(I iface, scannerClose_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public scannerClose_result getResult(I iface, scannerClose_args args) throws org.apache.thrift.TException { scannerClose_result result = new scannerClose_result(); try { iface.scannerClose(args.id); @@ -4474,16 +4641,20 @@ public class Hbase { } } - private static class getRowOrBefore extends org.apache.thrift.ProcessFunction { + public static class getRowOrBefore extends org.apache.thrift.ProcessFunction { public getRowOrBefore() { super("getRowOrBefore"); } - protected getRowOrBefore_args getEmptyArgsInstance() { + public getRowOrBefore_args getEmptyArgsInstance() { return new getRowOrBefore_args(); } - protected getRowOrBefore_result getResult(I iface, getRowOrBefore_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getRowOrBefore_result getResult(I iface, getRowOrBefore_args args) throws org.apache.thrift.TException { getRowOrBefore_result result = new getRowOrBefore_result(); try { result.success = iface.getRowOrBefore(args.tableName, args.row, args.family); @@ -4494,16 +4665,20 @@ public class Hbase { } } - private static class getRegionInfo extends org.apache.thrift.ProcessFunction { + public static class getRegionInfo extends org.apache.thrift.ProcessFunction { public getRegionInfo() { super("getRegionInfo"); } - protected getRegionInfo_args getEmptyArgsInstance() { + public getRegionInfo_args getEmptyArgsInstance() { return new getRegionInfo_args(); } - protected getRegionInfo_result getResult(I iface, getRegionInfo_args args) throws org.apache.thrift.TException { + protected boolean isOneway() { + return false; + } + + public getRegionInfo_result getResult(I iface, getRegionInfo_args args) throws org.apache.thrift.TException { getRegionInfo_result result = new getRegionInfo_result(); try { result.success = iface.getRegionInfo(args.row); @@ -4787,6 +4962,7 @@ public class Hbase { 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 { @@ -5140,6 +5316,7 @@ public class Hbase { 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 { @@ -5517,6 +5694,7 @@ public class Hbase { 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 { @@ -5870,6 +6048,7 @@ public class Hbase { 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 { @@ -6247,6 +6426,7 @@ public class Hbase { 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 { @@ -6429,7 +6609,7 @@ public class Hbase { // 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); @@ -6458,8 +6638,7 @@ public class Hbase { * Performs a deep copy on other. */ public isTableEnabled_result(isTableEnabled_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 IOError(other.io); @@ -6488,16 +6667,16 @@ public class Hbase { } 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 IOError getIo() { @@ -6676,6 +6855,7 @@ public class Hbase { 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 { @@ -6689,7 +6869,7 @@ public class Hbase { 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); @@ -6746,9 +6926,11 @@ public class Hbase { 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); @@ -7064,6 +7246,7 @@ public class Hbase { 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 { @@ -7417,6 +7600,7 @@ public class Hbase { 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 { @@ -7782,6 +7966,7 @@ public class Hbase { 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 { @@ -8135,6 +8320,7 @@ public class Hbase { 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 { @@ -8408,6 +8594,7 @@ public class Hbase { 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 { @@ -8832,6 +9019,7 @@ public class Hbase { 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 { @@ -8875,7 +9063,7 @@ public class Hbase { struct.success = new ArrayList(_list26.size); for (int _i27 = 0; _i27 < _list26.size; ++_i27) { - ByteBuffer _elem28; // optional + ByteBuffer _elem28; // required _elem28 = iprot.readBinary(); struct.success.add(_elem28); } @@ -8976,7 +9164,7 @@ public class Hbase { struct.success = new ArrayList(_list31.size); for (int _i32 = 0; _i32 < _list31.size; ++_i32) { - ByteBuffer _elem33; // optional + ByteBuffer _elem33; // required _elem33 = iprot.readBinary(); struct.success.add(_elem33); } @@ -9264,6 +9452,7 @@ public class Hbase { 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 { @@ -9719,6 +9908,7 @@ public class Hbase { 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 { @@ -10159,6 +10349,7 @@ public class Hbase { 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 { @@ -10609,6 +10800,7 @@ public class Hbase { 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 { @@ -10652,7 +10844,7 @@ public class Hbase { struct.success = new ArrayList(_list44.size); for (int _i45 = 0; _i45 < _list44.size; ++_i45) { - TRegionInfo _elem46; // optional + TRegionInfo _elem46; // required _elem46 = new TRegionInfo(); _elem46.read(iprot); struct.success.add(_elem46); @@ -10754,7 +10946,7 @@ public class Hbase { struct.success = new ArrayList(_list49.size); for (int _i50 = 0; _i50 < _list49.size; ++_i50) { - TRegionInfo _elem51; // optional + TRegionInfo _elem51; // required _elem51 = new TRegionInfo(); _elem51.read(iprot); struct.success.add(_elem51); @@ -11152,6 +11344,7 @@ public class Hbase { 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 { @@ -11203,7 +11396,7 @@ public class Hbase { struct.columnFamilies = new ArrayList(_list52.size); for (int _i53 = 0; _i53 < _list52.size; ++_i53) { - ColumnDescriptor _elem54; // optional + ColumnDescriptor _elem54; // required _elem54 = new ColumnDescriptor(); _elem54.read(iprot); struct.columnFamilies.add(_elem54); @@ -11300,7 +11493,7 @@ public class Hbase { struct.columnFamilies = new ArrayList(_list57.size); for (int _i58 = 0; _i58 < _list57.size; ++_i58) { - ColumnDescriptor _elem59; // optional + ColumnDescriptor _elem59; // required _elem59 = new ColumnDescriptor(); _elem59.read(iprot); struct.columnFamilies.add(_elem59); @@ -11716,6 +11909,7 @@ public class Hbase { 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 { @@ -12143,6 +12337,7 @@ public class Hbase { 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 +12691,7 @@ public class Hbase { 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 { @@ -13185,6 +13381,7 @@ public class Hbase { 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 { @@ -13742,6 +13939,7 @@ public class Hbase { 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 { @@ -13785,7 +13983,7 @@ public class Hbase { struct.success = new ArrayList(_list70.size); for (int _i71 = 0; _i71 < _list70.size; ++_i71) { - TCell _elem72; // optional + TCell _elem72; // required _elem72 = new TCell(); _elem72.read(iprot); struct.success.add(_elem72); @@ -13887,7 +14085,7 @@ public class Hbase { struct.success = new ArrayList(_list75.size); for (int _i76 = 0; _i76 < _list75.size; ++_i76) { - TCell _elem77; // optional + TCell _elem77; // required _elem77 = new TCell(); _elem77.read(iprot); struct.success.add(_elem77); @@ -14028,7 +14226,7 @@ public class Hbase { // isset id assignments private static final int __NUMVERSIONS_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); @@ -14071,8 +14269,7 @@ public class Hbase { * Performs a deep copy on other. */ public getVer_args(getVer_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -14251,16 +14448,16 @@ public class Hbase { } public void unsetNumVersions() { - __isset_bit_vector.clear(__NUMVERSIONS_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUMVERSIONS_ISSET_ID); } /** Returns true if field numVersions is set (has been assigned a value) and false otherwise */ public boolean isSetNumVersions() { - return __isset_bit_vector.get(__NUMVERSIONS_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NUMVERSIONS_ISSET_ID); } public void setNumVersionsIsSet(boolean value) { - __isset_bit_vector.set(__NUMVERSIONS_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUMVERSIONS_ISSET_ID, value); } public int getAttributesSize() { @@ -14576,6 +14773,7 @@ public class Hbase { 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 { @@ -14589,7 +14787,7 @@ public class Hbase { 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); @@ -15156,6 +15354,7 @@ public class Hbase { 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 { @@ -15199,7 +15398,7 @@ public class Hbase { struct.success = new ArrayList(_list88.size); for (int _i89 = 0; _i89 < _list88.size; ++_i89) { - TCell _elem90; // optional + TCell _elem90; // required _elem90 = new TCell(); _elem90.read(iprot); struct.success.add(_elem90); @@ -15301,7 +15500,7 @@ public class Hbase { struct.success = new ArrayList(_list93.size); for (int _i94 = 0; _i94 < _list93.size; ++_i94) { - TCell _elem95; // optional + TCell _elem95; // required _elem95 = new TCell(); _elem95.read(iprot); struct.success.add(_elem95); @@ -15454,7 +15653,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_ISSET_ID = 0; private static final int __NUMVERSIONS_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); @@ -15502,8 +15701,7 @@ public class Hbase { * Performs a deep copy on other. */ public getVerTs_args(getVerTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -15685,16 +15883,16 @@ public class Hbase { } 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); } /** @@ -15714,16 +15912,16 @@ public class Hbase { } public void unsetNumVersions() { - __isset_bit_vector.clear(__NUMVERSIONS_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUMVERSIONS_ISSET_ID); } /** Returns true if field numVersions is set (has been assigned a value) and false otherwise */ public boolean isSetNumVersions() { - return __isset_bit_vector.get(__NUMVERSIONS_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NUMVERSIONS_ISSET_ID); } public void setNumVersionsIsSet(boolean value) { - __isset_bit_vector.set(__NUMVERSIONS_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUMVERSIONS_ISSET_ID, value); } public int getAttributesSize() { @@ -16075,6 +16273,7 @@ public class Hbase { 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 { @@ -16088,7 +16287,7 @@ public class Hbase { 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); @@ -16676,6 +16875,7 @@ public class Hbase { 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 { @@ -16719,7 +16919,7 @@ public class Hbase { struct.success = new ArrayList(_list106.size); for (int _i107 = 0; _i107 < _list106.size; ++_i107) { - TCell _elem108; // optional + TCell _elem108; // required _elem108 = new TCell(); _elem108.read(iprot); struct.success.add(_elem108); @@ -16821,7 +17021,7 @@ public class Hbase { struct.success = new ArrayList(_list111.size); for (int _i112 = 0; _i112 < _list111.size; ++_i112) { - TCell _elem113; // optional + TCell _elem113; // required _elem113 = new TCell(); _elem113.read(iprot); struct.success.add(_elem113); @@ -17323,6 +17523,7 @@ public class Hbase { 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 { @@ -17857,6 +18058,7 @@ public class Hbase { 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 { @@ -17900,7 +18102,7 @@ public class Hbase { struct.success = new ArrayList(_list124.size); for (int _i125 = 0; _i125 < _list124.size; ++_i125) { - TRowResult _elem126; // optional + TRowResult _elem126; // required _elem126 = new TRowResult(); _elem126.read(iprot); struct.success.add(_elem126); @@ -18002,7 +18204,7 @@ public class Hbase { struct.success = new ArrayList(_list129.size); for (int _i130 = 0; _i130 < _list129.size; ++_i130) { - TRowResult _elem131; // optional + TRowResult _elem131; // required _elem131 = new TRowResult(); _elem131.read(iprot); struct.success.add(_elem131); @@ -18613,6 +18815,7 @@ public class Hbase { 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 { @@ -18672,7 +18875,7 @@ public class Hbase { struct.columns = new ArrayList(_list132.size); for (int _i133 = 0; _i133 < _list132.size; ++_i133) { - ByteBuffer _elem134; // optional + ByteBuffer _elem134; // required _elem134 = iprot.readBinary(); struct.columns.add(_elem134); } @@ -18829,7 +19032,7 @@ public class Hbase { struct.columns = new ArrayList(_list143.size); for (int _i144 = 0; _i144 < _list143.size; ++_i144) { - ByteBuffer _elem145; // optional + ByteBuffer _elem145; // required _elem145 = iprot.readBinary(); struct.columns.add(_elem145); } @@ -19202,6 +19405,7 @@ public class Hbase { 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 { @@ -19245,7 +19449,7 @@ public class Hbase { struct.success = new ArrayList(_list150.size); for (int _i151 = 0; _i151 < _list150.size; ++_i151) { - TRowResult _elem152; // optional + TRowResult _elem152; // required _elem152 = new TRowResult(); _elem152.read(iprot); struct.success.add(_elem152); @@ -19347,7 +19551,7 @@ public class Hbase { struct.success = new ArrayList(_list155.size); for (int _i156 = 0; _i156 < _list155.size; ++_i156) { - TRowResult _elem157; // optional + TRowResult _elem157; // required _elem157 = new TRowResult(); _elem157.read(iprot); struct.success.add(_elem157); @@ -19477,7 +19681,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_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); @@ -19516,8 +19720,7 @@ public class Hbase { * Performs a deep copy on other. */ public getRowTs_args(getRowTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -19652,16 +19855,16 @@ public class Hbase { } 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 int getAttributesSize() { @@ -19937,6 +20140,7 @@ public class Hbase { 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 { @@ -19950,7 +20154,7 @@ public class Hbase { 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); @@ -20494,6 +20698,7 @@ public class Hbase { 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 { @@ -20537,7 +20742,7 @@ public class Hbase { struct.success = new ArrayList(_list168.size); for (int _i169 = 0; _i169 < _list168.size; ++_i169) { - TRowResult _elem170; // optional + TRowResult _elem170; // required _elem170 = new TRowResult(); _elem170.read(iprot); struct.success.add(_elem170); @@ -20639,7 +20844,7 @@ public class Hbase { struct.success = new ArrayList(_list173.size); for (int _i174 = 0; _i174 < _list173.size; ++_i174) { - TRowResult _elem175; // optional + TRowResult _elem175; // required _elem175 = new TRowResult(); _elem175.read(iprot); struct.success.add(_elem175); @@ -20774,7 +20979,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_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); @@ -20818,8 +21023,7 @@ public class Hbase { * Performs a deep copy on other. */ public getRowWithColumnsTs_args(getRowWithColumnsTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -21001,16 +21205,16 @@ public class Hbase { } 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 int getAttributesSize() { @@ -21326,6 +21530,7 @@ public class Hbase { 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 { @@ -21339,7 +21544,7 @@ public class Hbase { 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); @@ -21387,7 +21592,7 @@ public class Hbase { struct.columns = new ArrayList(_list176.size); for (int _i177 = 0; _i177 < _list176.size; ++_i177) { - ByteBuffer _elem178; // optional + ByteBuffer _elem178; // required _elem178 = iprot.readBinary(); struct.columns.add(_elem178); } @@ -21561,7 +21766,7 @@ public class Hbase { struct.columns = new ArrayList(_list187.size); for (int _i188 = 0; _i188 < _list187.size; ++_i188) { - ByteBuffer _elem189; // optional + ByteBuffer _elem189; // required _elem189 = iprot.readBinary(); struct.columns.add(_elem189); } @@ -21938,6 +22143,7 @@ public class Hbase { 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 { @@ -21981,7 +22187,7 @@ public class Hbase { struct.success = new ArrayList(_list194.size); for (int _i195 = 0; _i195 < _list194.size; ++_i195) { - TRowResult _elem196; // optional + TRowResult _elem196; // required _elem196 = new TRowResult(); _elem196.read(iprot); struct.success.add(_elem196); @@ -22083,7 +22289,7 @@ public class Hbase { struct.success = new ArrayList(_list199.size); for (int _i200 = 0; _i200 < _list199.size; ++_i200) { - TRowResult _elem201; // optional + TRowResult _elem201; // required _elem201 = new TRowResult(); _elem201.read(iprot); struct.success.add(_elem201); @@ -22595,6 +22801,7 @@ public class Hbase { 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 { @@ -22646,7 +22853,7 @@ public class Hbase { struct.rows = new ArrayList(_list202.size); for (int _i203 = 0; _i203 < _list202.size; ++_i203) { - ByteBuffer _elem204; // optional + ByteBuffer _elem204; // required _elem204 = iprot.readBinary(); struct.rows.add(_elem204); } @@ -22788,7 +22995,7 @@ public class Hbase { struct.rows = new ArrayList(_list213.size); for (int _i214 = 0; _i214 < _list213.size; ++_i214) { - ByteBuffer _elem215; // optional + ByteBuffer _elem215; // required _elem215 = iprot.readBinary(); struct.rows.add(_elem215); } @@ -23161,6 +23368,7 @@ public class Hbase { 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 { @@ -23204,7 +23412,7 @@ public class Hbase { struct.success = new ArrayList(_list220.size); for (int _i221 = 0; _i221 < _list220.size; ++_i221) { - TRowResult _elem222; // optional + TRowResult _elem222; // required _elem222 = new TRowResult(); _elem222.read(iprot); struct.success.add(_elem222); @@ -23306,7 +23514,7 @@ public class Hbase { struct.success = new ArrayList(_list225.size); for (int _i226 = 0; _i226 < _list225.size; ++_i226) { - TRowResult _elem227; // optional + TRowResult _elem227; // required _elem227 = new TRowResult(); _elem227.read(iprot); struct.success.add(_elem227); @@ -23927,6 +24135,7 @@ public class Hbase { 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 { @@ -23978,7 +24187,7 @@ public class Hbase { struct.rows = new ArrayList(_list228.size); for (int _i229 = 0; _i229 < _list228.size; ++_i229) { - ByteBuffer _elem230; // optional + ByteBuffer _elem230; // required _elem230 = iprot.readBinary(); struct.rows.add(_elem230); } @@ -23996,7 +24205,7 @@ public class Hbase { struct.columns = new ArrayList(_list231.size); for (int _i232 = 0; _i232 < _list231.size; ++_i232) { - ByteBuffer _elem233; // optional + ByteBuffer _elem233; // required _elem233 = iprot.readBinary(); struct.columns.add(_elem233); } @@ -24162,7 +24371,7 @@ public class Hbase { struct.rows = new ArrayList(_list244.size); for (int _i245 = 0; _i245 < _list244.size; ++_i245) { - ByteBuffer _elem246; // optional + ByteBuffer _elem246; // required _elem246 = iprot.readBinary(); struct.rows.add(_elem246); } @@ -24175,7 +24384,7 @@ public class Hbase { struct.columns = new ArrayList(_list247.size); for (int _i248 = 0; _i248 < _list247.size; ++_i248) { - ByteBuffer _elem249; // optional + ByteBuffer _elem249; // required _elem249 = iprot.readBinary(); struct.columns.add(_elem249); } @@ -24548,6 +24757,7 @@ public class Hbase { 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 { @@ -24591,7 +24801,7 @@ public class Hbase { struct.success = new ArrayList(_list254.size); for (int _i255 = 0; _i255 < _list254.size; ++_i255) { - TRowResult _elem256; // optional + TRowResult _elem256; // required _elem256 = new TRowResult(); _elem256.read(iprot); struct.success.add(_elem256); @@ -24693,7 +24903,7 @@ public class Hbase { struct.success = new ArrayList(_list259.size); for (int _i260 = 0; _i260 < _list259.size; ++_i260) { - TRowResult _elem261; // optional + TRowResult _elem261; // required _elem261 = new TRowResult(); _elem261.read(iprot); struct.success.add(_elem261); @@ -24823,7 +25033,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_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); @@ -24863,8 +25073,7 @@ public class Hbase { * Performs a deep copy on other. */ public getRowsTs_args(getRowsTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -25008,16 +25217,16 @@ public class Hbase { } 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 int getAttributesSize() { @@ -25293,6 +25502,7 @@ public class Hbase { 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 { @@ -25306,7 +25516,7 @@ public class Hbase { 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); @@ -25346,7 +25556,7 @@ public class Hbase { struct.rows = new ArrayList(_list262.size); for (int _i263 = 0; _i263 < _list262.size; ++_i263) { - ByteBuffer _elem264; // optional + ByteBuffer _elem264; // required _elem264 = iprot.readBinary(); struct.rows.add(_elem264); } @@ -25505,7 +25715,7 @@ public class Hbase { struct.rows = new ArrayList(_list273.size); for (int _i274 = 0; _i274 < _list273.size; ++_i274) { - ByteBuffer _elem275; // optional + ByteBuffer _elem275; // required _elem275 = iprot.readBinary(); struct.rows.add(_elem275); } @@ -25882,6 +26092,7 @@ public class Hbase { 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 { @@ -25925,7 +26136,7 @@ public class Hbase { struct.success = new ArrayList(_list280.size); for (int _i281 = 0; _i281 < _list280.size; ++_i281) { - TRowResult _elem282; // optional + TRowResult _elem282; // required _elem282 = new TRowResult(); _elem282.read(iprot); struct.success.add(_elem282); @@ -26027,7 +26238,7 @@ public class Hbase { struct.success = new ArrayList(_list285.size); for (int _i286 = 0; _i286 < _list285.size; ++_i286) { - TRowResult _elem287; // optional + TRowResult _elem287; // required _elem287 = new TRowResult(); _elem287.read(iprot); struct.success.add(_elem287); @@ -26162,7 +26373,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_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); @@ -26207,8 +26418,7 @@ public class Hbase { * Performs a deep copy on other. */ public getRowsWithColumnsTs_args(getRowsWithColumnsTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -26399,16 +26609,16 @@ public class Hbase { } 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 int getAttributesSize() { @@ -26724,6 +26934,7 @@ public class Hbase { 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 { @@ -26737,7 +26948,7 @@ public class Hbase { 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); @@ -26777,7 +26988,7 @@ public class Hbase { struct.rows = new ArrayList(_list288.size); for (int _i289 = 0; _i289 < _list288.size; ++_i289) { - ByteBuffer _elem290; // optional + ByteBuffer _elem290; // required _elem290 = iprot.readBinary(); struct.rows.add(_elem290); } @@ -26795,7 +27006,7 @@ public class Hbase { struct.columns = new ArrayList(_list291.size); for (int _i292 = 0; _i292 < _list291.size; ++_i292) { - ByteBuffer _elem293; // optional + ByteBuffer _elem293; // required _elem293 = iprot.readBinary(); struct.columns.add(_elem293); } @@ -26978,7 +27189,7 @@ public class Hbase { struct.rows = new ArrayList(_list304.size); for (int _i305 = 0; _i305 < _list304.size; ++_i305) { - ByteBuffer _elem306; // optional + ByteBuffer _elem306; // required _elem306 = iprot.readBinary(); struct.rows.add(_elem306); } @@ -26991,7 +27202,7 @@ public class Hbase { struct.columns = new ArrayList(_list307.size); for (int _i308 = 0; _i308 < _list307.size; ++_i308) { - ByteBuffer _elem309; // optional + ByteBuffer _elem309; // required _elem309 = iprot.readBinary(); struct.columns.add(_elem309); } @@ -27368,6 +27579,7 @@ public class Hbase { 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 { @@ -27411,7 +27623,7 @@ public class Hbase { struct.success = new ArrayList(_list314.size); for (int _i315 = 0; _i315 < _list314.size; ++_i315) { - TRowResult _elem316; // optional + TRowResult _elem316; // required _elem316 = new TRowResult(); _elem316.read(iprot); struct.success.add(_elem316); @@ -27513,7 +27725,7 @@ public class Hbase { struct.success = new ArrayList(_list319.size); for (int _i320 = 0; _i320 < _list319.size; ++_i320) { - TRowResult _elem321; // optional + TRowResult _elem321; // required _elem321 = new TRowResult(); _elem321.read(iprot); struct.success.add(_elem321); @@ -28124,6 +28336,7 @@ public class Hbase { 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 { @@ -28183,7 +28396,7 @@ public class Hbase { struct.mutations = new ArrayList(_list322.size); for (int _i323 = 0; _i323 < _list322.size; ++_i323) { - Mutation _elem324; // optional + Mutation _elem324; // required _elem324 = new Mutation(); _elem324.read(iprot); struct.mutations.add(_elem324); @@ -28341,7 +28554,7 @@ public class Hbase { struct.mutations = new ArrayList(_list333.size); for (int _i334 = 0; _i334 < _list333.size; ++_i334) { - Mutation _elem335; // optional + Mutation _elem335; // required _elem335 = new Mutation(); _elem335.read(iprot); struct.mutations.add(_elem335); @@ -28695,6 +28908,7 @@ public class Hbase { 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 { @@ -28949,7 +29163,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_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); @@ -28993,8 +29207,7 @@ public class Hbase { * Performs a deep copy on other. */ public mutateRowTs_args(mutateRowTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -29182,16 +29395,16 @@ public class Hbase { } 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 int getAttributesSize() { @@ -29507,6 +29720,7 @@ public class Hbase { 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 { @@ -29520,7 +29734,7 @@ public class Hbase { 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); @@ -29568,7 +29782,7 @@ public class Hbase { struct.mutations = new ArrayList(_list340.size); for (int _i341 = 0; _i341 < _list340.size; ++_i341) { - Mutation _elem342; // optional + Mutation _elem342; // required _elem342 = new Mutation(); _elem342.read(iprot); struct.mutations.add(_elem342); @@ -29743,7 +29957,7 @@ public class Hbase { struct.mutations = new ArrayList(_list351.size); for (int _i352 = 0; _i352 < _list351.size; ++_i352) { - Mutation _elem353; // optional + Mutation _elem353; // required _elem353 = new Mutation(); _elem353.read(iprot); struct.mutations.add(_elem353); @@ -30101,6 +30315,7 @@ public class Hbase { 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 { @@ -30726,6 +30941,7 @@ public class Hbase { 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 { @@ -30777,7 +30993,7 @@ public class Hbase { struct.rowBatches = new ArrayList(_list358.size); for (int _i359 = 0; _i359 < _list358.size; ++_i359) { - BatchMutation _elem360; // optional + BatchMutation _elem360; // required _elem360 = new BatchMutation(); _elem360.read(iprot); struct.rowBatches.add(_elem360); @@ -30920,7 +31136,7 @@ public class Hbase { struct.rowBatches = new ArrayList(_list369.size); for (int _i370 = 0; _i370 < _list369.size; ++_i370) { - BatchMutation _elem371; // optional + BatchMutation _elem371; // required _elem371 = new BatchMutation(); _elem371.read(iprot); struct.rowBatches.add(_elem371); @@ -31274,6 +31490,7 @@ public class Hbase { 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 { @@ -31517,7 +31734,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_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); @@ -31557,8 +31774,7 @@ public class Hbase { * Performs a deep copy on other. */ public mutateRowsTs_args(mutateRowsTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -31702,16 +31918,16 @@ public class Hbase { } 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 int getAttributesSize() { @@ -31987,6 +32203,7 @@ public class Hbase { 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 { @@ -31999,6 +32216,8 @@ public class Hbase { 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); @@ -32038,7 +32257,7 @@ public class Hbase { struct.rowBatches = new ArrayList(_list376.size); for (int _i377 = 0; _i377 < _list376.size; ++_i377) { - BatchMutation _elem378; // optional + BatchMutation _elem378; // required _elem378 = new BatchMutation(); _elem378.read(iprot); struct.rowBatches.add(_elem378); @@ -32198,7 +32417,7 @@ public class Hbase { struct.rowBatches = new ArrayList(_list387.size); for (int _i388 = 0; _i388 < _list387.size; ++_i388) { - BatchMutation _elem389; // optional + BatchMutation _elem389; // required _elem389 = new BatchMutation(); _elem389.read(iprot); struct.rowBatches.add(_elem389); @@ -32556,6 +32775,7 @@ public class Hbase { 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 { @@ -32799,7 +33019,7 @@ public class Hbase { // isset id assignments private static final int __VALUE_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); @@ -32836,8 +33056,7 @@ public class Hbase { * Performs a deep copy on other. */ public atomicIncrement_args(atomicIncrement_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -33000,16 +33219,16 @@ public class Hbase { } public void unsetValue() { - __isset_bit_vector.clear(__VALUE_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VALUE_ISSET_ID); } /** Returns true if field value is set (has been assigned a value) and false otherwise */ public boolean isSetValue() { - return __isset_bit_vector.get(__VALUE_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __VALUE_ISSET_ID); } public void setValueIsSet(boolean value) { - __isset_bit_vector.set(__VALUE_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VALUE_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -33244,6 +33463,7 @@ public class Hbase { 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 { @@ -33257,7 +33477,7 @@ public class Hbase { 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); @@ -33500,7 +33720,7 @@ public class Hbase { // 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); @@ -33533,8 +33753,7 @@ public class Hbase { * Performs a deep copy on other. */ public atomicIncrement_result(atomicIncrement_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 IOError(other.io); @@ -33567,16 +33786,16 @@ public class Hbase { } 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 IOError getIo() { @@ -33819,6 +34038,7 @@ public class Hbase { 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 { @@ -33832,7 +34052,7 @@ public class Hbase { 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); @@ -33898,9 +34118,11 @@ public class Hbase { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - oprot.writeFieldBegin(SUCCESS_FIELD_DESC); - oprot.writeI64(struct.success); - oprot.writeFieldEnd(); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeI64(struct.success); + oprot.writeFieldEnd(); + } if (struct.io != null) { oprot.writeFieldBegin(IO_FIELD_DESC); struct.io.write(oprot); @@ -34556,6 +34778,7 @@ public class Hbase { 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 { @@ -35016,6 +35239,7 @@ public class Hbase { 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 { @@ -35245,7 +35469,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_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); @@ -35288,8 +35512,7 @@ public class Hbase { * Performs a deep copy on other. */ public deleteAllTs_args(deleteAllTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -35468,16 +35691,16 @@ public class Hbase { } 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 int getAttributesSize() { @@ -35793,6 +36016,7 @@ public class Hbase { 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 { @@ -35806,7 +36030,7 @@ public class Hbase { 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); @@ -36276,6 +36500,7 @@ public class Hbase { 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 { @@ -36866,6 +37091,7 @@ public class Hbase { 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 { @@ -37303,6 +37529,7 @@ public class Hbase { 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 { @@ -37670,6 +37897,10 @@ public class Hbase { public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (increment != null) { + increment.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -38025,6 +38256,7 @@ public class Hbase { 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 { @@ -38412,6 +38644,7 @@ public class Hbase { 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 { @@ -38455,7 +38688,7 @@ public class Hbase { struct.increments = new ArrayList(_list424.size); for (int _i425 = 0; _i425 < _list424.size; ++_i425) { - TIncrement _elem426; // optional + TIncrement _elem426; // required _elem426 = new TIncrement(); _elem426.read(iprot); struct.increments.add(_elem426); @@ -38537,7 +38770,7 @@ public class Hbase { struct.increments = new ArrayList(_list429.size); for (int _i430 = 0; _i430 < _list429.size; ++_i430) { - TIncrement _elem431; // optional + TIncrement _elem431; // required _elem431 = new TIncrement(); _elem431.read(iprot); struct.increments.add(_elem431); @@ -38799,6 +39032,7 @@ public class Hbase { 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 { @@ -39017,7 +39251,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_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); @@ -39056,8 +39290,7 @@ public class Hbase { * Performs a deep copy on other. */ public deleteAllRowTs_args(deleteAllRowTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -39192,16 +39425,16 @@ public class Hbase { } 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 int getAttributesSize() { @@ -39477,6 +39710,7 @@ public class Hbase { 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 { @@ -39490,7 +39724,7 @@ public class Hbase { 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); @@ -39937,6 +40171,7 @@ public class Hbase { 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 { @@ -40517,6 +40752,10 @@ public class Hbase { public void validate() throws org.apache.thrift.TException { // check for required fields + // check for sub-struct validity + if (scan != null) { + scan.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -40785,7 +41024,7 @@ public class Hbase { // 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); @@ -40814,8 +41053,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerOpenWithScan_result(scannerOpenWithScan_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 IOError(other.io); @@ -40844,16 +41082,16 @@ public class Hbase { } 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 IOError getIo() { @@ -41032,6 +41270,7 @@ public class Hbase { 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 { @@ -41045,7 +41284,7 @@ public class Hbase { 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); @@ -41102,9 +41341,11 @@ public class Hbase { 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); @@ -41766,6 +42007,7 @@ public class Hbase { 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 { @@ -41825,7 +42067,7 @@ public class Hbase { struct.columns = new ArrayList(_list452.size); for (int _i453 = 0; _i453 < _list452.size; ++_i453) { - ByteBuffer _elem454; // optional + ByteBuffer _elem454; // required _elem454 = iprot.readBinary(); struct.columns.add(_elem454); } @@ -41982,7 +42224,7 @@ public class Hbase { struct.columns = new ArrayList(_list463.size); for (int _i464 = 0; _i464 < _list463.size; ++_i464) { - ByteBuffer _elem465; // optional + ByteBuffer _elem465; // required _elem465 = iprot.readBinary(); struct.columns.add(_elem465); } @@ -42087,7 +42329,7 @@ public class Hbase { // 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); @@ -42116,8 +42358,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerOpen_result(scannerOpen_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 IOError(other.io); @@ -42146,16 +42387,16 @@ public class Hbase { } 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 IOError getIo() { @@ -42334,6 +42575,7 @@ public class Hbase { 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 { @@ -42347,7 +42589,7 @@ public class Hbase { 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); @@ -42404,9 +42646,11 @@ public class Hbase { 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); @@ -43171,6 +43415,7 @@ public class Hbase { 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 { @@ -43238,7 +43483,7 @@ public class Hbase { struct.columns = new ArrayList(_list470.size); for (int _i471 = 0; _i471 < _list470.size; ++_i471) { - ByteBuffer _elem472; // optional + ByteBuffer _elem472; // required _elem472 = iprot.readBinary(); struct.columns.add(_elem472); } @@ -43410,7 +43655,7 @@ public class Hbase { struct.columns = new ArrayList(_list481.size); for (int _i482 = 0; _i482 < _list481.size; ++_i482) { - ByteBuffer _elem483; // optional + ByteBuffer _elem483; // required _elem483 = iprot.readBinary(); struct.columns.add(_elem483); } @@ -43515,7 +43760,7 @@ public class Hbase { // 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); @@ -43544,8 +43789,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerOpenWithStop_result(scannerOpenWithStop_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 IOError(other.io); @@ -43574,16 +43818,16 @@ public class Hbase { } 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 IOError getIo() { @@ -43762,6 +44006,7 @@ public class Hbase { 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 { @@ -43775,7 +44020,7 @@ public class Hbase { 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); @@ -43832,9 +44077,11 @@ public class Hbase { 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); @@ -44484,6 +44731,7 @@ public class Hbase { 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 { @@ -44543,7 +44791,7 @@ public class Hbase { struct.columns = new ArrayList(_list488.size); for (int _i489 = 0; _i489 < _list488.size; ++_i489) { - ByteBuffer _elem490; // optional + ByteBuffer _elem490; // required _elem490 = iprot.readBinary(); struct.columns.add(_elem490); } @@ -44700,7 +44948,7 @@ public class Hbase { struct.columns = new ArrayList(_list499.size); for (int _i500 = 0; _i500 < _list499.size; ++_i500) { - ByteBuffer _elem501; // optional + ByteBuffer _elem501; // required _elem501 = iprot.readBinary(); struct.columns.add(_elem501); } @@ -44805,7 +45053,7 @@ public class Hbase { // 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); @@ -44834,8 +45082,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerOpenWithPrefix_result(scannerOpenWithPrefix_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 IOError(other.io); @@ -44864,16 +45111,16 @@ public class Hbase { } 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 IOError getIo() { @@ -45052,6 +45299,7 @@ public class Hbase { 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 { @@ -45065,7 +45313,7 @@ public class Hbase { 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); @@ -45122,9 +45370,11 @@ public class Hbase { 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); @@ -45310,7 +45560,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_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); @@ -45354,8 +45604,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerOpenTs_args(scannerOpenTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -45549,16 +45798,16 @@ public class Hbase { } 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 int getAttributesSize() { @@ -45874,6 +46123,7 @@ public class Hbase { 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 { @@ -45887,7 +46137,7 @@ public class Hbase { 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); @@ -45935,7 +46185,7 @@ public class Hbase { struct.columns = new ArrayList(_list506.size); for (int _i507 = 0; _i507 < _list506.size; ++_i507) { - ByteBuffer _elem508; // optional + ByteBuffer _elem508; // required _elem508 = iprot.readBinary(); struct.columns.add(_elem508); } @@ -46109,7 +46359,7 @@ public class Hbase { struct.columns = new ArrayList(_list517.size); for (int _i518 = 0; _i518 < _list517.size; ++_i518) { - ByteBuffer _elem519; // optional + ByteBuffer _elem519; // required _elem519 = iprot.readBinary(); struct.columns.add(_elem519); } @@ -46218,7 +46468,7 @@ public class Hbase { // 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); @@ -46247,8 +46497,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerOpenTs_result(scannerOpenTs_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 IOError(other.io); @@ -46277,16 +46526,16 @@ public class Hbase { } 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 IOError getIo() { @@ -46465,6 +46714,7 @@ public class Hbase { 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 { @@ -46478,7 +46728,7 @@ public class Hbase { 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); @@ -46535,9 +46785,11 @@ public class Hbase { 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); @@ -46736,7 +46988,7 @@ public class Hbase { // isset id assignments private static final int __TIMESTAMP_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); @@ -46784,8 +47036,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerOpenWithStopTs_args(scannerOpenWithStopTs_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTableName()) { this.tableName = other.tableName; } @@ -47025,16 +47276,16 @@ public class Hbase { } 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 int getAttributesSize() { @@ -47390,6 +47641,7 @@ public class Hbase { 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 { @@ -47402,6 +47654,8 @@ public class Hbase { 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); @@ -47457,7 +47711,7 @@ public class Hbase { struct.columns = new ArrayList(_list524.size); for (int _i525 = 0; _i525 < _list524.size; ++_i525) { - ByteBuffer _elem526; // optional + ByteBuffer _elem526; // required _elem526 = iprot.readBinary(); struct.columns.add(_elem526); } @@ -47646,7 +47900,7 @@ public class Hbase { struct.columns = new ArrayList(_list535.size); for (int _i536 = 0; _i536 < _list535.size; ++_i536) { - ByteBuffer _elem537; // optional + ByteBuffer _elem537; // required _elem537 = iprot.readBinary(); struct.columns.add(_elem537); } @@ -47755,7 +48009,7 @@ public class Hbase { // 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); @@ -47784,8 +48038,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerOpenWithStopTs_result(scannerOpenWithStopTs_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 IOError(other.io); @@ -47814,16 +48067,16 @@ public class Hbase { } 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 IOError getIo() { @@ -48002,6 +48255,7 @@ public class Hbase { 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 { @@ -48015,7 +48269,7 @@ public class Hbase { 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); @@ -48072,9 +48326,11 @@ public class Hbase { 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); @@ -48210,7 +48466,7 @@ public class Hbase { // isset id assignments private static final int __ID_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); @@ -48235,8 +48491,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerGet_args(scannerGet_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; this.id = other.id; } @@ -48267,16 +48522,16 @@ public class Hbase { } public void unsetId() { - __isset_bit_vector.clear(__ID_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID); } /** Returns true if field id is set (has been assigned a value) and false otherwise */ public boolean isSetId() { - return __isset_bit_vector.get(__ID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __ID_ISSET_ID); } public void setIdIsSet(boolean value) { - __isset_bit_vector.set(__ID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -48391,6 +48646,7 @@ public class Hbase { 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 { @@ -48404,7 +48660,7 @@ public class Hbase { 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); @@ -48918,6 +49174,7 @@ public class Hbase { 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 { @@ -48961,7 +49218,7 @@ public class Hbase { struct.success = new ArrayList(_list542.size); for (int _i543 = 0; _i543 < _list542.size; ++_i543) { - TRowResult _elem544; // optional + TRowResult _elem544; // required _elem544 = new TRowResult(); _elem544.read(iprot); struct.success.add(_elem544); @@ -49083,7 +49340,7 @@ public class Hbase { struct.success = new ArrayList(_list547.size); for (int _i548 = 0; _i548 < _list547.size; ++_i548) { - TRowResult _elem549; // optional + TRowResult _elem549; // required _elem549 = new TRowResult(); _elem549.read(iprot); struct.success.add(_elem549); @@ -49197,7 +49454,7 @@ public class Hbase { // isset id assignments private static final int __ID_ISSET_ID = 0; private static final int __NBROWS_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); @@ -49227,8 +49484,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerGetList_args(scannerGetList_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; this.id = other.id; this.nbRows = other.nbRows; } @@ -49262,16 +49518,16 @@ public class Hbase { } public void unsetId() { - __isset_bit_vector.clear(__ID_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID); } /** Returns true if field id is set (has been assigned a value) and false otherwise */ public boolean isSetId() { - return __isset_bit_vector.get(__ID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __ID_ISSET_ID); } public void setIdIsSet(boolean value) { - __isset_bit_vector.set(__ID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value); } /** @@ -49291,16 +49547,16 @@ public class Hbase { } public void unsetNbRows() { - __isset_bit_vector.clear(__NBROWS_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NBROWS_ISSET_ID); } /** Returns true if field nbRows is set (has been assigned a value) and false otherwise */ public boolean isSetNbRows() { - return __isset_bit_vector.get(__NBROWS_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __NBROWS_ISSET_ID); } public void setNbRowsIsSet(boolean value) { - __isset_bit_vector.set(__NBROWS_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NBROWS_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -49451,6 +49707,7 @@ public class Hbase { 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 { @@ -49463,6 +49720,8 @@ public class Hbase { 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); @@ -49997,6 +50256,7 @@ public class Hbase { 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 { @@ -50040,7 +50300,7 @@ public class Hbase { struct.success = new ArrayList(_list550.size); for (int _i551 = 0; _i551 < _list550.size; ++_i551) { - TRowResult _elem552; // optional + TRowResult _elem552; // required _elem552 = new TRowResult(); _elem552.read(iprot); struct.success.add(_elem552); @@ -50162,7 +50422,7 @@ public class Hbase { struct.success = new ArrayList(_list555.size); for (int _i556 = 0; _i556 < _list555.size; ++_i556) { - TRowResult _elem557; // optional + TRowResult _elem557; // required _elem557 = new TRowResult(); _elem557.read(iprot); struct.success.add(_elem557); @@ -50264,7 +50524,7 @@ public class Hbase { // isset id assignments private static final int __ID_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); @@ -50289,8 +50549,7 @@ public class Hbase { * Performs a deep copy on other. */ public scannerClose_args(scannerClose_args other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; this.id = other.id; } @@ -50321,16 +50580,16 @@ public class Hbase { } public void unsetId() { - __isset_bit_vector.clear(__ID_ISSET_ID); + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID); } /** Returns true if field id is set (has been assigned a value) and false otherwise */ public boolean isSetId() { - return __isset_bit_vector.get(__ID_ISSET_ID); + return EncodingUtils.testBit(__isset_bitfield, __ID_ISSET_ID); } public void setIdIsSet(boolean value) { - __isset_bit_vector.set(__ID_ISSET_ID, value); + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value); } public void setFieldValue(_Fields field, Object value) { @@ -50445,6 +50704,7 @@ public class Hbase { 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 { @@ -50458,7 +50718,7 @@ public class Hbase { 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); @@ -50875,6 +51135,7 @@ public class Hbase { 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 { @@ -51475,6 +51736,7 @@ public class Hbase { 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 { @@ -51971,6 +52233,7 @@ public class Hbase { 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 { @@ -52014,7 +52277,7 @@ public class Hbase { struct.success = new ArrayList(_list558.size); for (int _i559 = 0; _i559 < _list558.size; ++_i559) { - TCell _elem560; // optional + TCell _elem560; // required _elem560 = new TCell(); _elem560.read(iprot); struct.success.add(_elem560); @@ -52116,7 +52379,7 @@ public class Hbase { struct.success = new ArrayList(_list563.size); for (int _i564 = 0; _i564 < _list563.size; ++_i564) { - TCell _elem565; // optional + TCell _elem565; // required _elem565 = new TCell(); _elem565.read(iprot); struct.success.add(_elem565); @@ -52405,6 +52668,7 @@ public class Hbase { 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 { @@ -52835,6 +53099,10 @@ public class Hbase { 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 { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java index 11e31e3fd47..6874b28d1db 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java @@ -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.StandardScheme; 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 an Hbase region server. Also used to return * more general Hbase error conditions. */ -public class IOError extends Exception implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class IOError extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IOError"); 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); @@ -281,6 +284,7 @@ public class IOError extends Exception implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class IllegalArgument extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IllegalArgument"); 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 IllegalArgument extends Exception implements org.apache.thrift.TBas 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 { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java index ef1817f4cb0..0cdd751d7b7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java @@ -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.StandardScheme; 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; @@ -119,7 +122,7 @@ public class Mutation implements org.apache.thrift.TBase metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -161,8 +164,7 @@ public class Mutation implements org.apache.thrift.TBaseother. */ public Mutation(Mutation other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; this.isDelete = other.isDelete; if (other.isSetColumn()) { this.column = other.column; @@ -198,16 +200,16 @@ public class Mutation implements org.apache.thrift.TBase, jav // isset id assignments private static final int __TIMESTAMP_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); @@ -140,8 +143,7 @@ public class TCell implements org.apache.thrift.TBase, jav * Performs a deep copy on other. */ public TCell(TCell other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetValue()) { this.value = other.value; } @@ -204,16 +206,16 @@ public class TCell implements org.apache.thrift.TBase, jav } 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 void setFieldValue(_Fields field, Object value) { @@ -368,6 +370,7 @@ public class TCell implements org.apache.thrift.TBase, jav 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 { @@ -381,7 +384,7 @@ public class TCell implements org.apache.thrift.TBase, jav 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); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java index 6d24aa08c04..80bfd88386d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java @@ -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.StandardScheme; 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; @@ -119,7 +122,7 @@ public class TIncrement implements org.apache.thrift.TBase metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -156,8 +159,7 @@ public class TIncrement implements org.apache.thrift.TBaseother. */ public TIncrement(TIncrement other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetTable()) { this.table = other.table; } @@ -296,16 +298,16 @@ public class TIncrement implements org.apache.thrift.TBase metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -186,8 +189,7 @@ public class TRegionInfo implements org.apache.thrift.TBaseother. */ public TRegionInfo(TRegionInfo other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetStartKey()) { this.startKey = other.startKey; } @@ -302,16 +304,16 @@ public class TRegionInfo implements org.apache.thrift.TBase, jav // isset id assignments private static final int __TIMESTAMP_ISSET_ID = 0; private static final int __CACHING_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.TIMESTAMP,_Fields.COLUMNS,_Fields.CACHING,_Fields.FILTER_STRING}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -158,8 +161,7 @@ public class TScan implements org.apache.thrift.TBase, jav * Performs a deep copy on other. */ 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 = other.startRow; } @@ -275,16 +277,16 @@ public class TScan implements org.apache.thrift.TBase, jav } 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 int getColumnsSize() { @@ -337,16 +339,16 @@ public class TScan implements org.apache.thrift.TBase, jav } 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 byte[] getFilterString() { @@ -703,6 +705,7 @@ public class TScan implements org.apache.thrift.TBase, jav 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 { @@ -716,7 +719,7 @@ public class TScan implements org.apache.thrift.TBase, jav 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); @@ -772,7 +775,7 @@ public class TScan implements org.apache.thrift.TBase, jav struct.columns = new ArrayList(_list18.size); for (int _i19 = 0; _i19 < _list18.size; ++_i19) { - ByteBuffer _elem20; // optional + ByteBuffer _elem20; // required _elem20 = iprot.readBinary(); struct.columns.add(_elem20); } @@ -944,7 +947,7 @@ public class TScan implements org.apache.thrift.TBase, jav struct.columns = new ArrayList(_list23.size); for (int _i24 = 0; _i24 < _list23.size; ++_i24) { - ByteBuffer _elem25; // optional + ByteBuffer _elem25; // required _elem25 = iprot.readBinary(); struct.columns.add(_elem25); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.java index ba11ecefb53..4cd514cebd2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.java @@ -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.StandardScheme; 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; @@ -115,7 +118,7 @@ public class TColumn implements org.apache.thrift.TBase metaDataMap; static { @@ -144,8 +147,7 @@ public class TColumn implements org.apache.thrift.TBaseother. */ public TColumn(TColumn other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetFamily()) { this.family = org.apache.thrift.TBaseHelper.copyBinary(other.family); ; @@ -248,16 +250,16 @@ public class TColumn implements org.apache.thrift.TBase metaDataMap; static { @@ -146,8 +149,7 @@ public class TColumnIncrement implements org.apache.thrift.TBaseother. */ public TColumnIncrement(TColumnIncrement other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetFamily()) { this.family = org.apache.thrift.TBaseHelper.copyBinary(other.family); ; @@ -250,16 +252,16 @@ public class TColumnIncrement implements org.apache.thrift.TBase metaDataMap; static { @@ -153,8 +156,7 @@ public class TColumnValue implements org.apache.thrift.TBaseother. */ public TColumnValue(TColumnValue other) { - __isset_bit_vector.clear(); - __isset_bit_vector.or(other.__isset_bit_vector); + __isset_bitfield = other.__isset_bitfield; if (other.isSetFamily()) { this.family = org.apache.thrift.TBaseHelper.copyBinary(other.family); ; @@ -296,16 +298,16 @@ public class TColumnValue implements org.apache.thrift.TBase metaDataMap; static { @@ -190,8 +193,7 @@ public class TDelete implements org.apache.thrift.TBaseother. */ public TDelete(TDelete 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); ; @@ -310,16 +312,16 @@ public class TDelete implements org.apache.thrift.TBase(_list24.size); for (int _i25 = 0; _i25 < _list24.size; ++_i25) { - TColumn _elem26; // optional + TColumn _elem26; // required _elem26 = new TColumn(); _elem26.read(iprot); struct.columns.add(_elem26); @@ -860,7 +863,7 @@ public class TDelete implements org.apache.thrift.TBase(_list29.size); for (int _i30 = 0; _i30 < _list29.size; ++_i30) { - TColumn _elem31; // optional + TColumn _elem31; // required _elem31 = new TColumn(); _elem31.read(iprot); struct.columns.add(_elem31); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDeleteType.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDeleteType.java index e5d77a6f27a..39a50152223 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDeleteType.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDeleteType.java @@ -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 diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java index 14e6d51ca62..c0bb53d9017 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java @@ -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.StandardScheme; 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; @@ -136,7 +139,7 @@ public class TGet implements org.apache.thrift.TBase, java.i // isset id assignments private static final int __TIMESTAMP_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.COLUMNS,_Fields.TIMESTAMP,_Fields.TIME_RANGE,_Fields.MAX_VERSIONS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -170,8 +173,7 @@ public class TGet implements org.apache.thrift.TBase, java.i * Performs a deep copy on other. */ public TGet(TGet 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); ; @@ -289,16 +291,16 @@ public class TGet implements org.apache.thrift.TBase, java.i } 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 TTimeRange getTimeRange() { @@ -336,16 +338,16 @@ public class TGet implements org.apache.thrift.TBase, java.i } 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 void setFieldValue(_Fields field, Object value) { @@ -627,6 +629,10 @@ public class TGet implements org.apache.thrift.TBase, java.i if (row == null) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'row' was not present! Struct: " + toString()); } + // check for sub-struct validity + if (timeRange != null) { + timeRange.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -640,7 +646,7 @@ public class TGet implements org.apache.thrift.TBase, java.i 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); @@ -680,7 +686,7 @@ public class TGet implements org.apache.thrift.TBase, java.i struct.columns = new ArrayList(_list8.size); for (int _i9 = 0; _i9 < _list8.size; ++_i9) { - TColumn _elem10; // optional + TColumn _elem10; // required _elem10 = new TColumn(); _elem10.read(iprot); struct.columns.add(_elem10); @@ -832,7 +838,7 @@ public class TGet implements org.apache.thrift.TBase, java.i struct.columns = new ArrayList(_list13.size); for (int _i14 = 0; _i14 < _list13.size; ++_i14) { - TColumn _elem15; // optional + TColumn _elem15; // required _elem15 = new TColumn(); _elem15.read(iprot); struct.columns.add(_elem15); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java index 56289987eae..98b1cd676cb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java @@ -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.StandardScheme; 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 extends org.apache.thrift.ProcessFunction { + public static class exists extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class get extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class getMultiple extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class put extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class checkAndPut extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class putMultiple extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class deleteSingle extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class deleteMultiple extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class checkAndDelete extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class increment extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class openScanner extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class getScannerRows extends org.apache.thrift.ProcessFunction { 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 extends org.apache.thrift.ProcessFunction { + public static class closeScanner extends org.apache.thrift.ProcessFunction { 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 other. */ 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(_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(_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(_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(_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 other. */ 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(_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(_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(_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(_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(_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(_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 other. */ 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 other. */ 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 other. */ 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(_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(_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 other. */ 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 { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java index 19f7546b872..55797b172c6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java @@ -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.StandardScheme; 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, java.io.Serializable, Cloneable { +public class TIOError extends TException implements org.apache.thrift.TBase, 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 implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class TIllegalArgument extends TException implements org.apache.thrift.TBase, 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 Exception implements org.apache.thrift.TBa 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 { diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java index 6b23b99c87d..007d8ec4205 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java @@ -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.StandardScheme; 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.apache.thrift.TBase metaDataMap; static { @@ -150,8 +153,7 @@ public class TIncrement implements org.apache.thrift.TBaseother. */ 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.apache.thrift.TBase(_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.apache.thrift.TBase(_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); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java index a93482440a4..9133c923399 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java @@ -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.StandardScheme; 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.thrift.TBase, java.i // 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.thrift.TBase, java.i * Performs a deep copy on other. */ 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.thrift.TBase, java.i } 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.thrift.TBase, java.i } 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.thrift.TBase, java.i 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.thrift.TBase, java.i 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.thrift.TBase, java.i struct.columnValues = new ArrayList(_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.thrift.TBase, java.i struct.columnValues = new ArrayList(_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); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java index f0fe2a0c583..b6051593a40 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java @@ -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.StandardScheme; 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.apache.thrift.TBase(_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.apache.thrift.TBase(_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); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java index cbcdf910c88..df9ab593153 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java @@ -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.StandardScheme; 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.thrift.TBase, jav // 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.thrift.TBase, jav * Performs a deep copy on other. */ 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.thrift.TBase, jav } 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.thrift.TBase, jav } 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.thrift.TBase, jav 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.thrift.TBase, jav 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.thrift.TBase, jav struct.columns = new ArrayList(_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.thrift.TBase, jav struct.columns = new ArrayList(_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); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java index 98058ea7c2d..ffac493466e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java @@ -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.StandardScheme; 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.apache.thrift.TBase 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.apache.thrift.TBaseother. */ 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.apache.thrift.TBase1.9.0 2.4.1 1.0.1 - 0.8.0 + 0.9.0 3.4.3 0.0.1-SNAPSHOT 2.6.3