Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 73466190C for ; Tue, 26 Apr 2011 22:40:58 +0000 (UTC) Received: (qmail 98243 invoked by uid 500); 26 Apr 2011 22:40:58 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 98214 invoked by uid 500); 26 Apr 2011 22:40:58 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 98207 invoked by uid 99); 26 Apr 2011 22:40:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2011 22:40:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2011 22:40:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F018C2388A6B; Tue, 26 Apr 2011 22:40:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1096938 [3/3] - in /hbase/trunk: ./ src/main/java/org/apache/hadoop/hbase/thrift/ src/main/java/org/apache/hadoop/hbase/thrift/generated/ Date: Tue, 26 Apr 2011 22:40:26 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110426224026.F018C2388A6B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java?rev=1096938&r1=1096937&r2=1096938&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java Tue Apr 26 22:40:25 2011 @@ -1,19 +1,7 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Autogenerated by Thrift * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.hadoop.hbase.thrift.generated; @@ -32,26 +20,20 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.thrift.*; -import org.apache.thrift.async.*; -import org.apache.thrift.meta_data.*; -import org.apache.thrift.transport.*; -import org.apache.thrift.protocol.*; - /** * An IOError exception signals that an error occurred communicating * to the Hbase master or an Hbase region server. Also used to return * more general Hbase error conditions. */ -public class IOError extends Exception implements TBase, java.io.Serializable, Cloneable { - private static final TStruct STRUCT_DESC = new TStruct("IOError"); +public class IOError extends Exception 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 TField MESSAGE_FIELD_DESC = new TField("message", TType.STRING, (short)1); + 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); public String message; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { MESSAGE((short)1, "message"); private static final Map byName = new HashMap(); @@ -110,13 +92,13 @@ public class IOError extends Exception i // isset id assignments - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.MESSAGE, new FieldMetaData("message", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(IOError.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(IOError.class, metaDataMap); } public IOError() { @@ -160,7 +142,7 @@ public class IOError extends Exception i this.message = null; } - /** Returns true if field message is set (has been asigned a value) and false otherwise */ + /** Returns true if field message is set (has been assigned a value) and false otherwise */ public boolean isSetMessage() { return this.message != null; } @@ -193,7 +175,7 @@ public class IOError extends Exception i throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -249,7 +231,7 @@ public class IOError extends Exception i return lastComparison; } if (isSetMessage()) { - lastComparison = TBaseHelper.compareTo(this.message, typedOther.message); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); if (lastComparison != 0) { return lastComparison; } @@ -261,25 +243,25 @@ public class IOError extends Exception i return _Fields.findByThriftId(fieldId); } - public void read(TProtocol iprot) throws TException { - TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // MESSAGE - if (field.type == TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.message = iprot.readString(); - } else { - TProtocolUtil.skip(iprot, field.type); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -289,7 +271,7 @@ public class IOError extends Exception i validate(); } - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -318,9 +300,25 @@ public class IOError extends Exception i return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + } Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java?rev=1096938&r1=1096937&r2=1096938&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java Tue Apr 26 22:40:25 2011 @@ -1,19 +1,7 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Autogenerated by Thrift * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.hadoop.hbase.thrift.generated; @@ -32,25 +20,19 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.thrift.*; -import org.apache.thrift.async.*; -import org.apache.thrift.meta_data.*; -import org.apache.thrift.transport.*; -import org.apache.thrift.protocol.*; - /** * An IllegalArgument exception indicates an illegal or invalid * argument was passed into a procedure. */ -public class IllegalArgument extends Exception implements TBase, java.io.Serializable, Cloneable { - private static final TStruct STRUCT_DESC = new TStruct("IllegalArgument"); +public class IllegalArgument extends Exception 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 TField MESSAGE_FIELD_DESC = new TField("message", TType.STRING, (short)1); + 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); public String message; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { MESSAGE((short)1, "message"); private static final Map byName = new HashMap(); @@ -109,13 +91,13 @@ public class IllegalArgument extends Exc // isset id assignments - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.MESSAGE, new FieldMetaData("message", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(IllegalArgument.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(IllegalArgument.class, metaDataMap); } public IllegalArgument() { @@ -159,7 +141,7 @@ public class IllegalArgument extends Exc this.message = null; } - /** Returns true if field message is set (has been asigned a value) and false otherwise */ + /** Returns true if field message is set (has been assigned a value) and false otherwise */ public boolean isSetMessage() { return this.message != null; } @@ -192,7 +174,7 @@ public class IllegalArgument extends Exc throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -248,7 +230,7 @@ public class IllegalArgument extends Exc return lastComparison; } if (isSetMessage()) { - lastComparison = TBaseHelper.compareTo(this.message, typedOther.message); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); if (lastComparison != 0) { return lastComparison; } @@ -260,25 +242,25 @@ public class IllegalArgument extends Exc return _Fields.findByThriftId(fieldId); } - public void read(TProtocol iprot) throws TException { - TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // MESSAGE - if (field.type == TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.message = iprot.readString(); - } else { - TProtocolUtil.skip(iprot, field.type); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -288,7 +270,7 @@ public class IllegalArgument extends Exc validate(); } - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -317,9 +299,25 @@ public class IllegalArgument extends Exc return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + } Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java?rev=1096938&r1=1096937&r2=1096938&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java Tue Apr 26 22:40:25 2011 @@ -1,19 +1,7 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Autogenerated by Thrift * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.hadoop.hbase.thrift.generated; @@ -32,28 +20,22 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.thrift.*; -import org.apache.thrift.async.*; -import org.apache.thrift.meta_data.*; -import org.apache.thrift.transport.*; -import org.apache.thrift.protocol.*; - /** * A Mutation object is used to either update or delete a column-value. */ -public class Mutation implements TBase, java.io.Serializable, Cloneable { - private static final TStruct STRUCT_DESC = new TStruct("Mutation"); +public class Mutation 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("Mutation"); - private static final TField IS_DELETE_FIELD_DESC = new TField("isDelete", TType.BOOL, (short)1); - private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRING, (short)2); - private static final TField VALUE_FIELD_DESC = new TField("value", TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField IS_DELETE_FIELD_DESC = new org.apache.thrift.protocol.TField("isDelete", org.apache.thrift.protocol.TType.BOOL, (short)1); + private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)3); public boolean isDelete; public ByteBuffer column; public ByteBuffer value; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { IS_DELETE((short)1, "isDelete"), COLUMN((short)2, "column"), VALUE((short)3, "value"); @@ -120,17 +102,17 @@ public class Mutation implements TBase metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.IS_DELETE, new FieldMetaData("isDelete", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.BOOL))); - tmpMap.put(_Fields.COLUMN, new FieldMetaData("column", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING , "Text"))); - tmpMap.put(_Fields.VALUE, new FieldMetaData("value", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING , "Text"))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.IS_DELETE, new org.apache.thrift.meta_data.FieldMetaData("isDelete", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.COLUMN, new org.apache.thrift.meta_data.FieldMetaData("column", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(Mutation.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Mutation.class, metaDataMap); } public Mutation() { @@ -191,7 +173,7 @@ public class Mutation implements TBase, java.io.Serializable, Cloneable { - private static final TStruct STRUCT_DESC = new TStruct("TCell"); +public class TCell 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("TCell"); - private static final TField VALUE_FIELD_DESC = new TField("value", TType.STRING, (short)1); - private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)2); + private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)2); public ByteBuffer value; public long timestamp; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { VALUE((short)1, "value"), TIMESTAMP((short)2, "timestamp"); @@ -118,15 +100,15 @@ public class TCell implements TBase metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.VALUE, new FieldMetaData("value", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING , "Bytes"))); - tmpMap.put(_Fields.TIMESTAMP, new FieldMetaData("timestamp", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I64))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Bytes"))); + tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(TCell.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TCell.class, metaDataMap); } public TCell() { @@ -166,16 +148,16 @@ public class TCell implements TBase, java.io.Serializable, Cloneable { - private static final TStruct STRUCT_DESC = new TStruct("TRegionInfo"); +public class TRegionInfo 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("TRegionInfo"); - private static final TField START_KEY_FIELD_DESC = new TField("startKey", TType.STRING, (short)1); - private static final TField END_KEY_FIELD_DESC = new TField("endKey", TType.STRING, (short)2); - private static final TField ID_FIELD_DESC = new TField("id", TType.I64, (short)3); - private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short)4); - private static final TField VERSION_FIELD_DESC = new TField("version", TType.BYTE, (short)5); + private static final org.apache.thrift.protocol.TField START_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("startKey", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField END_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("endKey", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I64, (short)3); + private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.BYTE, (short)5); public ByteBuffer startKey; public ByteBuffer endKey; @@ -57,7 +39,7 @@ public class TRegionInfo implements TBas public byte version; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { START_KEY((short)1, "startKey"), END_KEY((short)2, "endKey"), ID((short)3, "id"), @@ -131,21 +113,21 @@ public class TRegionInfo implements TBas private static final int __VERSION_ISSET_ID = 1; private BitSet __isset_bit_vector = new BitSet(2); - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.START_KEY, new FieldMetaData("startKey", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING , "Text"))); - tmpMap.put(_Fields.END_KEY, new FieldMetaData("endKey", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING , "Text"))); - tmpMap.put(_Fields.ID, new FieldMetaData("id", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.I64))); - tmpMap.put(_Fields.NAME, new FieldMetaData("name", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING , "Text"))); - tmpMap.put(_Fields.VERSION, new FieldMetaData("version", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.BYTE))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.START_KEY, new org.apache.thrift.meta_data.FieldMetaData("startKey", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + tmpMap.put(_Fields.END_KEY, new org.apache.thrift.meta_data.FieldMetaData("endKey", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + tmpMap.put(_Fields.VERSION, new org.apache.thrift.meta_data.FieldMetaData("version", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE))); metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(TRegionInfo.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TRegionInfo.class, metaDataMap); } public TRegionInfo() { @@ -203,16 +185,16 @@ public class TRegionInfo implements TBas } public byte[] getStartKey() { - setStartKey(TBaseHelper.rightSize(startKey)); - return startKey.array(); + setStartKey(org.apache.thrift.TBaseHelper.rightSize(startKey)); + return startKey == null ? null : startKey.array(); } - public ByteBuffer BufferForStartKey() { + public ByteBuffer bufferForStartKey() { return startKey; } public TRegionInfo setStartKey(byte[] startKey) { - setStartKey(ByteBuffer.wrap(startKey)); + setStartKey(startKey == null ? (ByteBuffer)null : ByteBuffer.wrap(startKey)); return this; } @@ -225,7 +207,7 @@ public class TRegionInfo implements TBas this.startKey = null; } - /** Returns true if field startKey is set (has been asigned a value) and false otherwise */ + /** Returns true if field startKey is set (has been assigned a value) and false otherwise */ public boolean isSetStartKey() { return this.startKey != null; } @@ -237,16 +219,16 @@ public class TRegionInfo implements TBas } public byte[] getEndKey() { - setEndKey(TBaseHelper.rightSize(endKey)); - return endKey.array(); + setEndKey(org.apache.thrift.TBaseHelper.rightSize(endKey)); + return endKey == null ? null : endKey.array(); } - public ByteBuffer BufferForEndKey() { + public ByteBuffer bufferForEndKey() { return endKey; } public TRegionInfo setEndKey(byte[] endKey) { - setEndKey(ByteBuffer.wrap(endKey)); + setEndKey(endKey == null ? (ByteBuffer)null : ByteBuffer.wrap(endKey)); return this; } @@ -259,7 +241,7 @@ public class TRegionInfo implements TBas this.endKey = null; } - /** Returns true if field endKey is set (has been asigned a value) and false otherwise */ + /** Returns true if field endKey is set (has been assigned a value) and false otherwise */ public boolean isSetEndKey() { return this.endKey != null; } @@ -284,7 +266,7 @@ public class TRegionInfo implements TBas __isset_bit_vector.clear(__ID_ISSET_ID); } - /** Returns true if field id is set (has been asigned a value) and false otherwise */ + /** 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); } @@ -294,16 +276,16 @@ public class TRegionInfo implements TBas } public byte[] getName() { - setName(TBaseHelper.rightSize(name)); - return name.array(); + setName(org.apache.thrift.TBaseHelper.rightSize(name)); + return name == null ? null : name.array(); } - public ByteBuffer BufferForName() { + public ByteBuffer bufferForName() { return name; } public TRegionInfo setName(byte[] name) { - setName(ByteBuffer.wrap(name)); + setName(name == null ? (ByteBuffer)null : ByteBuffer.wrap(name)); return this; } @@ -316,7 +298,7 @@ public class TRegionInfo implements TBas this.name = null; } - /** Returns true if field name is set (has been asigned a value) and false otherwise */ + /** Returns true if field name is set (has been assigned a value) and false otherwise */ public boolean isSetName() { return this.name != null; } @@ -341,7 +323,7 @@ public class TRegionInfo implements TBas __isset_bit_vector.clear(__VERSION_ISSET_ID); } - /** Returns true if field version is set (has been asigned a value) and false otherwise */ + /** Returns true if field version is set (has been assigned a value) and false otherwise */ public boolean isSetVersion() { return __isset_bit_vector.get(__VERSION_ISSET_ID); } @@ -416,7 +398,7 @@ public class TRegionInfo implements TBas throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -516,7 +498,7 @@ public class TRegionInfo implements TBas return lastComparison; } if (isSetStartKey()) { - lastComparison = TBaseHelper.compareTo(this.startKey, typedOther.startKey); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKey, typedOther.startKey); if (lastComparison != 0) { return lastComparison; } @@ -526,7 +508,7 @@ public class TRegionInfo implements TBas return lastComparison; } if (isSetEndKey()) { - lastComparison = TBaseHelper.compareTo(this.endKey, typedOther.endKey); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endKey, typedOther.endKey); if (lastComparison != 0) { return lastComparison; } @@ -536,7 +518,7 @@ public class TRegionInfo implements TBas return lastComparison; } if (isSetId()) { - lastComparison = TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); if (lastComparison != 0) { return lastComparison; } @@ -546,7 +528,7 @@ public class TRegionInfo implements TBas return lastComparison; } if (isSetName()) { - lastComparison = TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -556,7 +538,7 @@ public class TRegionInfo implements TBas return lastComparison; } if (isSetVersion()) { - lastComparison = TBaseHelper.compareTo(this.version, typedOther.version); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, typedOther.version); if (lastComparison != 0) { return lastComparison; } @@ -568,55 +550,55 @@ public class TRegionInfo implements TBas return _Fields.findByThriftId(fieldId); } - public void read(TProtocol iprot) throws TException { - TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // START_KEY - if (field.type == TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.startKey = iprot.readBinary(); - } else { - TProtocolUtil.skip(iprot, field.type); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // END_KEY - if (field.type == TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.endKey = iprot.readBinary(); - } else { - TProtocolUtil.skip(iprot, field.type); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 3: // ID - if (field.type == TType.I64) { + if (field.type == org.apache.thrift.protocol.TType.I64) { this.id = iprot.readI64(); setIdIsSet(true); - } else { - TProtocolUtil.skip(iprot, field.type); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 4: // NAME - if (field.type == TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.name = iprot.readBinary(); - } else { - TProtocolUtil.skip(iprot, field.type); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 5: // VERSION - if (field.type == TType.BYTE) { + if (field.type == org.apache.thrift.protocol.TType.BYTE) { this.version = iprot.readByte(); setVersionIsSet(true); - } else { - TProtocolUtil.skip(iprot, field.type); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -626,7 +608,7 @@ public class TRegionInfo implements TBas validate(); } - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -695,9 +677,27 @@ public class TRegionInfo implements TBas return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + 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); + read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + } Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java?rev=1096938&r1=1096937&r2=1096938&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java Tue Apr 26 22:40:25 2011 @@ -1,19 +1,7 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Autogenerated by Thrift * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.hadoop.hbase.thrift.generated; @@ -32,26 +20,20 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.thrift.*; -import org.apache.thrift.async.*; -import org.apache.thrift.meta_data.*; -import org.apache.thrift.transport.*; -import org.apache.thrift.protocol.*; - /** * Holds row name and then a map of columns to cells. */ -public class TRowResult implements TBase, java.io.Serializable, Cloneable { - private static final TStruct STRUCT_DESC = new TStruct("TRowResult"); +public class TRowResult 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("TRowResult"); - private static final TField ROW_FIELD_DESC = new TField("row", TType.STRING, (short)1); - private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.MAP, (short)2); + private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.MAP, (short)2); public ByteBuffer row; public Map columns; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ROW((short)1, "row"), COLUMNS((short)2, "columns"); @@ -113,17 +95,17 @@ public class TRowResult implements TBase // isset id assignments - public static final Map<_Fields, FieldMetaData> metaDataMap; + public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { - Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.ROW, new FieldMetaData("row", TFieldRequirementType.DEFAULT, - new FieldValueMetaData(TType.STRING , "Text"))); - tmpMap.put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT, - new MapMetaData(TType.MAP, - new FieldValueMetaData(TType.STRING , "Text"), - new StructMetaData(TType.STRUCT, TCell.class)))); + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"))); + tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , "Text"), + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TCell.class)))); metaDataMap = Collections.unmodifiableMap(tmpMap); - FieldMetaData.addStructMetaDataMap(TRowResult.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TRowResult.class, metaDataMap); } public TRowResult() { @@ -173,16 +155,16 @@ public class TRowResult implements TBase } public byte[] getRow() { - setRow(TBaseHelper.rightSize(row)); - return row.array(); + setRow(org.apache.thrift.TBaseHelper.rightSize(row)); + return row == null ? null : row.array(); } - public ByteBuffer BufferForRow() { + public ByteBuffer bufferForRow() { return row; } public TRowResult setRow(byte[] row) { - setRow(ByteBuffer.wrap(row)); + setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); return this; } @@ -195,7 +177,7 @@ public class TRowResult implements TBase this.row = null; } - /** Returns true if field row is set (has been asigned a value) and false otherwise */ + /** Returns true if field row is set (has been assigned a value) and false otherwise */ public boolean isSetRow() { return this.row != null; } @@ -230,7 +212,7 @@ public class TRowResult implements TBase this.columns = null; } - /** Returns true if field columns is set (has been asigned a value) and false otherwise */ + /** Returns true if field columns is set (has been assigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -274,7 +256,7 @@ public class TRowResult implements TBase throw new IllegalStateException(); } - /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { throw new IllegalArgumentException(); @@ -341,7 +323,7 @@ public class TRowResult implements TBase return lastComparison; } if (isSetRow()) { - lastComparison = TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } @@ -351,7 +333,7 @@ public class TRowResult implements TBase return lastComparison; } if (isSetColumns()) { - lastComparison = TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } @@ -363,27 +345,27 @@ public class TRowResult implements TBase return _Fields.findByThriftId(fieldId); } - public void read(TProtocol iprot) throws TException { - TField field; + public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { + org.apache.thrift.protocol.TField field; iprot.readStructBegin(); while (true) { field = iprot.readFieldBegin(); - if (field.type == TType.STOP) { + if (field.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (field.id) { case 1: // ROW - if (field.type == TType.STRING) { + if (field.type == org.apache.thrift.protocol.TType.STRING) { this.row = iprot.readBinary(); - } else { - TProtocolUtil.skip(iprot, field.type); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; case 2: // COLUMNS - if (field.type == TType.MAP) { + if (field.type == org.apache.thrift.protocol.TType.MAP) { { - TMap _map4 = iprot.readMapBegin(); + org.apache.thrift.protocol.TMap _map4 = iprot.readMapBegin(); this.columns = new HashMap(2*_map4.size); for (int _i5 = 0; _i5 < _map4.size; ++_i5) { @@ -396,12 +378,12 @@ public class TRowResult implements TBase } iprot.readMapEnd(); } - } else { - TProtocolUtil.skip(iprot, field.type); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } break; default: - TProtocolUtil.skip(iprot, field.type); + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type); } iprot.readFieldEnd(); } @@ -411,7 +393,7 @@ public class TRowResult implements TBase validate(); } - public void write(TProtocol oprot) throws TException { + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -423,7 +405,7 @@ public class TRowResult implements TBase if (this.columns != null) { oprot.writeFieldBegin(COLUMNS_FIELD_DESC); { - oprot.writeMapBegin(new TMap(TType.STRING, TType.STRUCT, this.columns.size())); + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.columns.size())); for (Map.Entry _iter8 : this.columns.entrySet()) { oprot.writeBinary(_iter8.getKey()); @@ -461,9 +443,25 @@ public class TRowResult implements TBase return sb.toString(); } - public void validate() throws TException { + public void validate() throws org.apache.thrift.TException { // check for required fields } + private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { + try { + write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); + } catch (org.apache.thrift.TException te) { + throw new java.io.IOException(te); + } + } + + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + try { + 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); + } + } + }