You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2012/11/08 10:44:29 UTC
svn commit: r1406984 [19/29] - in /hive/trunk:
contrib/src/java/org/apache/hadoop/hive/contrib/genericudf/example/
contrib/src/java/org/apache/hadoop/hive/contrib/serde2/
contrib/src/java/org/apache/hadoop/hive/contrib/util/typedbytes/
contrib/src/test...
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java Thu Nov 8 09:44:19 2012
@@ -1,11 +1,21 @@
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.hadoop.hive.ql.plan.api;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+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;
@@ -28,6 +38,12 @@ public class Adjacency implements org.ap
private static final org.apache.thrift.protocol.TField CHILDREN_FIELD_DESC = new org.apache.thrift.protocol.TField("children", org.apache.thrift.protocol.TType.LIST, (short)2);
private static final org.apache.thrift.protocol.TField ADJACENCY_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("adjacencyType", org.apache.thrift.protocol.TType.I32, (short)3);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new AdjacencyStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new AdjacencyTupleSchemeFactory());
+ }
+
private String node; // required
private List<String> children; // required
private AdjacencyType adjacencyType; // required
@@ -101,7 +117,6 @@ public class Adjacency implements org.ap
}
// isset id assignments
-
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);
@@ -424,83 +439,11 @@ public class Adjacency implements org.ap
}
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 == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // NODE
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.node = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // CHILDREN
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
- this.children = new ArrayList<String>(_list0.size);
- for (int _i1 = 0; _i1 < _list0.size; ++_i1)
- {
- String _elem2; // required
- _elem2 = iprot.readString();
- this.children.add(_elem2);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // ADJACENCY_TYPE
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.adjacencyType = AdjacencyType.findByValue(iprot.readI32());
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.node != null) {
- oprot.writeFieldBegin(NODE_FIELD_DESC);
- oprot.writeString(this.node);
- oprot.writeFieldEnd();
- }
- if (this.children != null) {
- oprot.writeFieldBegin(CHILDREN_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.children.size()));
- for (String _iter3 : this.children)
- {
- oprot.writeString(_iter3);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.adjacencyType != null) {
- oprot.writeFieldBegin(ADJACENCY_TYPE_FIELD_DESC);
- oprot.writeI32(this.adjacencyType.getValue());
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -537,6 +480,7 @@ public class Adjacency implements org.ap
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 {
@@ -555,5 +499,165 @@ public class Adjacency implements org.ap
}
}
+ private static class AdjacencyStandardSchemeFactory implements SchemeFactory {
+ public AdjacencyStandardScheme getScheme() {
+ return new AdjacencyStandardScheme();
+ }
+ }
+
+ private static class AdjacencyStandardScheme extends StandardScheme<Adjacency> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, Adjacency struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // NODE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.node = iprot.readString();
+ struct.setNodeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // CHILDREN
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.children = new ArrayList<String>(_list0.size);
+ for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+ {
+ String _elem2; // required
+ _elem2 = iprot.readString();
+ struct.children.add(_elem2);
+ }
+ iprot.readListEnd();
+ }
+ struct.setChildrenIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // ADJACENCY_TYPE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.adjacencyType = AdjacencyType.findByValue(iprot.readI32());
+ struct.setAdjacencyTypeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, Adjacency struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.node != null) {
+ oprot.writeFieldBegin(NODE_FIELD_DESC);
+ oprot.writeString(struct.node);
+ oprot.writeFieldEnd();
+ }
+ if (struct.children != null) {
+ oprot.writeFieldBegin(CHILDREN_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.children.size()));
+ for (String _iter3 : struct.children)
+ {
+ oprot.writeString(_iter3);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.adjacencyType != null) {
+ oprot.writeFieldBegin(ADJACENCY_TYPE_FIELD_DESC);
+ oprot.writeI32(struct.adjacencyType.getValue());
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class AdjacencyTupleSchemeFactory implements SchemeFactory {
+ public AdjacencyTupleScheme getScheme() {
+ return new AdjacencyTupleScheme();
+ }
+ }
+
+ private static class AdjacencyTupleScheme extends TupleScheme<Adjacency> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, Adjacency struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetNode()) {
+ optionals.set(0);
+ }
+ if (struct.isSetChildren()) {
+ optionals.set(1);
+ }
+ if (struct.isSetAdjacencyType()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
+ if (struct.isSetNode()) {
+ oprot.writeString(struct.node);
+ }
+ if (struct.isSetChildren()) {
+ {
+ oprot.writeI32(struct.children.size());
+ for (String _iter4 : struct.children)
+ {
+ oprot.writeString(_iter4);
+ }
+ }
+ }
+ if (struct.isSetAdjacencyType()) {
+ oprot.writeI32(struct.adjacencyType.getValue());
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, Adjacency struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(3);
+ if (incoming.get(0)) {
+ struct.node = iprot.readString();
+ struct.setNodeIsSet(true);
+ }
+ if (incoming.get(1)) {
+ {
+ org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.children = new ArrayList<String>(_list5.size);
+ for (int _i6 = 0; _i6 < _list5.size; ++_i6)
+ {
+ String _elem7; // required
+ _elem7 = iprot.readString();
+ struct.children.add(_elem7);
+ }
+ }
+ struct.setChildrenIsSet(true);
+ }
+ if (incoming.get(2)) {
+ struct.adjacencyType = AdjacencyType.findByValue(iprot.readI32());
+ struct.setAdjacencyTypeIsSet(true);
+ }
+ }
+ }
+
}
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java Thu Nov 8 09:44:19 2012
@@ -1,7 +1,8 @@
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.hadoop.hive.ql.plan.api;
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java Thu Nov 8 09:44:19 2012
@@ -1,11 +1,21 @@
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.hadoop.hive.ql.plan.api;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+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;
@@ -28,6 +38,12 @@ public class Graph implements org.apache
private static final org.apache.thrift.protocol.TField ROOTS_FIELD_DESC = new org.apache.thrift.protocol.TField("roots", org.apache.thrift.protocol.TType.LIST, (short)2);
private static final org.apache.thrift.protocol.TField ADJACENCY_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("adjacencyList", org.apache.thrift.protocol.TType.LIST, (short)3);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new GraphStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new GraphTupleSchemeFactory());
+ }
+
private NodeType nodeType; // required
private List<String> roots; // required
private List<Adjacency> adjacencyList; // required
@@ -101,7 +117,6 @@ public class Graph implements org.apache
}
// isset id assignments
-
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);
@@ -444,101 +459,11 @@ public class Graph implements org.apache
}
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 == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // NODE_TYPE
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.nodeType = NodeType.findByValue(iprot.readI32());
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // ROOTS
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list4 = iprot.readListBegin();
- this.roots = new ArrayList<String>(_list4.size);
- for (int _i5 = 0; _i5 < _list4.size; ++_i5)
- {
- String _elem6; // required
- _elem6 = iprot.readString();
- this.roots.add(_elem6);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // ADJACENCY_LIST
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list7 = iprot.readListBegin();
- this.adjacencyList = new ArrayList<Adjacency>(_list7.size);
- for (int _i8 = 0; _i8 < _list7.size; ++_i8)
- {
- Adjacency _elem9; // required
- _elem9 = new Adjacency();
- _elem9.read(iprot);
- this.adjacencyList.add(_elem9);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.nodeType != null) {
- oprot.writeFieldBegin(NODE_TYPE_FIELD_DESC);
- oprot.writeI32(this.nodeType.getValue());
- oprot.writeFieldEnd();
- }
- if (this.roots != null) {
- oprot.writeFieldBegin(ROOTS_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.roots.size()));
- for (String _iter10 : this.roots)
- {
- oprot.writeString(_iter10);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.adjacencyList != null) {
- oprot.writeFieldBegin(ADJACENCY_LIST_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.adjacencyList.size()));
- for (Adjacency _iter11 : this.adjacencyList)
- {
- _iter11.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -575,6 +500,7 @@ public class Graph implements org.apache
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 {
@@ -593,5 +519,199 @@ public class Graph implements org.apache
}
}
+ private static class GraphStandardSchemeFactory implements SchemeFactory {
+ public GraphStandardScheme getScheme() {
+ return new GraphStandardScheme();
+ }
+ }
+
+ private static class GraphStandardScheme extends StandardScheme<Graph> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, Graph struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // NODE_TYPE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.nodeType = NodeType.findByValue(iprot.readI32());
+ struct.setNodeTypeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // ROOTS
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
+ struct.roots = new ArrayList<String>(_list8.size);
+ for (int _i9 = 0; _i9 < _list8.size; ++_i9)
+ {
+ String _elem10; // required
+ _elem10 = iprot.readString();
+ struct.roots.add(_elem10);
+ }
+ iprot.readListEnd();
+ }
+ struct.setRootsIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // ADJACENCY_LIST
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list11 = iprot.readListBegin();
+ struct.adjacencyList = new ArrayList<Adjacency>(_list11.size);
+ for (int _i12 = 0; _i12 < _list11.size; ++_i12)
+ {
+ Adjacency _elem13; // required
+ _elem13 = new Adjacency();
+ _elem13.read(iprot);
+ struct.adjacencyList.add(_elem13);
+ }
+ iprot.readListEnd();
+ }
+ struct.setAdjacencyListIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, Graph struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.nodeType != null) {
+ oprot.writeFieldBegin(NODE_TYPE_FIELD_DESC);
+ oprot.writeI32(struct.nodeType.getValue());
+ oprot.writeFieldEnd();
+ }
+ if (struct.roots != null) {
+ oprot.writeFieldBegin(ROOTS_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.roots.size()));
+ for (String _iter14 : struct.roots)
+ {
+ oprot.writeString(_iter14);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.adjacencyList != null) {
+ oprot.writeFieldBegin(ADJACENCY_LIST_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.adjacencyList.size()));
+ for (Adjacency _iter15 : struct.adjacencyList)
+ {
+ _iter15.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class GraphTupleSchemeFactory implements SchemeFactory {
+ public GraphTupleScheme getScheme() {
+ return new GraphTupleScheme();
+ }
+ }
+
+ private static class GraphTupleScheme extends TupleScheme<Graph> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, Graph struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetNodeType()) {
+ optionals.set(0);
+ }
+ if (struct.isSetRoots()) {
+ optionals.set(1);
+ }
+ if (struct.isSetAdjacencyList()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
+ if (struct.isSetNodeType()) {
+ oprot.writeI32(struct.nodeType.getValue());
+ }
+ if (struct.isSetRoots()) {
+ {
+ oprot.writeI32(struct.roots.size());
+ for (String _iter16 : struct.roots)
+ {
+ oprot.writeString(_iter16);
+ }
+ }
+ }
+ if (struct.isSetAdjacencyList()) {
+ {
+ oprot.writeI32(struct.adjacencyList.size());
+ for (Adjacency _iter17 : struct.adjacencyList)
+ {
+ _iter17.write(oprot);
+ }
+ }
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, Graph struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(3);
+ if (incoming.get(0)) {
+ struct.nodeType = NodeType.findByValue(iprot.readI32());
+ struct.setNodeTypeIsSet(true);
+ }
+ if (incoming.get(1)) {
+ {
+ org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.roots = new ArrayList<String>(_list18.size);
+ for (int _i19 = 0; _i19 < _list18.size; ++_i19)
+ {
+ String _elem20; // required
+ _elem20 = iprot.readString();
+ struct.roots.add(_elem20);
+ }
+ }
+ struct.setRootsIsSet(true);
+ }
+ if (incoming.get(2)) {
+ {
+ org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.adjacencyList = new ArrayList<Adjacency>(_list21.size);
+ for (int _i22 = 0; _i22 < _list21.size; ++_i22)
+ {
+ Adjacency _elem23; // required
+ _elem23 = new Adjacency();
+ _elem23.read(iprot);
+ struct.adjacencyList.add(_elem23);
+ }
+ }
+ struct.setAdjacencyListIsSet(true);
+ }
+ }
+ }
+
}
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java Thu Nov 8 09:44:19 2012
@@ -1,7 +1,8 @@
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.hadoop.hive.ql.plan.api;
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java Thu Nov 8 09:44:19 2012
@@ -1,11 +1,21 @@
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.hadoop.hive.ql.plan.api;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+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,6 +41,12 @@ public class Operator implements org.apa
private static final org.apache.thrift.protocol.TField DONE_FIELD_DESC = new org.apache.thrift.protocol.TField("done", org.apache.thrift.protocol.TType.BOOL, (short)5);
private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = new org.apache.thrift.protocol.TField("started", org.apache.thrift.protocol.TType.BOOL, (short)6);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new OperatorStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new OperatorTupleSchemeFactory());
+ }
+
private String operatorId; // required
private OperatorType operatorType; // required
private Map<String,String> operatorAttributes; // required
@@ -118,8 +134,7 @@ public class Operator implements org.apa
// isset id assignments
private static final int __DONE_ISSET_ID = 0;
private static final int __STARTED_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);
@@ -169,8 +184,7 @@ public class Operator implements org.apa
* Performs a deep copy on <i>other</i>.
*/
public Operator(Operator other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetOperatorId()) {
this.operatorId = other.operatorId;
}
@@ -359,16 +373,16 @@ public class Operator implements org.apa
}
public void unsetDone() {
- __isset_bit_vector.clear(__DONE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DONE_ISSET_ID);
}
/** Returns true if field done is set (has been assigned a value) and false otherwise */
public boolean isSetDone() {
- return __isset_bit_vector.get(__DONE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __DONE_ISSET_ID);
}
public void setDoneIsSet(boolean value) {
- __isset_bit_vector.set(__DONE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DONE_ISSET_ID, value);
}
public boolean isStarted() {
@@ -381,16 +395,16 @@ public class Operator implements org.apa
}
public void unsetStarted() {
- __isset_bit_vector.clear(__STARTED_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTED_ISSET_ID);
}
/** Returns true if field started is set (has been assigned a value) and false otherwise */
public boolean isSetStarted() {
- return __isset_bit_vector.get(__STARTED_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __STARTED_ISSET_ID);
}
public void setStartedIsSet(boolean value) {
- __isset_bit_vector.set(__STARTED_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTED_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -676,140 +690,11 @@ public class Operator implements org.apa
}
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 == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // OPERATOR_ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.operatorId = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // OPERATOR_TYPE
- if (field.type == org.apache.thrift.protocol.TType.I32) {
- this.operatorType = OperatorType.findByValue(iprot.readI32());
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // OPERATOR_ATTRIBUTES
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map12 = iprot.readMapBegin();
- this.operatorAttributes = new HashMap<String,String>(2*_map12.size);
- for (int _i13 = 0; _i13 < _map12.size; ++_i13)
- {
- String _key14; // required
- String _val15; // required
- _key14 = iprot.readString();
- _val15 = iprot.readString();
- this.operatorAttributes.put(_key14, _val15);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 4: // OPERATOR_COUNTERS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
- this.operatorCounters = new HashMap<String,Long>(2*_map16.size);
- for (int _i17 = 0; _i17 < _map16.size; ++_i17)
- {
- String _key18; // required
- long _val19; // required
- _key18 = iprot.readString();
- _val19 = iprot.readI64();
- this.operatorCounters.put(_key18, _val19);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 5: // DONE
- if (field.type == org.apache.thrift.protocol.TType.BOOL) {
- this.done = iprot.readBool();
- setDoneIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 6: // STARTED
- if (field.type == org.apache.thrift.protocol.TType.BOOL) {
- this.started = iprot.readBool();
- setStartedIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.operatorId != null) {
- oprot.writeFieldBegin(OPERATOR_ID_FIELD_DESC);
- oprot.writeString(this.operatorId);
- oprot.writeFieldEnd();
- }
- if (this.operatorType != null) {
- oprot.writeFieldBegin(OPERATOR_TYPE_FIELD_DESC);
- oprot.writeI32(this.operatorType.getValue());
- oprot.writeFieldEnd();
- }
- if (this.operatorAttributes != null) {
- oprot.writeFieldBegin(OPERATOR_ATTRIBUTES_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.operatorAttributes.size()));
- for (Map.Entry<String, String> _iter20 : this.operatorAttributes.entrySet())
- {
- oprot.writeString(_iter20.getKey());
- oprot.writeString(_iter20.getValue());
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.operatorCounters != null) {
- oprot.writeFieldBegin(OPERATOR_COUNTERS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, this.operatorCounters.size()));
- for (Map.Entry<String, Long> _iter21 : this.operatorCounters.entrySet())
- {
- oprot.writeString(_iter21.getKey());
- oprot.writeI64(_iter21.getValue());
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(DONE_FIELD_DESC);
- oprot.writeBool(this.done);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(STARTED_FIELD_DESC);
- oprot.writeBool(this.started);
- oprot.writeFieldEnd();
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -862,6 +747,7 @@ public class Operator implements org.apa
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 {
@@ -875,12 +761,281 @@ public class Operator implements org.apa
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);
}
}
+ private static class OperatorStandardSchemeFactory implements SchemeFactory {
+ public OperatorStandardScheme getScheme() {
+ return new OperatorStandardScheme();
+ }
+ }
+
+ private static class OperatorStandardScheme extends StandardScheme<Operator> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, Operator struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // OPERATOR_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.operatorId = iprot.readString();
+ struct.setOperatorIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // OPERATOR_TYPE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.operatorType = OperatorType.findByValue(iprot.readI32());
+ struct.setOperatorTypeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // OPERATOR_ATTRIBUTES
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map24 = iprot.readMapBegin();
+ struct.operatorAttributes = new HashMap<String,String>(2*_map24.size);
+ for (int _i25 = 0; _i25 < _map24.size; ++_i25)
+ {
+ String _key26; // required
+ String _val27; // required
+ _key26 = iprot.readString();
+ _val27 = iprot.readString();
+ struct.operatorAttributes.put(_key26, _val27);
+ }
+ iprot.readMapEnd();
+ }
+ struct.setOperatorAttributesIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // OPERATOR_COUNTERS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map28 = iprot.readMapBegin();
+ struct.operatorCounters = new HashMap<String,Long>(2*_map28.size);
+ for (int _i29 = 0; _i29 < _map28.size; ++_i29)
+ {
+ String _key30; // required
+ long _val31; // required
+ _key30 = iprot.readString();
+ _val31 = iprot.readI64();
+ struct.operatorCounters.put(_key30, _val31);
+ }
+ iprot.readMapEnd();
+ }
+ struct.setOperatorCountersIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // DONE
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.done = iprot.readBool();
+ struct.setDoneIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // STARTED
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.started = iprot.readBool();
+ struct.setStartedIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, Operator struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.operatorId != null) {
+ oprot.writeFieldBegin(OPERATOR_ID_FIELD_DESC);
+ oprot.writeString(struct.operatorId);
+ oprot.writeFieldEnd();
+ }
+ if (struct.operatorType != null) {
+ oprot.writeFieldBegin(OPERATOR_TYPE_FIELD_DESC);
+ oprot.writeI32(struct.operatorType.getValue());
+ oprot.writeFieldEnd();
+ }
+ if (struct.operatorAttributes != null) {
+ oprot.writeFieldBegin(OPERATOR_ATTRIBUTES_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.operatorAttributes.size()));
+ for (Map.Entry<String, String> _iter32 : struct.operatorAttributes.entrySet())
+ {
+ oprot.writeString(_iter32.getKey());
+ oprot.writeString(_iter32.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.operatorCounters != null) {
+ oprot.writeFieldBegin(OPERATOR_COUNTERS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.operatorCounters.size()));
+ for (Map.Entry<String, Long> _iter33 : struct.operatorCounters.entrySet())
+ {
+ oprot.writeString(_iter33.getKey());
+ oprot.writeI64(_iter33.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(DONE_FIELD_DESC);
+ oprot.writeBool(struct.done);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(STARTED_FIELD_DESC);
+ oprot.writeBool(struct.started);
+ oprot.writeFieldEnd();
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class OperatorTupleSchemeFactory implements SchemeFactory {
+ public OperatorTupleScheme getScheme() {
+ return new OperatorTupleScheme();
+ }
+ }
+
+ private static class OperatorTupleScheme extends TupleScheme<Operator> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, Operator struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetOperatorId()) {
+ optionals.set(0);
+ }
+ if (struct.isSetOperatorType()) {
+ optionals.set(1);
+ }
+ if (struct.isSetOperatorAttributes()) {
+ optionals.set(2);
+ }
+ if (struct.isSetOperatorCounters()) {
+ optionals.set(3);
+ }
+ if (struct.isSetDone()) {
+ optionals.set(4);
+ }
+ if (struct.isSetStarted()) {
+ optionals.set(5);
+ }
+ oprot.writeBitSet(optionals, 6);
+ if (struct.isSetOperatorId()) {
+ oprot.writeString(struct.operatorId);
+ }
+ if (struct.isSetOperatorType()) {
+ oprot.writeI32(struct.operatorType.getValue());
+ }
+ if (struct.isSetOperatorAttributes()) {
+ {
+ oprot.writeI32(struct.operatorAttributes.size());
+ for (Map.Entry<String, String> _iter34 : struct.operatorAttributes.entrySet())
+ {
+ oprot.writeString(_iter34.getKey());
+ oprot.writeString(_iter34.getValue());
+ }
+ }
+ }
+ if (struct.isSetOperatorCounters()) {
+ {
+ oprot.writeI32(struct.operatorCounters.size());
+ for (Map.Entry<String, Long> _iter35 : struct.operatorCounters.entrySet())
+ {
+ oprot.writeString(_iter35.getKey());
+ oprot.writeI64(_iter35.getValue());
+ }
+ }
+ }
+ if (struct.isSetDone()) {
+ oprot.writeBool(struct.done);
+ }
+ if (struct.isSetStarted()) {
+ oprot.writeBool(struct.started);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, Operator struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(6);
+ if (incoming.get(0)) {
+ struct.operatorId = iprot.readString();
+ struct.setOperatorIdIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.operatorType = OperatorType.findByValue(iprot.readI32());
+ struct.setOperatorTypeIsSet(true);
+ }
+ if (incoming.get(2)) {
+ {
+ org.apache.thrift.protocol.TMap _map36 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.operatorAttributes = new HashMap<String,String>(2*_map36.size);
+ for (int _i37 = 0; _i37 < _map36.size; ++_i37)
+ {
+ String _key38; // required
+ String _val39; // required
+ _key38 = iprot.readString();
+ _val39 = iprot.readString();
+ struct.operatorAttributes.put(_key38, _val39);
+ }
+ }
+ struct.setOperatorAttributesIsSet(true);
+ }
+ if (incoming.get(3)) {
+ {
+ org.apache.thrift.protocol.TMap _map40 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.operatorCounters = new HashMap<String,Long>(2*_map40.size);
+ for (int _i41 = 0; _i41 < _map40.size; ++_i41)
+ {
+ String _key42; // required
+ long _val43; // required
+ _key42 = iprot.readString();
+ _val43 = iprot.readI64();
+ struct.operatorCounters.put(_key42, _val43);
+ }
+ }
+ struct.setOperatorCountersIsSet(true);
+ }
+ if (incoming.get(4)) {
+ struct.done = iprot.readBool();
+ struct.setDoneIsSet(true);
+ }
+ if (incoming.get(5)) {
+ struct.started = iprot.readBool();
+ struct.setStartedIsSet(true);
+ }
+ }
+ }
+
}
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java Thu Nov 8 09:44:19 2012
@@ -1,7 +1,8 @@
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.hadoop.hive.ql.plan.api;
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java Thu Nov 8 09:44:19 2012
@@ -1,11 +1,21 @@
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.hadoop.hive.ql.plan.api;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+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;
@@ -33,6 +43,12 @@ public class Query implements org.apache
private static final org.apache.thrift.protocol.TField DONE_FIELD_DESC = new org.apache.thrift.protocol.TField("done", org.apache.thrift.protocol.TType.BOOL, (short)7);
private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = new org.apache.thrift.protocol.TField("started", org.apache.thrift.protocol.TType.BOOL, (short)8);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new QueryStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new QueryTupleSchemeFactory());
+ }
+
private String queryId; // required
private String queryType; // required
private Map<String,String> queryAttributes; // required
@@ -124,8 +140,7 @@ public class Query implements org.apache
// isset id assignments
private static final int __DONE_ISSET_ID = 0;
private static final int __STARTED_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);
@@ -184,8 +199,7 @@ public class Query implements org.apache
* Performs a deep copy on <i>other</i>.
*/
public Query(Query other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetQueryId()) {
this.queryId = other.queryId;
}
@@ -439,16 +453,16 @@ public class Query implements org.apache
}
public void unsetDone() {
- __isset_bit_vector.clear(__DONE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DONE_ISSET_ID);
}
/** Returns true if field done is set (has been assigned a value) and false otherwise */
public boolean isSetDone() {
- return __isset_bit_vector.get(__DONE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __DONE_ISSET_ID);
}
public void setDoneIsSet(boolean value) {
- __isset_bit_vector.set(__DONE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DONE_ISSET_ID, value);
}
public boolean isStarted() {
@@ -461,16 +475,16 @@ public class Query implements org.apache
}
public void unsetStarted() {
- __isset_bit_vector.clear(__STARTED_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTED_ISSET_ID);
}
/** Returns true if field started is set (has been assigned a value) and false otherwise */
public boolean isSetStarted() {
- return __isset_bit_vector.get(__STARTED_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __STARTED_ISSET_ID);
}
public void setStartedIsSet(boolean value) {
- __isset_bit_vector.set(__STARTED_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTED_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -830,183 +844,11 @@ public class Query implements org.apache
}
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 == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // QUERY_ID
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.queryId = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // QUERY_TYPE
- if (field.type == org.apache.thrift.protocol.TType.STRING) {
- this.queryType = iprot.readString();
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // QUERY_ATTRIBUTES
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map50 = iprot.readMapBegin();
- this.queryAttributes = new HashMap<String,String>(2*_map50.size);
- for (int _i51 = 0; _i51 < _map50.size; ++_i51)
- {
- String _key52; // required
- String _val53; // required
- _key52 = iprot.readString();
- _val53 = iprot.readString();
- this.queryAttributes.put(_key52, _val53);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 4: // QUERY_COUNTERS
- if (field.type == org.apache.thrift.protocol.TType.MAP) {
- {
- org.apache.thrift.protocol.TMap _map54 = iprot.readMapBegin();
- this.queryCounters = new HashMap<String,Long>(2*_map54.size);
- for (int _i55 = 0; _i55 < _map54.size; ++_i55)
- {
- String _key56; // required
- long _val57; // required
- _key56 = iprot.readString();
- _val57 = iprot.readI64();
- this.queryCounters.put(_key56, _val57);
- }
- iprot.readMapEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 5: // STAGE_GRAPH
- if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
- this.stageGraph = new Graph();
- this.stageGraph.read(iprot);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 6: // STAGE_LIST
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list58 = iprot.readListBegin();
- this.stageList = new ArrayList<Stage>(_list58.size);
- for (int _i59 = 0; _i59 < _list58.size; ++_i59)
- {
- Stage _elem60; // required
- _elem60 = new Stage();
- _elem60.read(iprot);
- this.stageList.add(_elem60);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 7: // DONE
- if (field.type == org.apache.thrift.protocol.TType.BOOL) {
- this.done = iprot.readBool();
- setDoneIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 8: // STARTED
- if (field.type == org.apache.thrift.protocol.TType.BOOL) {
- this.started = iprot.readBool();
- setStartedIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.queryId != null) {
- oprot.writeFieldBegin(QUERY_ID_FIELD_DESC);
- oprot.writeString(this.queryId);
- oprot.writeFieldEnd();
- }
- if (this.queryType != null) {
- oprot.writeFieldBegin(QUERY_TYPE_FIELD_DESC);
- oprot.writeString(this.queryType);
- oprot.writeFieldEnd();
- }
- if (this.queryAttributes != null) {
- oprot.writeFieldBegin(QUERY_ATTRIBUTES_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.queryAttributes.size()));
- for (Map.Entry<String, String> _iter61 : this.queryAttributes.entrySet())
- {
- oprot.writeString(_iter61.getKey());
- oprot.writeString(_iter61.getValue());
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.queryCounters != null) {
- oprot.writeFieldBegin(QUERY_COUNTERS_FIELD_DESC);
- {
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, this.queryCounters.size()));
- for (Map.Entry<String, Long> _iter62 : this.queryCounters.entrySet())
- {
- oprot.writeString(_iter62.getKey());
- oprot.writeI64(_iter62.getValue());
- }
- oprot.writeMapEnd();
- }
- oprot.writeFieldEnd();
- }
- if (this.stageGraph != null) {
- oprot.writeFieldBegin(STAGE_GRAPH_FIELD_DESC);
- this.stageGraph.write(oprot);
- oprot.writeFieldEnd();
- }
- if (this.stageList != null) {
- oprot.writeFieldBegin(STAGE_LIST_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.stageList.size()));
- for (Stage _iter63 : this.stageList)
- {
- _iter63.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(DONE_FIELD_DESC);
- oprot.writeBool(this.done);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(STARTED_FIELD_DESC);
- oprot.writeBool(this.started);
- oprot.writeFieldEnd();
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -1075,6 +917,10 @@ public class Query implements org.apache
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (stageGraph != null) {
+ stageGraph.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1088,12 +934,363 @@ public class Query implements org.apache
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
// it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
+ __isset_bitfield = 0;
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
}
}
+ private static class QueryStandardSchemeFactory implements SchemeFactory {
+ public QueryStandardScheme getScheme() {
+ return new QueryStandardScheme();
+ }
+ }
+
+ private static class QueryStandardScheme extends StandardScheme<Query> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, Query struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // QUERY_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.queryId = iprot.readString();
+ struct.setQueryIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // QUERY_TYPE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.queryType = iprot.readString();
+ struct.setQueryTypeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // QUERY_ATTRIBUTES
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin();
+ struct.queryAttributes = new HashMap<String,String>(2*_map100.size);
+ for (int _i101 = 0; _i101 < _map100.size; ++_i101)
+ {
+ String _key102; // required
+ String _val103; // required
+ _key102 = iprot.readString();
+ _val103 = iprot.readString();
+ struct.queryAttributes.put(_key102, _val103);
+ }
+ iprot.readMapEnd();
+ }
+ struct.setQueryAttributesIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // QUERY_COUNTERS
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map104 = iprot.readMapBegin();
+ struct.queryCounters = new HashMap<String,Long>(2*_map104.size);
+ for (int _i105 = 0; _i105 < _map104.size; ++_i105)
+ {
+ String _key106; // required
+ long _val107; // required
+ _key106 = iprot.readString();
+ _val107 = iprot.readI64();
+ struct.queryCounters.put(_key106, _val107);
+ }
+ iprot.readMapEnd();
+ }
+ struct.setQueryCountersIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 5: // STAGE_GRAPH
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.stageGraph = new Graph();
+ struct.stageGraph.read(iprot);
+ struct.setStageGraphIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 6: // STAGE_LIST
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list108 = iprot.readListBegin();
+ struct.stageList = new ArrayList<Stage>(_list108.size);
+ for (int _i109 = 0; _i109 < _list108.size; ++_i109)
+ {
+ Stage _elem110; // required
+ _elem110 = new Stage();
+ _elem110.read(iprot);
+ struct.stageList.add(_elem110);
+ }
+ iprot.readListEnd();
+ }
+ struct.setStageListIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 7: // DONE
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.done = iprot.readBool();
+ struct.setDoneIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 8: // STARTED
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.started = iprot.readBool();
+ struct.setStartedIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, Query struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.queryId != null) {
+ oprot.writeFieldBegin(QUERY_ID_FIELD_DESC);
+ oprot.writeString(struct.queryId);
+ oprot.writeFieldEnd();
+ }
+ if (struct.queryType != null) {
+ oprot.writeFieldBegin(QUERY_TYPE_FIELD_DESC);
+ oprot.writeString(struct.queryType);
+ oprot.writeFieldEnd();
+ }
+ if (struct.queryAttributes != null) {
+ oprot.writeFieldBegin(QUERY_ATTRIBUTES_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.queryAttributes.size()));
+ for (Map.Entry<String, String> _iter111 : struct.queryAttributes.entrySet())
+ {
+ oprot.writeString(_iter111.getKey());
+ oprot.writeString(_iter111.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.queryCounters != null) {
+ oprot.writeFieldBegin(QUERY_COUNTERS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.queryCounters.size()));
+ for (Map.Entry<String, Long> _iter112 : struct.queryCounters.entrySet())
+ {
+ oprot.writeString(_iter112.getKey());
+ oprot.writeI64(_iter112.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ if (struct.stageGraph != null) {
+ oprot.writeFieldBegin(STAGE_GRAPH_FIELD_DESC);
+ struct.stageGraph.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ if (struct.stageList != null) {
+ oprot.writeFieldBegin(STAGE_LIST_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.stageList.size()));
+ for (Stage _iter113 : struct.stageList)
+ {
+ _iter113.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(DONE_FIELD_DESC);
+ oprot.writeBool(struct.done);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(STARTED_FIELD_DESC);
+ oprot.writeBool(struct.started);
+ oprot.writeFieldEnd();
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class QueryTupleSchemeFactory implements SchemeFactory {
+ public QueryTupleScheme getScheme() {
+ return new QueryTupleScheme();
+ }
+ }
+
+ private static class QueryTupleScheme extends TupleScheme<Query> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, Query struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetQueryId()) {
+ optionals.set(0);
+ }
+ if (struct.isSetQueryType()) {
+ optionals.set(1);
+ }
+ if (struct.isSetQueryAttributes()) {
+ optionals.set(2);
+ }
+ if (struct.isSetQueryCounters()) {
+ optionals.set(3);
+ }
+ if (struct.isSetStageGraph()) {
+ optionals.set(4);
+ }
+ if (struct.isSetStageList()) {
+ optionals.set(5);
+ }
+ if (struct.isSetDone()) {
+ optionals.set(6);
+ }
+ if (struct.isSetStarted()) {
+ optionals.set(7);
+ }
+ oprot.writeBitSet(optionals, 8);
+ if (struct.isSetQueryId()) {
+ oprot.writeString(struct.queryId);
+ }
+ if (struct.isSetQueryType()) {
+ oprot.writeString(struct.queryType);
+ }
+ if (struct.isSetQueryAttributes()) {
+ {
+ oprot.writeI32(struct.queryAttributes.size());
+ for (Map.Entry<String, String> _iter114 : struct.queryAttributes.entrySet())
+ {
+ oprot.writeString(_iter114.getKey());
+ oprot.writeString(_iter114.getValue());
+ }
+ }
+ }
+ if (struct.isSetQueryCounters()) {
+ {
+ oprot.writeI32(struct.queryCounters.size());
+ for (Map.Entry<String, Long> _iter115 : struct.queryCounters.entrySet())
+ {
+ oprot.writeString(_iter115.getKey());
+ oprot.writeI64(_iter115.getValue());
+ }
+ }
+ }
+ if (struct.isSetStageGraph()) {
+ struct.stageGraph.write(oprot);
+ }
+ if (struct.isSetStageList()) {
+ {
+ oprot.writeI32(struct.stageList.size());
+ for (Stage _iter116 : struct.stageList)
+ {
+ _iter116.write(oprot);
+ }
+ }
+ }
+ if (struct.isSetDone()) {
+ oprot.writeBool(struct.done);
+ }
+ if (struct.isSetStarted()) {
+ oprot.writeBool(struct.started);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, Query struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(8);
+ if (incoming.get(0)) {
+ struct.queryId = iprot.readString();
+ struct.setQueryIdIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.queryType = iprot.readString();
+ struct.setQueryTypeIsSet(true);
+ }
+ if (incoming.get(2)) {
+ {
+ org.apache.thrift.protocol.TMap _map117 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.queryAttributes = new HashMap<String,String>(2*_map117.size);
+ for (int _i118 = 0; _i118 < _map117.size; ++_i118)
+ {
+ String _key119; // required
+ String _val120; // required
+ _key119 = iprot.readString();
+ _val120 = iprot.readString();
+ struct.queryAttributes.put(_key119, _val120);
+ }
+ }
+ struct.setQueryAttributesIsSet(true);
+ }
+ if (incoming.get(3)) {
+ {
+ org.apache.thrift.protocol.TMap _map121 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.queryCounters = new HashMap<String,Long>(2*_map121.size);
+ for (int _i122 = 0; _i122 < _map121.size; ++_i122)
+ {
+ String _key123; // required
+ long _val124; // required
+ _key123 = iprot.readString();
+ _val124 = iprot.readI64();
+ struct.queryCounters.put(_key123, _val124);
+ }
+ }
+ struct.setQueryCountersIsSet(true);
+ }
+ if (incoming.get(4)) {
+ struct.stageGraph = new Graph();
+ struct.stageGraph.read(iprot);
+ struct.setStageGraphIsSet(true);
+ }
+ if (incoming.get(5)) {
+ {
+ org.apache.thrift.protocol.TList _list125 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.stageList = new ArrayList<Stage>(_list125.size);
+ for (int _i126 = 0; _i126 < _list125.size; ++_i126)
+ {
+ Stage _elem127; // required
+ _elem127 = new Stage();
+ _elem127.read(iprot);
+ struct.stageList.add(_elem127);
+ }
+ }
+ struct.setStageListIsSet(true);
+ }
+ if (incoming.get(6)) {
+ struct.done = iprot.readBool();
+ struct.setDoneIsSet(true);
+ }
+ if (incoming.get(7)) {
+ struct.started = iprot.readBool();
+ struct.setStartedIsSet(true);
+ }
+ }
+ }
+
}
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java?rev=1406984&r1=1406983&r2=1406984&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java Thu Nov 8 09:44:19 2012
@@ -1,11 +1,21 @@
/**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
*/
package org.apache.hadoop.hive.ql.plan.api;
import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+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;
@@ -28,6 +38,12 @@ public class QueryPlan implements org.ap
private static final org.apache.thrift.protocol.TField DONE_FIELD_DESC = new org.apache.thrift.protocol.TField("done", org.apache.thrift.protocol.TType.BOOL, (short)2);
private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = new org.apache.thrift.protocol.TField("started", org.apache.thrift.protocol.TType.BOOL, (short)3);
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new QueryPlanStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new QueryPlanTupleSchemeFactory());
+ }
+
private List<Query> queries; // required
private boolean done; // required
private boolean started; // required
@@ -99,8 +115,7 @@ public class QueryPlan implements org.ap
// isset id assignments
private static final int __DONE_ISSET_ID = 0;
private static final int __STARTED_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);
@@ -135,8 +150,7 @@ public class QueryPlan implements org.ap
* Performs a deep copy on <i>other</i>.
*/
public QueryPlan(QueryPlan other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetQueries()) {
List<Query> __this__queries = new ArrayList<Query>();
for (Query other_element : other.queries) {
@@ -209,16 +223,16 @@ public class QueryPlan implements org.ap
}
public void unsetDone() {
- __isset_bit_vector.clear(__DONE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DONE_ISSET_ID);
}
/** Returns true if field done is set (has been assigned a value) and false otherwise */
public boolean isSetDone() {
- return __isset_bit_vector.get(__DONE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __DONE_ISSET_ID);
}
public void setDoneIsSet(boolean value) {
- __isset_bit_vector.set(__DONE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DONE_ISSET_ID, value);
}
public boolean isStarted() {
@@ -231,16 +245,16 @@ public class QueryPlan implements org.ap
}
public void unsetStarted() {
- __isset_bit_vector.clear(__STARTED_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTED_ISSET_ID);
}
/** Returns true if field started is set (has been assigned a value) and false otherwise */
public boolean isSetStarted() {
- return __isset_bit_vector.get(__STARTED_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __STARTED_ISSET_ID);
}
public void setStartedIsSet(boolean value) {
- __isset_bit_vector.set(__STARTED_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTED_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -415,82 +429,11 @@ public class QueryPlan implements org.ap
}
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 == org.apache.thrift.protocol.TType.STOP) {
- break;
- }
- switch (field.id) {
- case 1: // QUERIES
- if (field.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list64 = iprot.readListBegin();
- this.queries = new ArrayList<Query>(_list64.size);
- for (int _i65 = 0; _i65 < _list64.size; ++_i65)
- {
- Query _elem66; // required
- _elem66 = new Query();
- _elem66.read(iprot);
- this.queries.add(_elem66);
- }
- iprot.readListEnd();
- }
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 2: // DONE
- if (field.type == org.apache.thrift.protocol.TType.BOOL) {
- this.done = iprot.readBool();
- setDoneIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- case 3: // STARTED
- if (field.type == org.apache.thrift.protocol.TType.BOOL) {
- this.started = iprot.readBool();
- setStartedIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- break;
- default:
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
- }
- iprot.readFieldEnd();
- }
- iprot.readStructEnd();
- validate();
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
}
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (this.queries != null) {
- oprot.writeFieldBegin(QUERIES_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.queries.size()));
- for (Query _iter67 : this.queries)
- {
- _iter67.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- oprot.writeFieldBegin(DONE_FIELD_DESC);
- oprot.writeBool(this.done);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(STARTED_FIELD_DESC);
- oprot.writeBool(this.started);
- oprot.writeFieldEnd();
- oprot.writeFieldStop();
- oprot.writeStructEnd();
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
}
@Override
@@ -519,6 +462,7 @@ public class QueryPlan implements org.ap
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 {
@@ -532,12 +476,170 @@ public class QueryPlan implements org.ap
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);
}
}
+ private static class QueryPlanStandardSchemeFactory implements SchemeFactory {
+ public QueryPlanStandardScheme getScheme() {
+ return new QueryPlanStandardScheme();
+ }
+ }
+
+ private static class QueryPlanStandardScheme extends StandardScheme<QueryPlan> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, QueryPlan struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // QUERIES
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list128 = iprot.readListBegin();
+ struct.queries = new ArrayList<Query>(_list128.size);
+ for (int _i129 = 0; _i129 < _list128.size; ++_i129)
+ {
+ Query _elem130; // required
+ _elem130 = new Query();
+ _elem130.read(iprot);
+ struct.queries.add(_elem130);
+ }
+ iprot.readListEnd();
+ }
+ struct.setQueriesIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // DONE
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.done = iprot.readBool();
+ struct.setDoneIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // STARTED
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.started = iprot.readBool();
+ struct.setStartedIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, QueryPlan struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.queries != null) {
+ oprot.writeFieldBegin(QUERIES_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.queries.size()));
+ for (Query _iter131 : struct.queries)
+ {
+ _iter131.write(oprot);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(DONE_FIELD_DESC);
+ oprot.writeBool(struct.done);
+ oprot.writeFieldEnd();
+ oprot.writeFieldBegin(STARTED_FIELD_DESC);
+ oprot.writeBool(struct.started);
+ oprot.writeFieldEnd();
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class QueryPlanTupleSchemeFactory implements SchemeFactory {
+ public QueryPlanTupleScheme getScheme() {
+ return new QueryPlanTupleScheme();
+ }
+ }
+
+ private static class QueryPlanTupleScheme extends TupleScheme<QueryPlan> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, QueryPlan struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetQueries()) {
+ optionals.set(0);
+ }
+ if (struct.isSetDone()) {
+ optionals.set(1);
+ }
+ if (struct.isSetStarted()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
+ if (struct.isSetQueries()) {
+ {
+ oprot.writeI32(struct.queries.size());
+ for (Query _iter132 : struct.queries)
+ {
+ _iter132.write(oprot);
+ }
+ }
+ }
+ if (struct.isSetDone()) {
+ oprot.writeBool(struct.done);
+ }
+ if (struct.isSetStarted()) {
+ oprot.writeBool(struct.started);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, QueryPlan struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(3);
+ if (incoming.get(0)) {
+ {
+ org.apache.thrift.protocol.TList _list133 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.queries = new ArrayList<Query>(_list133.size);
+ for (int _i134 = 0; _i134 < _list133.size; ++_i134)
+ {
+ Query _elem135; // required
+ _elem135 = new Query();
+ _elem135.read(iprot);
+ struct.queries.add(_elem135);
+ }
+ }
+ struct.setQueriesIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.done = iprot.readBool();
+ struct.setDoneIsSet(true);
+ }
+ if (incoming.get(2)) {
+ struct.started = iprot.readBool();
+ struct.setStartedIsSet(true);
+ }
+ }
+ }
+
}