You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2015/05/08 19:00:06 UTC
[1/3] cassandra git commit: Revert "add Thrift get_multi_slice call"
Repository: cassandra
Updated Branches:
refs/heads/trunk c7db18be8 -> 3f0702509
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnSlice.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnSlice.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnSlice.java
deleted file mode 100644
index 67b88a3..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnSlice.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.cassandra.thrift;
-/*
- *
- * 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
- *
- * 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.
- *
- */
-
-
-import org.apache.commons.lang3.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 org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The ColumnSlice is used to select a set of columns from inside a row.
- * If start or finish are unspecified they will default to the start-of
- * end-of value.
- * @param start. The start of the ColumnSlice inclusive
- * @param finish. The end of the ColumnSlice inclusive
- */
-public class ColumnSlice implements org.apache.thrift.TBase<ColumnSlice, ColumnSlice._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnSlice> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnSlice");
-
- private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField FINISH_FIELD_DESC = new org.apache.thrift.protocol.TField("finish", org.apache.thrift.protocol.TType.STRING, (short)2);
-
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new ColumnSliceStandardSchemeFactory());
- schemes.put(TupleScheme.class, new ColumnSliceTupleSchemeFactory());
- }
-
- public ByteBuffer start; // optional
- public ByteBuffer finish; // optional
-
- /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- START((short)1, "start"),
- FINISH((short)2, "finish");
-
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
- static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byName.put(field.getFieldName(), field);
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, or null if its not found.
- */
- public static _Fields findByThriftId(int fieldId) {
- switch(fieldId) {
- case 1: // START
- return START;
- case 2: // FINISH
- return FINISH;
- default:
- return null;
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
- public static _Fields findByThriftIdOrThrow(int fieldId) {
- _Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
- return fields;
- }
-
- /**
- * Find the _Fields constant that matches name, or null if its not found.
- */
- public static _Fields findByName(String name) {
- return byName.get(name);
- }
-
- private final short _thriftId;
- private final String _fieldName;
-
- _Fields(short thriftId, String fieldName) {
- _thriftId = thriftId;
- _fieldName = fieldName;
- }
-
- public short getThriftFieldId() {
- return _thriftId;
- }
-
- public String getFieldName() {
- return _fieldName;
- }
- }
-
- // isset id assignments
- private _Fields optionals[] = {_Fields.START,_Fields.FINISH};
- 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);
- tmpMap.put(_Fields.START, new org.apache.thrift.meta_data.FieldMetaData("start", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
- tmpMap.put(_Fields.FINISH, new org.apache.thrift.meta_data.FieldMetaData("finish", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnSlice.class, metaDataMap);
- }
-
- public ColumnSlice() {
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public ColumnSlice(ColumnSlice other) {
- if (other.isSetStart()) {
- this.start = org.apache.thrift.TBaseHelper.copyBinary(other.start);
-;
- }
- if (other.isSetFinish()) {
- this.finish = org.apache.thrift.TBaseHelper.copyBinary(other.finish);
-;
- }
- }
-
- public ColumnSlice deepCopy() {
- return new ColumnSlice(this);
- }
-
- @Override
- public void clear() {
- this.start = null;
- this.finish = null;
- }
-
- public byte[] getStart() {
- setStart(org.apache.thrift.TBaseHelper.rightSize(start));
- return start == null ? null : start.array();
- }
-
- public ByteBuffer bufferForStart() {
- return start;
- }
-
- public ColumnSlice setStart(byte[] start) {
- setStart(start == null ? (ByteBuffer)null : ByteBuffer.wrap(start));
- return this;
- }
-
- public ColumnSlice setStart(ByteBuffer start) {
- this.start = start;
- return this;
- }
-
- public void unsetStart() {
- this.start = null;
- }
-
- /** Returns true if field start is set (has been assigned a value) and false otherwise */
- public boolean isSetStart() {
- return this.start != null;
- }
-
- public void setStartIsSet(boolean value) {
- if (!value) {
- this.start = null;
- }
- }
-
- public byte[] getFinish() {
- setFinish(org.apache.thrift.TBaseHelper.rightSize(finish));
- return finish == null ? null : finish.array();
- }
-
- public ByteBuffer bufferForFinish() {
- return finish;
- }
-
- public ColumnSlice setFinish(byte[] finish) {
- setFinish(finish == null ? (ByteBuffer)null : ByteBuffer.wrap(finish));
- return this;
- }
-
- public ColumnSlice setFinish(ByteBuffer finish) {
- this.finish = finish;
- return this;
- }
-
- public void unsetFinish() {
- this.finish = null;
- }
-
- /** Returns true if field finish is set (has been assigned a value) and false otherwise */
- public boolean isSetFinish() {
- return this.finish != null;
- }
-
- public void setFinishIsSet(boolean value) {
- if (!value) {
- this.finish = null;
- }
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case START:
- if (value == null) {
- unsetStart();
- } else {
- setStart((ByteBuffer)value);
- }
- break;
-
- case FINISH:
- if (value == null) {
- unsetFinish();
- } else {
- setFinish((ByteBuffer)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case START:
- return getStart();
-
- case FINISH:
- return getFinish();
-
- }
- throw new IllegalStateException();
- }
-
- /** 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();
- }
-
- switch (field) {
- case START:
- return isSetStart();
- case FINISH:
- return isSetFinish();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof ColumnSlice)
- return this.equals((ColumnSlice)that);
- return false;
- }
-
- public boolean equals(ColumnSlice that) {
- if (that == null)
- return false;
-
- boolean this_present_start = true && this.isSetStart();
- boolean that_present_start = true && that.isSetStart();
- if (this_present_start || that_present_start) {
- if (!(this_present_start && that_present_start))
- return false;
- if (!this.start.equals(that.start))
- return false;
- }
-
- boolean this_present_finish = true && this.isSetFinish();
- boolean that_present_finish = true && that.isSetFinish();
- if (this_present_finish || that_present_finish) {
- if (!(this_present_finish && that_present_finish))
- return false;
- if (!this.finish.equals(that.finish))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
-
- boolean present_start = true && (isSetStart());
- builder.append(present_start);
- if (present_start)
- builder.append(start);
-
- boolean present_finish = true && (isSetFinish());
- builder.append(present_finish);
- if (present_finish)
- builder.append(finish);
-
- return builder.toHashCode();
- }
-
- @Override
- public int compareTo(ColumnSlice other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetStart()).compareTo(other.isSetStart());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetStart()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.start, other.start);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetFinish()).compareTo(other.isSetFinish());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetFinish()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.finish, other.finish);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- return 0;
- }
-
- public _Fields fieldForId(int fieldId) {
- return _Fields.findByThriftId(fieldId);
- }
-
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder("ColumnSlice(");
- boolean first = true;
-
- if (isSetStart()) {
- sb.append("start:");
- if (this.start == null) {
- sb.append("null");
- } else {
- org.apache.thrift.TBaseHelper.toString(this.start, sb);
- }
- first = false;
- }
- if (isSetFinish()) {
- if (!first) sb.append(", ");
- sb.append("finish:");
- if (this.finish == null) {
- sb.append("null");
- } else {
- org.apache.thrift.TBaseHelper.toString(this.finish, sb);
- }
- first = false;
- }
- sb.append(")");
- return sb.toString();
- }
-
- 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 {
- 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);
- }
- }
-
- private static class ColumnSliceStandardSchemeFactory implements SchemeFactory {
- public ColumnSliceStandardScheme getScheme() {
- return new ColumnSliceStandardScheme();
- }
- }
-
- private static class ColumnSliceStandardScheme extends StandardScheme<ColumnSlice> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnSlice 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: // START
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.start = iprot.readBinary();
- struct.setStartIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // FINISH
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.finish = iprot.readBinary();
- struct.setFinishIsSet(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();
-
- // check for required fields of primitive type, which can't be checked in the validate method
- struct.validate();
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot, ColumnSlice struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.start != null) {
- if (struct.isSetStart()) {
- oprot.writeFieldBegin(START_FIELD_DESC);
- oprot.writeBinary(struct.start);
- oprot.writeFieldEnd();
- }
- }
- if (struct.finish != null) {
- if (struct.isSetFinish()) {
- oprot.writeFieldBegin(FINISH_FIELD_DESC);
- oprot.writeBinary(struct.finish);
- oprot.writeFieldEnd();
- }
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class ColumnSliceTupleSchemeFactory implements SchemeFactory {
- public ColumnSliceTupleScheme getScheme() {
- return new ColumnSliceTupleScheme();
- }
- }
-
- private static class ColumnSliceTupleScheme extends TupleScheme<ColumnSlice> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, ColumnSlice struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
- if (struct.isSetStart()) {
- optionals.set(0);
- }
- if (struct.isSetFinish()) {
- optionals.set(1);
- }
- oprot.writeBitSet(optionals, 2);
- if (struct.isSetStart()) {
- oprot.writeBinary(struct.start);
- }
- if (struct.isSetFinish()) {
- oprot.writeBinary(struct.finish);
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, ColumnSlice struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(2);
- if (incoming.get(0)) {
- struct.start = iprot.readBinary();
- struct.setStartIsSet(true);
- }
- if (incoming.get(1)) {
- struct.finish = iprot.readBinary();
- struct.setFinishIsSet(true);
- }
- }
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/interface/thrift/gen-java/org/apache/cassandra/thrift/MultiSliceRequest.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/MultiSliceRequest.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/MultiSliceRequest.java
deleted file mode 100644
index 9d4878c..0000000
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/MultiSliceRequest.java
+++ /dev/null
@@ -1,1042 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.cassandra.thrift;
-/*
- *
- * 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
- *
- * 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.
- *
- */
-
-
-import org.apache.commons.lang3.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 org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Used to perform multiple slices on a single row key in one rpc operation
- * @param key. The row key to be multi sliced
- * @param column_parent. The column family (super columns are unsupported)
- * @param column_slices. 0 to many ColumnSlice objects each will be used to select columns
- * @param reversed. Direction of slice
- * @param count. Maximum number of columns
- * @param consistency_level. Level to perform the operation at
- */
-public class MultiSliceRequest implements org.apache.thrift.TBase<MultiSliceRequest, MultiSliceRequest._Fields>, java.io.Serializable, Cloneable, Comparable<MultiSliceRequest> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MultiSliceRequest");
-
- private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField COLUMN_PARENT_FIELD_DESC = new org.apache.thrift.protocol.TField("column_parent", org.apache.thrift.protocol.TType.STRUCT, (short)2);
- private static final org.apache.thrift.protocol.TField COLUMN_SLICES_FIELD_DESC = new org.apache.thrift.protocol.TField("column_slices", org.apache.thrift.protocol.TType.LIST, (short)3);
- private static final org.apache.thrift.protocol.TField REVERSED_FIELD_DESC = new org.apache.thrift.protocol.TField("reversed", org.apache.thrift.protocol.TType.BOOL, (short)4);
- private static final org.apache.thrift.protocol.TField COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("count", org.apache.thrift.protocol.TType.I32, (short)5);
- private static final org.apache.thrift.protocol.TField CONSISTENCY_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency_level", org.apache.thrift.protocol.TType.I32, (short)6);
-
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new MultiSliceRequestStandardSchemeFactory());
- schemes.put(TupleScheme.class, new MultiSliceRequestTupleSchemeFactory());
- }
-
- public ByteBuffer key; // optional
- public ColumnParent column_parent; // optional
- public List<ColumnSlice> column_slices; // optional
- public boolean reversed; // optional
- public int count; // optional
- /**
- *
- * @see ConsistencyLevel
- */
- public ConsistencyLevel consistency_level; // optional
-
- /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- KEY((short)1, "key"),
- COLUMN_PARENT((short)2, "column_parent"),
- COLUMN_SLICES((short)3, "column_slices"),
- REVERSED((short)4, "reversed"),
- COUNT((short)5, "count"),
- /**
- *
- * @see ConsistencyLevel
- */
- CONSISTENCY_LEVEL((short)6, "consistency_level");
-
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
- static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
- byName.put(field.getFieldName(), field);
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, or null if its not found.
- */
- public static _Fields findByThriftId(int fieldId) {
- switch(fieldId) {
- case 1: // KEY
- return KEY;
- case 2: // COLUMN_PARENT
- return COLUMN_PARENT;
- case 3: // COLUMN_SLICES
- return COLUMN_SLICES;
- case 4: // REVERSED
- return REVERSED;
- case 5: // COUNT
- return COUNT;
- case 6: // CONSISTENCY_LEVEL
- return CONSISTENCY_LEVEL;
- default:
- return null;
- }
- }
-
- /**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
- public static _Fields findByThriftIdOrThrow(int fieldId) {
- _Fields fields = findByThriftId(fieldId);
- if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
- return fields;
- }
-
- /**
- * Find the _Fields constant that matches name, or null if its not found.
- */
- public static _Fields findByName(String name) {
- return byName.get(name);
- }
-
- private final short _thriftId;
- private final String _fieldName;
-
- _Fields(short thriftId, String fieldName) {
- _thriftId = thriftId;
- _fieldName = fieldName;
- }
-
- public short getThriftFieldId() {
- return _thriftId;
- }
-
- public String getFieldName() {
- return _fieldName;
- }
- }
-
- // isset id assignments
- private static final int __REVERSED_ISSET_ID = 0;
- private static final int __COUNT_ISSET_ID = 1;
- private byte __isset_bitfield = 0;
- private _Fields optionals[] = {_Fields.KEY,_Fields.COLUMN_PARENT,_Fields.COLUMN_SLICES,_Fields.REVERSED,_Fields.COUNT,_Fields.CONSISTENCY_LEVEL};
- 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);
- tmpMap.put(_Fields.KEY, new org.apache.thrift.meta_data.FieldMetaData("key", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
- tmpMap.put(_Fields.COLUMN_PARENT, new org.apache.thrift.meta_data.FieldMetaData("column_parent", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnParent.class)));
- tmpMap.put(_Fields.COLUMN_SLICES, new org.apache.thrift.meta_data.FieldMetaData("column_slices", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnSlice.class))));
- tmpMap.put(_Fields.REVERSED, new org.apache.thrift.meta_data.FieldMetaData("reversed", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- tmpMap.put(_Fields.COUNT, new org.apache.thrift.meta_data.FieldMetaData("count", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.CONSISTENCY_LEVEL, new org.apache.thrift.meta_data.FieldMetaData("consistency_level", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ConsistencyLevel.class)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MultiSliceRequest.class, metaDataMap);
- }
-
- public MultiSliceRequest() {
- this.reversed = false;
-
- this.count = 1000;
-
- this.consistency_level = org.apache.cassandra.thrift.ConsistencyLevel.ONE;
-
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public MultiSliceRequest(MultiSliceRequest other) {
- __isset_bitfield = other.__isset_bitfield;
- if (other.isSetKey()) {
- this.key = org.apache.thrift.TBaseHelper.copyBinary(other.key);
-;
- }
- if (other.isSetColumn_parent()) {
- this.column_parent = new ColumnParent(other.column_parent);
- }
- if (other.isSetColumn_slices()) {
- List<ColumnSlice> __this__column_slices = new ArrayList<ColumnSlice>(other.column_slices.size());
- for (ColumnSlice other_element : other.column_slices) {
- __this__column_slices.add(new ColumnSlice(other_element));
- }
- this.column_slices = __this__column_slices;
- }
- this.reversed = other.reversed;
- this.count = other.count;
- if (other.isSetConsistency_level()) {
- this.consistency_level = other.consistency_level;
- }
- }
-
- public MultiSliceRequest deepCopy() {
- return new MultiSliceRequest(this);
- }
-
- @Override
- public void clear() {
- this.key = null;
- this.column_parent = null;
- this.column_slices = null;
- this.reversed = false;
-
- this.count = 1000;
-
- this.consistency_level = org.apache.cassandra.thrift.ConsistencyLevel.ONE;
-
- }
-
- public byte[] getKey() {
- setKey(org.apache.thrift.TBaseHelper.rightSize(key));
- return key == null ? null : key.array();
- }
-
- public ByteBuffer bufferForKey() {
- return key;
- }
-
- public MultiSliceRequest setKey(byte[] key) {
- setKey(key == null ? (ByteBuffer)null : ByteBuffer.wrap(key));
- return this;
- }
-
- public MultiSliceRequest setKey(ByteBuffer key) {
- this.key = key;
- return this;
- }
-
- public void unsetKey() {
- this.key = null;
- }
-
- /** Returns true if field key is set (has been assigned a value) and false otherwise */
- public boolean isSetKey() {
- return this.key != null;
- }
-
- public void setKeyIsSet(boolean value) {
- if (!value) {
- this.key = null;
- }
- }
-
- public ColumnParent getColumn_parent() {
- return this.column_parent;
- }
-
- public MultiSliceRequest setColumn_parent(ColumnParent column_parent) {
- this.column_parent = column_parent;
- return this;
- }
-
- public void unsetColumn_parent() {
- this.column_parent = null;
- }
-
- /** Returns true if field column_parent is set (has been assigned a value) and false otherwise */
- public boolean isSetColumn_parent() {
- return this.column_parent != null;
- }
-
- public void setColumn_parentIsSet(boolean value) {
- if (!value) {
- this.column_parent = null;
- }
- }
-
- public int getColumn_slicesSize() {
- return (this.column_slices == null) ? 0 : this.column_slices.size();
- }
-
- public java.util.Iterator<ColumnSlice> getColumn_slicesIterator() {
- return (this.column_slices == null) ? null : this.column_slices.iterator();
- }
-
- public void addToColumn_slices(ColumnSlice elem) {
- if (this.column_slices == null) {
- this.column_slices = new ArrayList<ColumnSlice>();
- }
- this.column_slices.add(elem);
- }
-
- public List<ColumnSlice> getColumn_slices() {
- return this.column_slices;
- }
-
- public MultiSliceRequest setColumn_slices(List<ColumnSlice> column_slices) {
- this.column_slices = column_slices;
- return this;
- }
-
- public void unsetColumn_slices() {
- this.column_slices = null;
- }
-
- /** Returns true if field column_slices is set (has been assigned a value) and false otherwise */
- public boolean isSetColumn_slices() {
- return this.column_slices != null;
- }
-
- public void setColumn_slicesIsSet(boolean value) {
- if (!value) {
- this.column_slices = null;
- }
- }
-
- public boolean isReversed() {
- return this.reversed;
- }
-
- public MultiSliceRequest setReversed(boolean reversed) {
- this.reversed = reversed;
- setReversedIsSet(true);
- return this;
- }
-
- public void unsetReversed() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REVERSED_ISSET_ID);
- }
-
- /** Returns true if field reversed is set (has been assigned a value) and false otherwise */
- public boolean isSetReversed() {
- return EncodingUtils.testBit(__isset_bitfield, __REVERSED_ISSET_ID);
- }
-
- public void setReversedIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REVERSED_ISSET_ID, value);
- }
-
- public int getCount() {
- return this.count;
- }
-
- public MultiSliceRequest setCount(int count) {
- this.count = count;
- setCountIsSet(true);
- return this;
- }
-
- public void unsetCount() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __COUNT_ISSET_ID);
- }
-
- /** Returns true if field count is set (has been assigned a value) and false otherwise */
- public boolean isSetCount() {
- return EncodingUtils.testBit(__isset_bitfield, __COUNT_ISSET_ID);
- }
-
- public void setCountIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __COUNT_ISSET_ID, value);
- }
-
- /**
- *
- * @see ConsistencyLevel
- */
- public ConsistencyLevel getConsistency_level() {
- return this.consistency_level;
- }
-
- /**
- *
- * @see ConsistencyLevel
- */
- public MultiSliceRequest setConsistency_level(ConsistencyLevel consistency_level) {
- this.consistency_level = consistency_level;
- return this;
- }
-
- public void unsetConsistency_level() {
- this.consistency_level = null;
- }
-
- /** Returns true if field consistency_level is set (has been assigned a value) and false otherwise */
- public boolean isSetConsistency_level() {
- return this.consistency_level != null;
- }
-
- public void setConsistency_levelIsSet(boolean value) {
- if (!value) {
- this.consistency_level = null;
- }
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case KEY:
- if (value == null) {
- unsetKey();
- } else {
- setKey((ByteBuffer)value);
- }
- break;
-
- case COLUMN_PARENT:
- if (value == null) {
- unsetColumn_parent();
- } else {
- setColumn_parent((ColumnParent)value);
- }
- break;
-
- case COLUMN_SLICES:
- if (value == null) {
- unsetColumn_slices();
- } else {
- setColumn_slices((List<ColumnSlice>)value);
- }
- break;
-
- case REVERSED:
- if (value == null) {
- unsetReversed();
- } else {
- setReversed((Boolean)value);
- }
- break;
-
- case COUNT:
- if (value == null) {
- unsetCount();
- } else {
- setCount((Integer)value);
- }
- break;
-
- case CONSISTENCY_LEVEL:
- if (value == null) {
- unsetConsistency_level();
- } else {
- setConsistency_level((ConsistencyLevel)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case KEY:
- return getKey();
-
- case COLUMN_PARENT:
- return getColumn_parent();
-
- case COLUMN_SLICES:
- return getColumn_slices();
-
- case REVERSED:
- return Boolean.valueOf(isReversed());
-
- case COUNT:
- return Integer.valueOf(getCount());
-
- case CONSISTENCY_LEVEL:
- return getConsistency_level();
-
- }
- throw new IllegalStateException();
- }
-
- /** 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();
- }
-
- switch (field) {
- case KEY:
- return isSetKey();
- case COLUMN_PARENT:
- return isSetColumn_parent();
- case COLUMN_SLICES:
- return isSetColumn_slices();
- case REVERSED:
- return isSetReversed();
- case COUNT:
- return isSetCount();
- case CONSISTENCY_LEVEL:
- return isSetConsistency_level();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof MultiSliceRequest)
- return this.equals((MultiSliceRequest)that);
- return false;
- }
-
- public boolean equals(MultiSliceRequest that) {
- if (that == null)
- return false;
-
- boolean this_present_key = true && this.isSetKey();
- boolean that_present_key = true && that.isSetKey();
- if (this_present_key || that_present_key) {
- if (!(this_present_key && that_present_key))
- return false;
- if (!this.key.equals(that.key))
- return false;
- }
-
- boolean this_present_column_parent = true && this.isSetColumn_parent();
- boolean that_present_column_parent = true && that.isSetColumn_parent();
- if (this_present_column_parent || that_present_column_parent) {
- if (!(this_present_column_parent && that_present_column_parent))
- return false;
- if (!this.column_parent.equals(that.column_parent))
- return false;
- }
-
- boolean this_present_column_slices = true && this.isSetColumn_slices();
- boolean that_present_column_slices = true && that.isSetColumn_slices();
- if (this_present_column_slices || that_present_column_slices) {
- if (!(this_present_column_slices && that_present_column_slices))
- return false;
- if (!this.column_slices.equals(that.column_slices))
- return false;
- }
-
- boolean this_present_reversed = true && this.isSetReversed();
- boolean that_present_reversed = true && that.isSetReversed();
- if (this_present_reversed || that_present_reversed) {
- if (!(this_present_reversed && that_present_reversed))
- return false;
- if (this.reversed != that.reversed)
- return false;
- }
-
- boolean this_present_count = true && this.isSetCount();
- boolean that_present_count = true && that.isSetCount();
- if (this_present_count || that_present_count) {
- if (!(this_present_count && that_present_count))
- return false;
- if (this.count != that.count)
- return false;
- }
-
- boolean this_present_consistency_level = true && this.isSetConsistency_level();
- boolean that_present_consistency_level = true && that.isSetConsistency_level();
- if (this_present_consistency_level || that_present_consistency_level) {
- if (!(this_present_consistency_level && that_present_consistency_level))
- return false;
- if (!this.consistency_level.equals(that.consistency_level))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- HashCodeBuilder builder = new HashCodeBuilder();
-
- boolean present_key = true && (isSetKey());
- builder.append(present_key);
- if (present_key)
- builder.append(key);
-
- boolean present_column_parent = true && (isSetColumn_parent());
- builder.append(present_column_parent);
- if (present_column_parent)
- builder.append(column_parent);
-
- boolean present_column_slices = true && (isSetColumn_slices());
- builder.append(present_column_slices);
- if (present_column_slices)
- builder.append(column_slices);
-
- boolean present_reversed = true && (isSetReversed());
- builder.append(present_reversed);
- if (present_reversed)
- builder.append(reversed);
-
- boolean present_count = true && (isSetCount());
- builder.append(present_count);
- if (present_count)
- builder.append(count);
-
- boolean present_consistency_level = true && (isSetConsistency_level());
- builder.append(present_consistency_level);
- if (present_consistency_level)
- builder.append(consistency_level.getValue());
-
- return builder.toHashCode();
- }
-
- @Override
- public int compareTo(MultiSliceRequest other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetKey()).compareTo(other.isSetKey());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetKey()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.key, other.key);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetColumn_parent()).compareTo(other.isSetColumn_parent());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetColumn_parent()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_parent, other.column_parent);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetColumn_slices()).compareTo(other.isSetColumn_slices());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetColumn_slices()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column_slices, other.column_slices);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetReversed()).compareTo(other.isSetReversed());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetReversed()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, other.reversed);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetCount()).compareTo(other.isSetCount());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetCount()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.count, other.count);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetConsistency_level()).compareTo(other.isSetConsistency_level());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetConsistency_level()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.consistency_level, other.consistency_level);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- return 0;
- }
-
- public _Fields fieldForId(int fieldId) {
- return _Fields.findByThriftId(fieldId);
- }
-
- public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
- schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
- schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder("MultiSliceRequest(");
- boolean first = true;
-
- if (isSetKey()) {
- sb.append("key:");
- if (this.key == null) {
- sb.append("null");
- } else {
- org.apache.thrift.TBaseHelper.toString(this.key, sb);
- }
- first = false;
- }
- if (isSetColumn_parent()) {
- if (!first) sb.append(", ");
- sb.append("column_parent:");
- if (this.column_parent == null) {
- sb.append("null");
- } else {
- sb.append(this.column_parent);
- }
- first = false;
- }
- if (isSetColumn_slices()) {
- if (!first) sb.append(", ");
- sb.append("column_slices:");
- if (this.column_slices == null) {
- sb.append("null");
- } else {
- sb.append(this.column_slices);
- }
- first = false;
- }
- if (isSetReversed()) {
- if (!first) sb.append(", ");
- sb.append("reversed:");
- sb.append(this.reversed);
- first = false;
- }
- if (isSetCount()) {
- if (!first) sb.append(", ");
- sb.append("count:");
- sb.append(this.count);
- first = false;
- }
- if (isSetConsistency_level()) {
- if (!first) sb.append(", ");
- sb.append("consistency_level:");
- if (this.consistency_level == null) {
- sb.append("null");
- } else {
- sb.append(this.consistency_level);
- }
- first = false;
- }
- sb.append(")");
- return sb.toString();
- }
-
- public void validate() throws org.apache.thrift.TException {
- // check for required fields
- // check for sub-struct validity
- if (column_parent != null) {
- column_parent.validate();
- }
- }
-
- 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_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 MultiSliceRequestStandardSchemeFactory implements SchemeFactory {
- public MultiSliceRequestStandardScheme getScheme() {
- return new MultiSliceRequestStandardScheme();
- }
- }
-
- private static class MultiSliceRequestStandardScheme extends StandardScheme<MultiSliceRequest> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, MultiSliceRequest 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: // KEY
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.key = iprot.readBinary();
- struct.setKeyIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // COLUMN_PARENT
- if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.column_parent = new ColumnParent();
- struct.column_parent.read(iprot);
- struct.setColumn_parentIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 3: // COLUMN_SLICES
- if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
- {
- org.apache.thrift.protocol.TList _list216 = iprot.readListBegin();
- struct.column_slices = new ArrayList<ColumnSlice>(_list216.size);
- for (int _i217 = 0; _i217 < _list216.size; ++_i217)
- {
- ColumnSlice _elem218;
- _elem218 = new ColumnSlice();
- _elem218.read(iprot);
- struct.column_slices.add(_elem218);
- }
- iprot.readListEnd();
- }
- struct.setColumn_slicesIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 4: // REVERSED
- if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.reversed = iprot.readBool();
- struct.setReversedIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 5: // COUNT
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.count = iprot.readI32();
- struct.setCountIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 6: // CONSISTENCY_LEVEL
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.consistency_level = ConsistencyLevel.findByValue(iprot.readI32());
- struct.setConsistency_levelIsSet(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();
-
- // check for required fields of primitive type, which can't be checked in the validate method
- struct.validate();
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot, MultiSliceRequest struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.key != null) {
- if (struct.isSetKey()) {
- oprot.writeFieldBegin(KEY_FIELD_DESC);
- oprot.writeBinary(struct.key);
- oprot.writeFieldEnd();
- }
- }
- if (struct.column_parent != null) {
- if (struct.isSetColumn_parent()) {
- oprot.writeFieldBegin(COLUMN_PARENT_FIELD_DESC);
- struct.column_parent.write(oprot);
- oprot.writeFieldEnd();
- }
- }
- if (struct.column_slices != null) {
- if (struct.isSetColumn_slices()) {
- oprot.writeFieldBegin(COLUMN_SLICES_FIELD_DESC);
- {
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.column_slices.size()));
- for (ColumnSlice _iter219 : struct.column_slices)
- {
- _iter219.write(oprot);
- }
- oprot.writeListEnd();
- }
- oprot.writeFieldEnd();
- }
- }
- if (struct.isSetReversed()) {
- oprot.writeFieldBegin(REVERSED_FIELD_DESC);
- oprot.writeBool(struct.reversed);
- oprot.writeFieldEnd();
- }
- if (struct.isSetCount()) {
- oprot.writeFieldBegin(COUNT_FIELD_DESC);
- oprot.writeI32(struct.count);
- oprot.writeFieldEnd();
- }
- if (struct.consistency_level != null) {
- if (struct.isSetConsistency_level()) {
- oprot.writeFieldBegin(CONSISTENCY_LEVEL_FIELD_DESC);
- oprot.writeI32(struct.consistency_level.getValue());
- oprot.writeFieldEnd();
- }
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class MultiSliceRequestTupleSchemeFactory implements SchemeFactory {
- public MultiSliceRequestTupleScheme getScheme() {
- return new MultiSliceRequestTupleScheme();
- }
- }
-
- private static class MultiSliceRequestTupleScheme extends TupleScheme<MultiSliceRequest> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, MultiSliceRequest struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- BitSet optionals = new BitSet();
- if (struct.isSetKey()) {
- optionals.set(0);
- }
- if (struct.isSetColumn_parent()) {
- optionals.set(1);
- }
- if (struct.isSetColumn_slices()) {
- optionals.set(2);
- }
- if (struct.isSetReversed()) {
- optionals.set(3);
- }
- if (struct.isSetCount()) {
- optionals.set(4);
- }
- if (struct.isSetConsistency_level()) {
- optionals.set(5);
- }
- oprot.writeBitSet(optionals, 6);
- if (struct.isSetKey()) {
- oprot.writeBinary(struct.key);
- }
- if (struct.isSetColumn_parent()) {
- struct.column_parent.write(oprot);
- }
- if (struct.isSetColumn_slices()) {
- {
- oprot.writeI32(struct.column_slices.size());
- for (ColumnSlice _iter220 : struct.column_slices)
- {
- _iter220.write(oprot);
- }
- }
- }
- if (struct.isSetReversed()) {
- oprot.writeBool(struct.reversed);
- }
- if (struct.isSetCount()) {
- oprot.writeI32(struct.count);
- }
- if (struct.isSetConsistency_level()) {
- oprot.writeI32(struct.consistency_level.getValue());
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, MultiSliceRequest struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(6);
- if (incoming.get(0)) {
- struct.key = iprot.readBinary();
- struct.setKeyIsSet(true);
- }
- if (incoming.get(1)) {
- struct.column_parent = new ColumnParent();
- struct.column_parent.read(iprot);
- struct.setColumn_parentIsSet(true);
- }
- if (incoming.get(2)) {
- {
- org.apache.thrift.protocol.TList _list221 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.column_slices = new ArrayList<ColumnSlice>(_list221.size);
- for (int _i222 = 0; _i222 < _list221.size; ++_i222)
- {
- ColumnSlice _elem223;
- _elem223 = new ColumnSlice();
- _elem223.read(iprot);
- struct.column_slices.add(_elem223);
- }
- }
- struct.setColumn_slicesIsSet(true);
- }
- if (incoming.get(3)) {
- struct.reversed = iprot.readBool();
- struct.setReversedIsSet(true);
- }
- if (incoming.get(4)) {
- struct.count = iprot.readI32();
- struct.setCountIsSet(true);
- }
- if (incoming.get(5)) {
- struct.consistency_level = ConsistencyLevel.findByValue(iprot.readI32());
- struct.setConsistency_levelIsSet(true);
- }
- }
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/interface/thrift/gen-java/org/apache/cassandra/thrift/cassandraConstants.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/cassandraConstants.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/cassandraConstants.java
index f84243e..d9f0008 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/cassandraConstants.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/cassandraConstants.java
@@ -56,6 +56,6 @@ import org.slf4j.LoggerFactory;
public class cassandraConstants {
- public static final String VERSION = "20.1.0";
+ public static final String VERSION = "20.0.0";
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index b558a13..e0f234e 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -1980,78 +1980,6 @@ public class CassandraServer implements Cassandra.Iface
}
}
- @Override
- public List<ColumnOrSuperColumn> get_multi_slice(MultiSliceRequest request)
- throws InvalidRequestException, UnavailableException, TimedOutException
- {
- if (startSessionIfRequested())
- {
- Map<String, String> traceParameters = ImmutableMap.of("key", ByteBufferUtil.bytesToHex(request.key),
- "column_parent", request.column_parent.toString(),
- "consistency_level", request.consistency_level.name(),
- "count", String.valueOf(request.count),
- "column_slices", request.column_slices.toString());
- Tracing.instance.begin("get_multi_slice", traceParameters);
- }
- else
- {
- logger.debug("get_multi_slice");
- }
- try
- {
- ClientState cState = state();
- String keyspace = cState.getKeyspace();
- state().hasColumnFamilyAccess(keyspace, request.getColumn_parent().column_family, Permission.SELECT);
- CFMetaData metadata = ThriftValidation.validateColumnFamily(keyspace, request.getColumn_parent().column_family);
- if (metadata.cfType == ColumnFamilyType.Super)
- throw new org.apache.cassandra.exceptions.InvalidRequestException("get_multi_slice does not support super columns");
- ThriftValidation.validateColumnParent(metadata, request.getColumn_parent());
- org.apache.cassandra.db.ConsistencyLevel consistencyLevel = ThriftConversion.fromThrift(request.getConsistency_level());
- consistencyLevel.validateForRead(keyspace);
- List<ReadCommand> commands = new ArrayList<>(1);
- ColumnSlice[] slices = new ColumnSlice[request.getColumn_slices().size()];
- for (int i = 0 ; i < request.getColumn_slices().size() ; i++)
- {
- fixOptionalSliceParameters(request.getColumn_slices().get(i));
- Composite start = metadata.comparator.fromByteBuffer(request.getColumn_slices().get(i).start);
- Composite finish = metadata.comparator.fromByteBuffer(request.getColumn_slices().get(i).finish);
- if (!start.isEmpty() && !finish.isEmpty())
- {
- int compare = metadata.comparator.compare(start, finish);
- if (!request.reversed && compare > 0)
- throw new InvalidRequestException(String.format("Column slice at index %d had start greater than finish", i));
- else if (request.reversed && compare < 0)
- throw new InvalidRequestException(String.format("Reversed column slice at index %d had start less than finish", i));
- }
- slices[i] = new ColumnSlice(start, finish);
- }
- ColumnSlice[] deoverlapped = ColumnSlice.deoverlapSlices(slices, request.reversed ? metadata.comparator.reverseComparator() : metadata.comparator);
- SliceQueryFilter filter = new SliceQueryFilter(deoverlapped, request.reversed, request.count);
- ThriftValidation.validateKey(metadata, request.key);
- commands.add(ReadCommand.create(keyspace, request.key, request.column_parent.getColumn_family(), System.currentTimeMillis(), filter));
- return getSlice(commands, request.column_parent.isSetSuper_column(), consistencyLevel, cState).entrySet().iterator().next().getValue();
- }
- catch (RequestValidationException e)
- {
- throw ThriftConversion.toThrift(e);
- }
- finally
- {
- Tracing.instance.stopSession();
- }
- }
-
- /**
- * Set the to start-of end-of value of "" for start and finish.
- * @param columnSlice
- */
- private static void fixOptionalSliceParameters(org.apache.cassandra.thrift.ColumnSlice columnSlice) {
- if (!columnSlice.isSetStart())
- columnSlice.setStart(new byte[0]);
- if (!columnSlice.isSetFinish())
- columnSlice.setFinish(new byte[0]);
- }
-
/*
* No-op since 3.0.
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 60fb195..dafe3b3 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -43,11 +43,6 @@ import java.util.concurrent.TimeUnit;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
-
-import org.apache.cassandra.db.index.PerRowSecondaryIndexTest;
-import org.apache.cassandra.io.sstable.*;
-import org.apache.cassandra.io.sstable.format.SSTableReader;
-import org.apache.cassandra.io.sstable.format.SSTableWriter;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.BeforeClass;
@@ -57,7 +52,12 @@ import org.junit.runner.RunWith;
import org.apache.cassandra.OrderedJUnit4ClassRunner;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
-import org.apache.cassandra.config.*;
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.ColumnDefinition;
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.config.IndexType;
+import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.config.Schema;
import org.apache.cassandra.cql3.Operator;
import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
import org.apache.cassandra.db.composites.CellName;
@@ -69,6 +69,7 @@ import org.apache.cassandra.db.filter.IDiskAtomFilter;
import org.apache.cassandra.db.filter.NamesQueryFilter;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.filter.SliceQueryFilter;
+import org.apache.cassandra.db.index.PerRowSecondaryIndexTest;
import org.apache.cassandra.db.index.SecondaryIndex;
import org.apache.cassandra.db.marshal.IntegerType;
import org.apache.cassandra.db.marshal.LexicalUUIDType;
@@ -80,6 +81,12 @@ import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.IncludingExcludingBounds;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.io.sstable.Component;
+import org.apache.cassandra.io.sstable.Descriptor;
+import org.apache.cassandra.io.sstable.SSTableDeletingTask;
+import org.apache.cassandra.io.sstable.SSTableSimpleWriter;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
+import org.apache.cassandra.io.sstable.format.SSTableWriter;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.locator.SimpleStrategy;
@@ -93,7 +100,6 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.WrappedRunnable;
-import org.apache.thrift.TException;
import static org.apache.cassandra.Util.cellname;
import static org.apache.cassandra.Util.column;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/thrift/MultiSliceTest.java b/test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
deleted file mode 100644
index 9716876..0000000
--- a/test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * 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
- *
- * 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.
- */
-package org.apache.cassandra.thrift;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.config.KSMetaData;
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.locator.SimpleStrategy;
-import org.apache.cassandra.service.EmbeddedCassandraService;
-import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.thrift.TException;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class MultiSliceTest
-{
- private static CassandraServer server;
- public static final String KEYSPACE1 = "MultiSliceTest";
- public static final String CF_STANDARD = "Standard1";
-
- @BeforeClass
- public static void defineSchema() throws ConfigurationException, IOException, TException
- {
- SchemaLoader.prepareServer();
- new EmbeddedCassandraService().start();
- ThriftSessionManager.instance.setCurrentSocket(new InetSocketAddress(9160));
- SchemaLoader.createKeyspace(KEYSPACE1,
- SimpleStrategy.class,
- KSMetaData.optsWithRF(1),
- SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD));
- server = new CassandraServer();
- server.set_keyspace(KEYSPACE1);
- }
-
- private static MultiSliceRequest makeMultiSliceRequest(ByteBuffer key)
- {
- ColumnParent cp = new ColumnParent("Standard1");
- MultiSliceRequest req = new MultiSliceRequest();
- req.setKey(key);
- req.setCount(1000);
- req.reversed = false;
- req.setColumn_parent(cp);
- return req;
- }
-
- @Test
- public void test_multi_slice_optional_column_slice() throws TException
- {
- ColumnParent cp = new ColumnParent("Standard1");
- ByteBuffer key = ByteBuffer.wrap("multi_slice".getBytes());
- List<String> expected = new ArrayList<String>();
- for (char a = 'a'; a <= 'z'; a++)
- expected.add(a + "");
-
- addTheAlphabetToRow(key, cp);
- MultiSliceRequest req = makeMultiSliceRequest(key);
- req.setColumn_slices(new ArrayList<ColumnSlice>());
- req.getColumn_slices().add(new ColumnSlice());
- List<ColumnOrSuperColumn> list = server.get_multi_slice(req);
- assertColumnNameMatches(expected, list);
- }
-
- @Test
- public void test_multi_slice() throws TException
- {
- ColumnParent cp = new ColumnParent("Standard1");
- ByteBuffer key = ByteBuffer.wrap("multi_slice_two_slice".getBytes());
- addTheAlphabetToRow(key, cp);
- MultiSliceRequest req = makeMultiSliceRequest(key);
- req.setColumn_slices(Arrays.asList(columnSliceFrom("a", "e"), columnSliceFrom("i", "n")));
- assertColumnNameMatches(Arrays.asList("a", "b", "c", "d", "e", "i", "j", "k" , "l", "m" , "n"), server.get_multi_slice(req));
- }
-
- @Test
- public void test_with_overlap() throws TException
- {
- ColumnParent cp = new ColumnParent("Standard1");
- ByteBuffer key = ByteBuffer.wrap("overlap".getBytes());
- addTheAlphabetToRow(key, cp);
- MultiSliceRequest req = makeMultiSliceRequest(key);
- req.setColumn_slices(Arrays.asList(columnSliceFrom("a", "e"), columnSliceFrom("d", "g")));
- assertColumnNameMatches(Arrays.asList("a", "b", "c", "d", "e", "f", "g"), server.get_multi_slice(req));
- }
-
- @Test
- public void test_with_overlap_reversed() throws TException
- {
- ColumnParent cp = new ColumnParent("Standard1");
- ByteBuffer key = ByteBuffer.wrap("overlap_reversed".getBytes());
- addTheAlphabetToRow(key, cp);
- MultiSliceRequest req = makeMultiSliceRequest(key);
- req.reversed = true;
- req.setColumn_slices(Arrays.asList(columnSliceFrom("e", "a"), columnSliceFrom("g", "d")));
- assertColumnNameMatches(Arrays.asList("g", "f", "e", "d", "c", "b", "a"), server.get_multi_slice(req));
- }
-
- @Test(expected=InvalidRequestException.class)
- public void test_that_column_slice_is_proper() throws TException
- {
- ByteBuffer key = ByteBuffer.wrap("overlap".getBytes());
- MultiSliceRequest req = makeMultiSliceRequest(key);
- req.reversed = true;
- req.setColumn_slices(Arrays.asList(columnSliceFrom("a", "e"), columnSliceFrom("g", "d")));
- assertColumnNameMatches(Arrays.asList("a", "b", "c", "d", "e", "f", "g"), server.get_multi_slice(req));
- }
-
- @Test
- public void test_with_overlap_reversed_with_count() throws TException
- {
- ColumnParent cp = new ColumnParent("Standard1");
- ByteBuffer key = ByteBuffer.wrap("overlap_reversed_count".getBytes());
- addTheAlphabetToRow(key, cp);
- MultiSliceRequest req = makeMultiSliceRequest(key);
- req.setCount(6);
- req.reversed = true;
- req.setColumn_slices(Arrays.asList(columnSliceFrom("e", "a"), columnSliceFrom("g", "d")));
- assertColumnNameMatches(Arrays.asList("g", "f", "e", "d", "c", "b"), server.get_multi_slice(req));
- }
-
- @Test
- public void test_with_overlap_with_count() throws TException
- {
- ColumnParent cp = new ColumnParent("Standard1");
- ByteBuffer key = ByteBuffer.wrap("overlap_reversed_count".getBytes());
- addTheAlphabetToRow(key, cp);
- MultiSliceRequest req = makeMultiSliceRequest(key);
- req.setCount(6);
- req.setColumn_slices(Arrays.asList(columnSliceFrom("a", "e"), columnSliceFrom("d", "g"), columnSliceFrom("d", "g")));
- assertColumnNameMatches(Arrays.asList("a", "b", "c", "d", "e", "f"), server.get_multi_slice(req));
- }
-
- private static void addTheAlphabetToRow(ByteBuffer key, ColumnParent parent)
- throws InvalidRequestException, UnavailableException, TimedOutException
- {
- for (char a = 'a'; a <= 'z'; a++) {
- Column c1 = new Column();
- c1.setName(ByteBufferUtil.bytes(String.valueOf(a)));
- c1.setValue(new byte [0]);
- c1.setTimestamp(System.nanoTime());
- server.insert(key, parent, c1, ConsistencyLevel.ONE);
- }
- }
-
- private static void assertColumnNameMatches(List<String> expected , List<ColumnOrSuperColumn> actual)
- {
- Assert.assertEquals(actual+" "+expected +" did not have same number of elements", actual.size(), expected.size());
- for (int i = 0 ; i< expected.size() ; i++)
- {
- Assert.assertEquals(actual.get(i) +" did not equal "+ expected.get(i),
- expected.get(i), new String(actual.get(i).getColumn().getName()));
- }
- }
-
- private ColumnSlice columnSliceFrom(String startInclusive, String endInclusive)
- {
- ColumnSlice cs = new ColumnSlice();
- cs.setStart(ByteBufferUtil.bytes(startInclusive));
- cs.setFinish(ByteBufferUtil.bytes(endInclusive));
- return cs;
- }
-}
[2/3] cassandra git commit: Revert "add Thrift get_multi_slice call"
Posted by jb...@apache.org.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
----------------------------------------------------------------------
diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
index bf15559..f29805b 100644
--- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
+++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
@@ -248,13 +248,6 @@ public class Cassandra {
public void truncate(String cfname) throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException;
/**
- * Select multiple slices of a key in a single RPC operation
- *
- * @param request
- */
- public List<ColumnOrSuperColumn> get_multi_slice(MultiSliceRequest request) throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException;
-
- /**
* for each schema version present in the cluster, returns a list of nodes at that version.
* hosts that do not respond will be under the key DatabaseDescriptor.INITIAL_VERSION.
* the cluster is all on the same version if the size of the map is 1.
@@ -487,8 +480,6 @@ public class Cassandra {
public void truncate(String cfname, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void get_multi_slice(MultiSliceRequest request, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
-
public void describe_schema_versions(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void describe_keyspaces(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -1147,38 +1138,6 @@ public class Cassandra {
return;
}
- public List<ColumnOrSuperColumn> get_multi_slice(MultiSliceRequest request) throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException
- {
- send_get_multi_slice(request);
- return recv_get_multi_slice();
- }
-
- public void send_get_multi_slice(MultiSliceRequest request) throws org.apache.thrift.TException
- {
- get_multi_slice_args args = new get_multi_slice_args();
- args.setRequest(request);
- sendBase("get_multi_slice", args);
- }
-
- public List<ColumnOrSuperColumn> recv_get_multi_slice() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException
- {
- get_multi_slice_result result = new get_multi_slice_result();
- receiveBase(result, "get_multi_slice");
- if (result.isSetSuccess()) {
- return result.success;
- }
- if (result.ire != null) {
- throw result.ire;
- }
- if (result.ue != null) {
- throw result.ue;
- }
- if (result.te != null) {
- throw result.te;
- }
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get_multi_slice failed: unknown result");
- }
-
public Map<String,List<String>> describe_schema_versions() throws InvalidRequestException, org.apache.thrift.TException
{
send_describe_schema_versions();
@@ -2617,38 +2576,6 @@ public class Cassandra {
}
}
- public void get_multi_slice(MultiSliceRequest request, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
- checkReady();
- get_multi_slice_call method_call = new get_multi_slice_call(request, resultHandler, this, ___protocolFactory, ___transport);
- this.___currentMethod = method_call;
- ___manager.call(method_call);
- }
-
- public static class get_multi_slice_call extends org.apache.thrift.async.TAsyncMethodCall {
- private MultiSliceRequest request;
- public get_multi_slice_call(MultiSliceRequest request, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
- super(client, protocolFactory, transport, resultHandler, false);
- this.request = request;
- }
-
- public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get_multi_slice", org.apache.thrift.protocol.TMessageType.CALL, 0));
- get_multi_slice_args args = new get_multi_slice_args();
- args.setRequest(request);
- args.write(prot);
- prot.writeMessageEnd();
- }
-
- public List<ColumnOrSuperColumn> getResult() throws InvalidRequestException, UnavailableException, TimedOutException, org.apache.thrift.TException {
- if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
- throw new IllegalStateException("Method call not finished!");
- }
- org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
- org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
- return (new Client(prot)).recv_get_multi_slice();
- }
- }
-
public void describe_schema_versions(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
describe_schema_versions_call method_call = new describe_schema_versions_call(resultHandler, this, ___protocolFactory, ___transport);
@@ -3530,7 +3457,6 @@ public class Cassandra {
processMap.put("batch_mutate", new batch_mutate());
processMap.put("atomic_batch_mutate", new atomic_batch_mutate());
processMap.put("truncate", new truncate());
- processMap.put("get_multi_slice", new get_multi_slice());
processMap.put("describe_schema_versions", new describe_schema_versions());
processMap.put("describe_keyspaces", new describe_keyspaces());
processMap.put("describe_cluster_name", new describe_cluster_name());
@@ -4061,34 +3987,6 @@ public class Cassandra {
}
}
- public static class get_multi_slice<I extends Iface> extends org.apache.thrift.ProcessFunction<I, get_multi_slice_args> {
- public get_multi_slice() {
- super("get_multi_slice");
- }
-
- public get_multi_slice_args getEmptyArgsInstance() {
- return new get_multi_slice_args();
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public get_multi_slice_result getResult(I iface, get_multi_slice_args args) throws org.apache.thrift.TException {
- get_multi_slice_result result = new get_multi_slice_result();
- try {
- result.success = iface.get_multi_slice(args.request);
- } catch (InvalidRequestException ire) {
- result.ire = ire;
- } catch (UnavailableException ue) {
- result.ue = ue;
- } catch (TimedOutException te) {
- result.te = te;
- }
- return result;
- }
- }
-
public static class describe_schema_versions<I extends Iface> extends org.apache.thrift.ProcessFunction<I, describe_schema_versions_args> {
public describe_schema_versions() {
super("describe_schema_versions");
@@ -4762,7 +4660,6 @@ public class Cassandra {
processMap.put("batch_mutate", new batch_mutate());
processMap.put("atomic_batch_mutate", new atomic_batch_mutate());
processMap.put("truncate", new truncate());
- processMap.put("get_multi_slice", new get_multi_slice());
processMap.put("describe_schema_versions", new describe_schema_versions());
processMap.put("describe_keyspaces", new describe_keyspaces());
processMap.put("describe_cluster_name", new describe_cluster_name());
@@ -5980,20 +5877,20 @@ public class Cassandra {
}
}
- public static class get_multi_slice<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, get_multi_slice_args, List<ColumnOrSuperColumn>> {
- public get_multi_slice() {
- super("get_multi_slice");
+ public static class describe_schema_versions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, describe_schema_versions_args, Map<String,List<String>>> {
+ public describe_schema_versions() {
+ super("describe_schema_versions");
}
- public get_multi_slice_args getEmptyArgsInstance() {
- return new get_multi_slice_args();
+ public describe_schema_versions_args getEmptyArgsInstance() {
+ return new describe_schema_versions_args();
}
- public AsyncMethodCallback<List<ColumnOrSuperColumn>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<Map<String,List<String>>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<ColumnOrSuperColumn>>() {
- public void onComplete(List<ColumnOrSuperColumn> o) {
- get_multi_slice_result result = new get_multi_slice_result();
+ return new AsyncMethodCallback<Map<String,List<String>>>() {
+ public void onComplete(Map<String,List<String>> o) {
+ describe_schema_versions_result result = new describe_schema_versions_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -6006,20 +5903,67 @@ public class Cassandra {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- get_multi_slice_result result = new get_multi_slice_result();
+ describe_schema_versions_result result = new describe_schema_versions_result();
if (e instanceof InvalidRequestException) {
result.ire = (InvalidRequestException) e;
result.setIreIsSet(true);
msg = result;
}
- else if (e instanceof UnavailableException) {
- result.ue = (UnavailableException) e;
- result.setUeIsSet(true);
- msg = result;
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
}
- else if (e instanceof TimedOutException) {
- result.te = (TimedOutException) e;
- result.setTeIsSet(true);
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, describe_schema_versions_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,List<String>>> resultHandler) throws TException {
+ iface.describe_schema_versions(resultHandler);
+ }
+ }
+
+ public static class describe_keyspaces<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, describe_keyspaces_args, List<KsDef>> {
+ public describe_keyspaces() {
+ super("describe_keyspaces");
+ }
+
+ public describe_keyspaces_args getEmptyArgsInstance() {
+ return new describe_keyspaces_args();
+ }
+
+ public AsyncMethodCallback<List<KsDef>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<List<KsDef>>() {
+ public void onComplete(List<KsDef> o) {
+ describe_keyspaces_result result = new describe_keyspaces_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ describe_keyspaces_result result = new describe_keyspaces_result();
+ if (e instanceof InvalidRequestException) {
+ result.ire = (InvalidRequestException) e;
+ result.setIreIsSet(true);
msg = result;
}
else
@@ -6042,25 +5986,25 @@ public class Cassandra {
return false;
}
- public void start(I iface, get_multi_slice_args args, org.apache.thrift.async.AsyncMethodCallback<List<ColumnOrSuperColumn>> resultHandler) throws TException {
- iface.get_multi_slice(args.request,resultHandler);
+ public void start(I iface, describe_keyspaces_args args, org.apache.thrift.async.AsyncMethodCallback<List<KsDef>> resultHandler) throws TException {
+ iface.describe_keyspaces(resultHandler);
}
}
- public static class describe_schema_versions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, describe_schema_versions_args, Map<String,List<String>>> {
- public describe_schema_versions() {
- super("describe_schema_versions");
+ public static class describe_cluster_name<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, describe_cluster_name_args, String> {
+ public describe_cluster_name() {
+ super("describe_cluster_name");
}
- public describe_schema_versions_args getEmptyArgsInstance() {
- return new describe_schema_versions_args();
+ public describe_cluster_name_args getEmptyArgsInstance() {
+ return new describe_cluster_name_args();
}
- public AsyncMethodCallback<Map<String,List<String>>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Map<String,List<String>>>() {
- public void onComplete(Map<String,List<String>> o) {
- describe_schema_versions_result result = new describe_schema_versions_result();
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ describe_cluster_name_result result = new describe_cluster_name_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -6073,223 +6017,109 @@ public class Cassandra {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- describe_schema_versions_result result = new describe_schema_versions_result();
- if (e instanceof InvalidRequestException) {
- result.ire = (InvalidRequestException) e;
- result.setIreIsSet(true);
- msg = result;
- }
- else
- {
- msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
- msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
- }
- try {
- fcall.sendResponse(fb,msg,msgType,seqid);
- return;
- } catch (Exception ex) {
- LOGGER.error("Exception writing to internal frame buffer", ex);
- }
- fb.close();
- }
- };
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public void start(I iface, describe_schema_versions_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,List<String>>> resultHandler) throws TException {
- iface.describe_schema_versions(resultHandler);
- }
- }
-
- public static class describe_keyspaces<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, describe_keyspaces_args, List<KsDef>> {
- public describe_keyspaces() {
- super("describe_keyspaces");
- }
-
- public describe_keyspaces_args getEmptyArgsInstance() {
- return new describe_keyspaces_args();
- }
-
- public AsyncMethodCallback<List<KsDef>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<KsDef>>() {
- public void onComplete(List<KsDef> o) {
- describe_keyspaces_result result = new describe_keyspaces_result();
- result.success = o;
- try {
- fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
- return;
- } catch (Exception e) {
- LOGGER.error("Exception writing to internal frame buffer", e);
- }
- fb.close();
- }
- public void onError(Exception e) {
- byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
- org.apache.thrift.TBase msg;
- describe_keyspaces_result result = new describe_keyspaces_result();
- if (e instanceof InvalidRequestException) {
- result.ire = (InvalidRequestException) e;
- result.setIreIsSet(true);
- msg = result;
- }
- else
- {
- msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
- msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
- }
- try {
- fcall.sendResponse(fb,msg,msgType,seqid);
- return;
- } catch (Exception ex) {
- LOGGER.error("Exception writing to internal frame buffer", ex);
- }
- fb.close();
- }
- };
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public void start(I iface, describe_keyspaces_args args, org.apache.thrift.async.AsyncMethodCallback<List<KsDef>> resultHandler) throws TException {
- iface.describe_keyspaces(resultHandler);
- }
- }
-
- public static class describe_cluster_name<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, describe_cluster_name_args, String> {
- public describe_cluster_name() {
- super("describe_cluster_name");
- }
-
- public describe_cluster_name_args getEmptyArgsInstance() {
- return new describe_cluster_name_args();
- }
-
- public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<String>() {
- public void onComplete(String o) {
- describe_cluster_name_result result = new describe_cluster_name_result();
- result.success = o;
- try {
- fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
- return;
- } catch (Exception e) {
- LOGGER.error("Exception writing to internal frame buffer", e);
- }
- fb.close();
- }
- public void onError(Exception e) {
- byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
- org.apache.thrift.TBase msg;
- describe_cluster_name_result result = new describe_cluster_name_result();
- {
- msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
- msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
- }
- try {
- fcall.sendResponse(fb,msg,msgType,seqid);
- return;
- } catch (Exception ex) {
- LOGGER.error("Exception writing to internal frame buffer", ex);
- }
- fb.close();
- }
- };
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public void start(I iface, describe_cluster_name_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.describe_cluster_name(resultHandler);
- }
- }
-
- public static class describe_version<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, describe_version_args, String> {
- public describe_version() {
- super("describe_version");
- }
-
- public describe_version_args getEmptyArgsInstance() {
- return new describe_version_args();
- }
-
- public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<String>() {
- public void onComplete(String o) {
- describe_version_result result = new describe_version_result();
- result.success = o;
- try {
- fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
- return;
- } catch (Exception e) {
- LOGGER.error("Exception writing to internal frame buffer", e);
- }
- fb.close();
- }
- public void onError(Exception e) {
- byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
- org.apache.thrift.TBase msg;
- describe_version_result result = new describe_version_result();
- {
- msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
- msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
- }
- try {
- fcall.sendResponse(fb,msg,msgType,seqid);
- return;
- } catch (Exception ex) {
- LOGGER.error("Exception writing to internal frame buffer", ex);
- }
- fb.close();
- }
- };
- }
-
- protected boolean isOneway() {
- return false;
- }
-
- public void start(I iface, describe_version_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
- iface.describe_version(resultHandler);
- }
- }
-
- public static class describe_ring<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, describe_ring_args, List<TokenRange>> {
- public describe_ring() {
- super("describe_ring");
- }
-
- public describe_ring_args getEmptyArgsInstance() {
- return new describe_ring_args();
- }
-
- public AsyncMethodCallback<List<TokenRange>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
- final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<TokenRange>>() {
- public void onComplete(List<TokenRange> o) {
- describe_ring_result result = new describe_ring_result();
- result.success = o;
- try {
- fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
- return;
- } catch (Exception e) {
- LOGGER.error("Exception writing to internal frame buffer", e);
- }
- fb.close();
- }
- public void onError(Exception e) {
- byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
- org.apache.thrift.TBase msg;
- describe_ring_result result = new describe_ring_result();
+ describe_cluster_name_result result = new describe_cluster_name_result();
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, describe_cluster_name_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.describe_cluster_name(resultHandler);
+ }
+ }
+
+ public static class describe_version<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, describe_version_args, String> {
+ public describe_version() {
+ super("describe_version");
+ }
+
+ public describe_version_args getEmptyArgsInstance() {
+ return new describe_version_args();
+ }
+
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ describe_version_result result = new describe_version_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ describe_version_result result = new describe_version_result();
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, describe_version_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.describe_version(resultHandler);
+ }
+ }
+
+ public static class describe_ring<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, describe_ring_args, List<TokenRange>> {
+ public describe_ring() {
+ super("describe_ring");
+ }
+
+ public describe_ring_args getEmptyArgsInstance() {
+ return new describe_ring_args();
+ }
+
+ public AsyncMethodCallback<List<TokenRange>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<List<TokenRange>>() {
+ public void onComplete(List<TokenRange> o) {
+ describe_ring_result result = new describe_ring_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ describe_ring_result result = new describe_ring_result();
if (e instanceof InvalidRequestException) {
result.ire = (InvalidRequestException) e;
result.setIreIsSet(true);
@@ -11785,14 +11615,14 @@ public class Cassandra {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list224 = iprot.readListBegin();
- struct.success = new ArrayList<ColumnOrSuperColumn>(_list224.size);
- for (int _i225 = 0; _i225 < _list224.size; ++_i225)
+ org.apache.thrift.protocol.TList _list216 = iprot.readListBegin();
+ struct.success = new ArrayList<ColumnOrSuperColumn>(_list216.size);
+ for (int _i217 = 0; _i217 < _list216.size; ++_i217)
{
- ColumnOrSuperColumn _elem226;
- _elem226 = new ColumnOrSuperColumn();
- _elem226.read(iprot);
- struct.success.add(_elem226);
+ ColumnOrSuperColumn _elem218;
+ _elem218 = new ColumnOrSuperColumn();
+ _elem218.read(iprot);
+ struct.success.add(_elem218);
}
iprot.readListEnd();
}
@@ -11847,9 +11677,9 @@ public class Cassandra {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
- for (ColumnOrSuperColumn _iter227 : struct.success)
+ for (ColumnOrSuperColumn _iter219 : struct.success)
{
- _iter227.write(oprot);
+ _iter219.write(oprot);
}
oprot.writeListEnd();
}
@@ -11904,9 +11734,9 @@ public class Cassandra {
if (struct.isSetSuccess()) {
{
oprot.writeI32(struct.success.size());
- for (ColumnOrSuperColumn _iter228 : struct.success)
+ for (ColumnOrSuperColumn _iter220 : struct.success)
{
- _iter228.write(oprot);
+ _iter220.write(oprot);
}
}
}
@@ -11927,14 +11757,14 @@ public class Cassandra {
BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list229 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.success = new ArrayList<ColumnOrSuperColumn>(_list229.size);
- for (int _i230 = 0; _i230 < _list229.size; ++_i230)
+ org.apache.thrift.protocol.TList _list221 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.success = new ArrayList<ColumnOrSuperColumn>(_list221.size);
+ for (int _i222 = 0; _i222 < _list221.size; ++_i222)
{
- ColumnOrSuperColumn _elem231;
- _elem231 = new ColumnOrSuperColumn();
- _elem231.read(iprot);
- struct.success.add(_elem231);
+ ColumnOrSuperColumn _elem223;
+ _elem223 = new ColumnOrSuperColumn();
+ _elem223.read(iprot);
+ struct.success.add(_elem223);
}
}
struct.setSuccessIsSet(true);
@@ -13934,13 +13764,13 @@ public class Cassandra {
case 1: // KEYS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list232 = iprot.readListBegin();
- struct.keys = new ArrayList<ByteBuffer>(_list232.size);
- for (int _i233 = 0; _i233 < _list232.size; ++_i233)
+ org.apache.thrift.protocol.TList _list224 = iprot.readListBegin();
+ struct.keys = new ArrayList<ByteBuffer>(_list224.size);
+ for (int _i225 = 0; _i225 < _list224.size; ++_i225)
{
- ByteBuffer _elem234;
- _elem234 = iprot.readBinary();
- struct.keys.add(_elem234);
+ ByteBuffer _elem226;
+ _elem226 = iprot.readBinary();
+ struct.keys.add(_elem226);
}
iprot.readListEnd();
}
@@ -13994,9 +13824,9 @@ public class Cassandra {
oprot.writeFieldBegin(KEYS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.keys.size()));
- for (ByteBuffer _iter235 : struct.keys)
+ for (ByteBuffer _iter227 : struct.keys)
{
- oprot.writeBinary(_iter235);
+ oprot.writeBinary(_iter227);
}
oprot.writeListEnd();
}
@@ -14036,9 +13866,9 @@ public class Cassandra {
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.keys.size());
- for (ByteBuffer _iter236 : struct.keys)
+ for (ByteBuffer _iter228 : struct.keys)
{
- oprot.writeBinary(_iter236);
+ oprot.writeBinary(_iter228);
}
}
struct.column_parent.write(oprot);
@@ -14050,13 +13880,13 @@ public class Cassandra {
public void read(org.apache.thrift.protocol.TProtocol prot, multiget_slice_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TList _list237 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.keys = new ArrayList<ByteBuffer>(_list237.size);
- for (int _i238 = 0; _i238 < _list237.size; ++_i238)
+ org.apache.thrift.protocol.TList _list229 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.keys = new ArrayList<ByteBuffer>(_list229.size);
+ for (int _i230 = 0; _i230 < _list229.size; ++_i230)
{
- ByteBuffer _elem239;
- _elem239 = iprot.readBinary();
- struct.keys.add(_elem239);
+ ByteBuffer _elem231;
+ _elem231 = iprot.readBinary();
+ struct.keys.add(_elem231);
}
}
struct.setKeysIsSet(true);
@@ -14645,26 +14475,26 @@ public class Cassandra {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map240 = iprot.readMapBegin();
- struct.success = new HashMap<ByteBuffer,List<ColumnOrSuperColumn>>(2*_map240.size);
- for (int _i241 = 0; _i241 < _map240.size; ++_i241)
+ org.apache.thrift.protocol.TMap _map232 = iprot.readMapBegin();
+ struct.success = new HashMap<ByteBuffer,List<ColumnOrSuperColumn>>(2*_map232.size);
+ for (int _i233 = 0; _i233 < _map232.size; ++_i233)
{
- ByteBuffer _key242;
- List<ColumnOrSuperColumn> _val243;
- _key242 = iprot.readBinary();
+ ByteBuffer _key234;
+ List<ColumnOrSuperColumn> _val235;
+ _key234 = iprot.readBinary();
{
- org.apache.thrift.protocol.TList _list244 = iprot.readListBegin();
- _val243 = new ArrayList<ColumnOrSuperColumn>(_list244.size);
- for (int _i245 = 0; _i245 < _list244.size; ++_i245)
+ org.apache.thrift.protocol.TList _list236 = iprot.readListBegin();
+ _val235 = new ArrayList<ColumnOrSuperColumn>(_list236.size);
+ for (int _i237 = 0; _i237 < _list236.size; ++_i237)
{
- ColumnOrSuperColumn _elem246;
- _elem246 = new ColumnOrSuperColumn();
- _elem246.read(iprot);
- _val243.add(_elem246);
+ ColumnOrSuperColumn _elem238;
+ _elem238 = new ColumnOrSuperColumn();
+ _elem238.read(iprot);
+ _val235.add(_elem238);
}
iprot.readListEnd();
}
- struct.success.put(_key242, _val243);
+ struct.success.put(_key234, _val235);
}
iprot.readMapEnd();
}
@@ -14719,14 +14549,14 @@ public class Cassandra {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.success.size()));
- for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> _iter247 : struct.success.entrySet())
+ for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> _iter239 : struct.success.entrySet())
{
- oprot.writeBinary(_iter247.getKey());
+ oprot.writeBinary(_iter239.getKey());
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter247.getValue().size()));
- for (ColumnOrSuperColumn _iter248 : _iter247.getValue())
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter239.getValue().size()));
+ for (ColumnOrSuperColumn _iter240 : _iter239.getValue())
{
- _iter248.write(oprot);
+ _iter240.write(oprot);
}
oprot.writeListEnd();
}
@@ -14784,14 +14614,14 @@ public class Cassandra {
if (struct.isSetSuccess()) {
{
oprot.writeI32(struct.success.size());
- for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> _iter249 : struct.success.entrySet())
+ for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> _iter241 : struct.success.entrySet())
{
- oprot.writeBinary(_iter249.getKey());
+ oprot.writeBinary(_iter241.getKey());
{
- oprot.writeI32(_iter249.getValue().size());
- for (ColumnOrSuperColumn _iter250 : _iter249.getValue())
+ oprot.writeI32(_iter241.getValue().size());
+ for (ColumnOrSuperColumn _iter242 : _iter241.getValue())
{
- _iter250.write(oprot);
+ _iter242.write(oprot);
}
}
}
@@ -14814,25 +14644,25 @@ public class Cassandra {
BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map251 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
- struct.success = new HashMap<ByteBuffer,List<ColumnOrSuperColumn>>(2*_map251.size);
- for (int _i252 = 0; _i252 < _map251.size; ++_i252)
+ org.apache.thrift.protocol.TMap _map243 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+ struct.success = new HashMap<ByteBuffer,List<ColumnOrSuperColumn>>(2*_map243.size);
+ for (int _i244 = 0; _i244 < _map243.size; ++_i244)
{
- ByteBuffer _key253;
- List<ColumnOrSuperColumn> _val254;
- _key253 = iprot.readBinary();
+ ByteBuffer _key245;
+ List<ColumnOrSuperColumn> _val246;
+ _key245 = iprot.readBinary();
{
- org.apache.thrift.protocol.TList _list255 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- _val254 = new ArrayList<ColumnOrSuperColumn>(_list255.size);
- for (int _i256 = 0; _i256 < _list255.size; ++_i256)
+ org.apache.thrift.protocol.TList _list247 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ _val246 = new ArrayList<ColumnOrSuperColumn>(_list247.size);
+ for (int _i248 = 0; _i248 < _list247.size; ++_i248)
{
- ColumnOrSuperColumn _elem257;
- _elem257 = new ColumnOrSuperColumn();
- _elem257.read(iprot);
- _val254.add(_elem257);
+ ColumnOrSuperColumn _elem249;
+ _elem249 = new ColumnOrSuperColumn();
+ _elem249.read(iprot);
+ _val246.add(_elem249);
}
}
- struct.success.put(_key253, _val254);
+ struct.success.put(_key245, _val246);
}
}
struct.setSuccessIsSet(true);
@@ -15453,13 +15283,13 @@ public class Cassandra {
case 1: // KEYS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list258 = iprot.readListBegin();
- struct.keys = new ArrayList<ByteBuffer>(_list258.size);
- for (int _i259 = 0; _i259 < _list258.size; ++_i259)
+ org.apache.thrift.protocol.TList _list250 = iprot.readListBegin();
+ struct.keys = new ArrayList<ByteBuffer>(_list250.size);
+ for (int _i251 = 0; _i251 < _list250.size; ++_i251)
{
- ByteBuffer _elem260;
- _elem260 = iprot.readBinary();
- struct.keys.add(_elem260);
+ ByteBuffer _elem252;
+ _elem252 = iprot.readBinary();
+ struct.keys.add(_elem252);
}
iprot.readListEnd();
}
@@ -15513,9 +15343,9 @@ public class Cassandra {
oprot.writeFieldBegin(KEYS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.keys.size()));
- for (ByteBuffer _iter261 : struct.keys)
+ for (ByteBuffer _iter253 : struct.keys)
{
- oprot.writeBinary(_iter261);
+ oprot.writeBinary(_iter253);
}
oprot.writeListEnd();
}
@@ -15555,9 +15385,9 @@ public class Cassandra {
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.keys.size());
- for (ByteBuffer _iter262 : struct.keys)
+ for (ByteBuffer _iter254 : struct.keys)
{
- oprot.writeBinary(_iter262);
+ oprot.writeBinary(_iter254);
}
}
struct.column_parent.write(oprot);
@@ -15569,13 +15399,13 @@ public class Cassandra {
public void read(org.apache.thrift.protocol.TProtocol prot, multiget_count_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TList _list263 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.keys = new ArrayList<ByteBuffer>(_list263.size);
- for (int _i264 = 0; _i264 < _list263.size; ++_i264)
+ org.apache.thrift.protocol.TList _list255 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.keys = new ArrayList<ByteBuffer>(_list255.size);
+ for (int _i256 = 0; _i256 < _list255.size; ++_i256)
{
- ByteBuffer _elem265;
- _elem265 = iprot.readBinary();
- struct.keys.add(_elem265);
+ ByteBuffer _elem257;
+ _elem257 = iprot.readBinary();
+ struct.keys.add(_elem257);
}
}
struct.setKeysIsSet(true);
@@ -16148,15 +15978,15 @@ public class Cassandra {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map266 = iprot.readMapBegin();
- struct.success = new HashMap<ByteBuffer,Integer>(2*_map266.size);
- for (int _i267 = 0; _i267 < _map266.size; ++_i267)
+ org.apache.thrift.protocol.TMap _map258 = iprot.readMapBegin();
+ struct.success = new HashMap<ByteBuffer,Integer>(2*_map258.size);
+ for (int _i259 = 0; _i259 < _map258.size; ++_i259)
{
- ByteBuffer _key268;
- int _val269;
- _key268 = iprot.readBinary();
- _val269 = iprot.readI32();
- struct.success.put(_key268, _val269);
+ ByteBuffer _key260;
+ int _val261;
+ _key260 = iprot.readBinary();
+ _val261 = iprot.readI32();
+ struct.success.put(_key260, _val261);
}
iprot.readMapEnd();
}
@@ -16211,10 +16041,10 @@ public class Cassandra {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, struct.success.size()));
- for (Map.Entry<ByteBuffer, Integer> _iter270 : struct.success.entrySet())
+ for (Map.Entry<ByteBuffer, Integer> _iter262 : struct.success.entrySet())
{
- oprot.writeBinary(_iter270.getKey());
- oprot.writeI32(_iter270.getValue());
+ oprot.writeBinary(_iter262.getKey());
+ oprot.writeI32(_iter262.getValue());
}
oprot.writeMapEnd();
}
@@ -16269,10 +16099,10 @@ public class Cassandra {
if (struct.isSetSuccess()) {
{
oprot.writeI32(struct.success.size());
- for (Map.Entry<ByteBuffer, Integer> _iter271 : struct.success.entrySet())
+ for (Map.Entry<ByteBuffer, Integer> _iter263 : struct.success.entrySet())
{
- oprot.writeBinary(_iter271.getKey());
- oprot.writeI32(_iter271.getValue());
+ oprot.writeBinary(_iter263.getKey());
+ oprot.writeI32(_iter263.getValue());
}
}
}
@@ -16293,15 +16123,15 @@ public class Cassandra {
BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map272 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.success = new HashMap<ByteBuffer,Integer>(2*_map272.size);
- for (int _i273 = 0; _i273 < _map272.size; ++_i273)
+ org.apache.thrift.protocol.TMap _map264 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
+ struct.success = new HashMap<ByteBuffer,Integer>(2*_map264.size);
+ for (int _i265 = 0; _i265 < _map264.size; ++_i265)
{
- ByteBuffer _key274;
- int _val275;
- _key274 = iprot.readBinary();
- _val275 = iprot.readI32();
- struct.success.put(_key274, _val275);
+ ByteBuffer _key266;
+ int _val267;
+ _key266 = iprot.readBinary();
+ _val267 = iprot.readI32();
+ struct.success.put(_key266, _val267);
}
}
struct.setSuccessIsSet(true);
@@ -17579,14 +17409,14 @@ public class Cassandra {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list276 = iprot.readListBegin();
- struct.success = new ArrayList<KeySlice>(_list276.size);
- for (int _i277 = 0; _i277 < _list276.size; ++_i277)
+ org.apache.thrift.protocol.TList _list268 = iprot.readListBegin();
+ struct.success = new ArrayList<KeySlice>(_list268.size);
+ for (int _i269 = 0; _i269 < _list268.size; ++_i269)
{
- KeySlice _elem278;
- _elem278 = new KeySlice();
- _elem278.read(iprot);
- struct.success.add(_elem278);
+ KeySlice _elem270;
+ _elem270 = new KeySlice();
+ _elem270.read(iprot);
+ struct.success.add(_elem270);
}
iprot.readListEnd();
}
@@ -17641,9 +17471,9 @@ public class Cassandra {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
- for (KeySlice _iter279 : struct.success)
+ for (KeySlice _iter271 : struct.success)
{
- _iter279.write(oprot);
+ _iter271.write(oprot);
}
oprot.writeListEnd();
}
@@ -17698,9 +17528,9 @@ public class Cassandra {
if (struct.isSetSuccess()) {
{
oprot.writeI32(struct.success.size());
- for (KeySlice _iter280 : struct.success)
+ for (KeySlice _iter272 : struct.success)
{
- _iter280.write(oprot);
+ _iter272.write(oprot);
}
}
}
@@ -17721,14 +17551,14 @@ public class Cassandra {
BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list281 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.success = new ArrayList<KeySlice>(_list281.size);
- for (int _i282 = 0; _i282 < _list281.size; ++_i282)
+ org.apache.thrift.protocol.TList _list273 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.success = new ArrayList<KeySlice>(_list273.size);
+ for (int _i274 = 0; _i274 < _list273.size; ++_i274)
{
- KeySlice _elem283;
- _elem283 = new KeySlice();
- _elem283.read(iprot);
- struct.success.add(_elem283);
+ KeySlice _elem275;
+ _elem275 = new KeySlice();
+ _elem275.read(iprot);
+ struct.success.add(_elem275);
}
}
struct.setSuccessIsSet(true);
@@ -19007,14 +18837,14 @@ public class Cassandra {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list284 = iprot.readListBegin();
- struct.success = new ArrayList<KeySlice>(_list284.size);
- for (int _i285 = 0; _i285 < _list284.size; ++_i285)
+ org.apache.thrift.protocol.TList _list276 = iprot.readListBegin();
+ struct.success = new ArrayList<KeySlice>(_list276.size);
+ for (int _i277 = 0; _i277 < _list276.size; ++_i277)
{
- KeySlice _elem286;
- _elem286 = new KeySlice();
- _elem286.read(iprot);
- struct.success.add(_elem286);
+ KeySlice _elem278;
+ _elem278 = new KeySlice();
+ _elem278.read(iprot);
+ struct.success.add(_elem278);
}
iprot.readListEnd();
}
@@ -19069,9 +18899,9 @@ public class Cassandra {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
- for (KeySlice _iter287 : struct.success)
+ for (KeySlice _iter279 : struct.success)
{
- _iter287.write(oprot);
+ _iter279.write(oprot);
}
oprot.writeListEnd();
}
@@ -19126,9 +18956,9 @@ public class Cassandra {
if (struct.isSetSuccess()) {
{
oprot.writeI32(struct.success.size());
- for (KeySlice _iter288 : struct.success)
+ for (KeySlice _iter280 : struct.success)
{
- _iter288.write(oprot);
+ _iter280.write(oprot);
}
}
}
@@ -19149,14 +18979,14 @@ public class Cassandra {
BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list289 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.success = new ArrayList<KeySlice>(_list289.size);
- for (int _i290 = 0; _i290 < _list289.size; ++_i290)
+ org.apache.thrift.protocol.TList _list281 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.success = new ArrayList<KeySlice>(_list281.size);
+ for (int _i282 = 0; _i282 < _list281.size; ++_i282)
{
- KeySlice _elem291;
- _elem291 = new KeySlice();
- _elem291.read(iprot);
- struct.success.add(_elem291);
+ KeySlice _elem283;
+ _elem283 = new KeySlice();
+ _elem283.read(iprot);
+ struct.success.add(_elem283);
}
}
struct.setSuccessIsSet(true);
@@ -20434,14 +20264,14 @@ public class Cassandra {
case 0: // SUCCESS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list292 = iprot.readListBegin();
- struct.success = new ArrayList<KeySlice>(_list292.size);
- for (int _i293 = 0; _i293 < _list292.size; ++_i293)
+ org.apache.thrift.protocol.TList _list284 = iprot.readListBegin();
+ struct.success = new ArrayList<KeySlice>(_list284.size);
+ for (int _i285 = 0; _i285 < _list284.size; ++_i285)
{
- KeySlice _elem294;
- _elem294 = new KeySlice();
- _elem294.read(iprot);
- struct.success.add(_elem294);
+ KeySlice _elem286;
+ _elem286 = new KeySlice();
+ _elem286.read(iprot);
+ struct.success.add(_elem286);
}
iprot.readListEnd();
}
@@ -20496,9 +20326,9 @@ public class Cassandra {
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
- for (KeySlice _iter295 : struct.success)
+ for (KeySlice _iter287 : struct.success)
{
- _iter295.write(oprot);
+ _iter287.write(oprot);
}
oprot.writeListEnd();
}
@@ -20553,9 +20383,9 @@ public class Cassandra {
if (struct.isSetSuccess()) {
{
oprot.writeI32(struct.success.size());
- for (KeySlice _iter296 : struct.success)
+ for (KeySlice _iter288 : struct.success)
{
- _iter296.write(oprot);
+ _iter288.write(oprot);
}
}
}
@@ -20576,14 +20406,14 @@ public class Cassandra {
BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list297 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.success = new ArrayList<KeySlice>(_list297.size);
- for (int _i298 = 0; _i298 < _list297.size; ++_i298)
+ org.apache.thrift.protocol.TList _list289 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.success = new ArrayList<KeySlice>(_list289.size);
+ for (int _i290 = 0; _i290 < _list289.size; ++_i290)
{
- KeySlice _elem299;
- _elem299 = new KeySlice();
- _elem299.read(iprot);
- struct.success.add(_elem299);
+ KeySlice _elem291;
+ _elem291 = new KeySlice();
+ _elem291.read(iprot);
+ struct.success.add(_elem291);
}
}
struct.setSuccessIsSet(true);
@@ -23979,14 +23809,14 @@ public class Cassandra {
case 3: // EXPECTED
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list300 = iprot.readListBegin();
- struct.expected = new ArrayList<Column>(_list300.size);
- for (int _i301 = 0; _i301 < _list300.size; ++_i301)
+ org.apache.thrift.protocol.TList _list292 = iprot.readListBegin();
+ struct.expected = new ArrayList<Column>(_list292.size);
+ for (int _i293 = 0; _i293 < _list292.size; ++_i293)
{
- Column _elem302;
- _elem302 = new Column();
- _elem302.read(iprot);
- struct.expected.add(_elem302);
+ Column _elem294;
+ _elem294 = new Column();
+ _elem294.read(iprot);
+ struct.expected.add(_elem294);
}
iprot.readListEnd();
}
@@ -23998,14 +23828,14 @@ public class Cassandra {
case 4: // UPDATES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list303 = iprot.readListBegin();
- struct.updates = new ArrayList<Column>(_list303.size);
- for (int _i304 = 0; _i304 < _list303.size; ++_i304)
+ org.apache.thrift.protocol.TList _list295 = iprot.readListBegin();
+ struct.updates = new ArrayList<Column>(_list295.size);
+ for (int _i296 = 0; _i296 < _list295.size; ++_i296)
{
- Column _elem305;
- _elem305 = new Column();
- _elem305.read(iprot);
- struct.updates.add(_elem305);
+ Column _elem297;
+ _elem297 = new Column();
+ _elem297.read(iprot);
+ struct.updates.add(_elem297);
}
iprot.readListEnd();
}
@@ -24059,9 +23889,9 @@ public class Cassandra {
oprot.writeFieldBegin(EXPECTED_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.expected.size()));
- for (Column _iter306 : struct.expected)
+ for (Column _iter298 : struct.expected)
{
- _iter306.write(oprot);
+ _iter298.write(oprot);
}
oprot.writeListEnd();
}
@@ -24071,9 +23901,9 @@ public class Cassandra {
oprot.writeFieldBegin(UPDATES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.updates.size()));
- for (Column _iter307 : struct.updates)
+ for (Column _iter299 : struct.updates)
{
- _iter307.write(oprot);
+ _iter299.write(oprot);
}
oprot.writeListEnd();
}
@@ -24121,18 +23951,18 @@ public class Cassandra {
if (struct.isSetExpected()) {
{
oprot.writeI32(struct.expected.size());
- for (Column _iter308 : struct.expected)
+ for (Column _iter300 : struct.expected)
{
- _iter308.write(oprot);
+ _iter300.write(oprot);
}
}
}
if (struct.isSetUpdates()) {
{
oprot.writeI32(struct.updates.size());
- for (Column _iter309 : struct.updates)
+ for (Column _iter301 : struct.updates)
{
- _iter309.write(oprot);
+ _iter301.write(oprot);
}
}
}
@@ -24152,28 +23982,28 @@ public class Cassandra {
BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list310 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.expected = new ArrayList<Column>(_list310.size);
- for (int _i311 = 0; _i311 < _list310.size; ++_i311)
+ org.apache.thrift.protocol.TList _list302 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.expected = new ArrayList<Column>(_list302.size);
+ for (int _i303 = 0; _i303 < _list302.size; ++_i303)
{
- Column _elem312;
- _elem312 = new Column();
- _elem312.read(iprot);
- struct.expected.add(_elem312);
+ Column _elem304;
+ _elem304 = new Column();
+ _elem304.read(iprot);
+ struct.expected.add(_elem304);
}
}
struct.setExpectedIsSet(true);
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list313 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.updates = new ArrayList<Column>(_list313.size);
- for (int _i314 = 0; _i314 < _list313.size; ++_i314)
+ org.apache.thrift.protocol.TList _list305 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.updates = new ArrayList<Column>(_list305.size);
+ for (int _i306 = 0; _i306 < _list305.size; ++_i306)
{
- Column _elem315;
- _elem315 = new Column();
- _elem315.read(iprot);
- struct.updates.add(_elem315);
+ Column _elem307;
+ _elem307 = new Column();
+ _elem307.read(iprot);
+ struct.updates.add(_elem307);
}
}
struct.setUpdatesIsSet(true);
@@ -27759,38 +27589,38 @@ public class Cassandra {
case 1: // MUTATION_MAP
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map316 = iprot.readMapBegin();
- struct.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map316.size);
- for (int _i317 = 0; _i317 < _map316.size; ++_i317)
+ org.apache.thrift.protocol.TMap _map308 = iprot.readMapBegin();
+ struct.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map308.size);
+ for (int _i309 = 0; _i309 < _map308.size; ++_i309)
{
- ByteBuffer _key318;
- Map<String,List<Mutation>> _val319;
- _key318 = iprot.readBinary();
+ ByteBuffer _key310;
+ Map<String,List<Mutation>> _val311;
+ _key310 = iprot.readBinary();
{
- org.apache.thrift.protocol.TMap _map320 = iprot.readMapBegin();
- _val319 = new HashMap<String,List<Mutation>>(2*_map320.size);
- for (int _i321 = 0; _i321 < _map320.size; ++_i321)
+ org.apache.thrift.protocol.TMap _map312 = iprot.readMapBegin();
+ _val311 = new HashMap<String,List<Mutation>>(2*_map312.size);
+ for (int _i313 = 0; _i313 < _map312.size; ++_i313)
{
- String _key322;
- List<Mutation> _val323;
- _key322 = iprot.readString();
+ String _key314;
+ List<Mutation> _val315;
+ _key314 = iprot.readString();
{
- org.apache.thrift.protocol.TList _list324 = iprot.readListBegin();
- _val323 = new ArrayList<Mutation>(_list324.size);
- for (int _i325 = 0; _i325 < _list324.size; ++_i325)
+ org.apache.thrift.protocol.TList _list316 = iprot.readListBegin();
+ _val315 = new ArrayList<Mutation>(_list316.size);
+ for (int _i317 = 0; _i317 < _list316.size; ++_i317)
{
- Mutation _elem326;
- _elem326 = new Mutation();
- _elem326.read(iprot);
- _val323.add(_elem326);
+ Mutation _elem318;
+ _elem318 = new Mutation();
+ _elem318.read(iprot);
+ _val315.add(_elem318);
}
iprot.readListEnd();
}
- _val319.put(_key322, _val323);
+ _val311.put(_key314, _val315);
}
iprot.readMapEnd();
}
- struct.mutation_map.put(_key318, _val319);
+ struct.mutation_map.put(_key310, _val311);
}
iprot.readMapEnd();
}
@@ -27826,19 +27656,19 @@ public class Cassandra {
oprot.writeFieldBegin(MUTATION_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.mutation_map.size()));
- for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter327 : struct.mutation_map.entrySet())
+ for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter319 : struct.mutation_map.entrySet())
{
- oprot.writeBinary(_iter327.getKey());
+ oprot.writeBinary(_iter319.getKey());
{
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, _iter327.getValue().size()));
- for (Map.Entry<String, List<Mutation>> _iter328 : _iter327.getValue().entrySet())
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, _iter319.getValue().size()));
+ for (Map.Entry<String, List<Mutation>> _iter320 : _iter319.getValue().entrySet())
{
- oprot.writeString(_iter328.getKey());
+ oprot.writeString(_iter320.getKey());
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter328.getValue().size()));
- for (Mutation _iter329 : _iter328.getValue())
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter320.getValue().size()));
+ for (Mutation _iter321 : _iter320.getValue())
{
- _iter329.write(oprot);
+ _iter321.write(oprot);
}
oprot.writeListEnd();
}
@@ -27874,19 +27704,19 @@ public class Cassandra {
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.mutation_map.size());
- for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter330 : struct.mutation_map.entrySet())
+ for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter322 : struct.mutation_map.entrySet())
{
- oprot.writeBinary(_iter330.getKey());
+ oprot.writeBinary(_iter322.getKey());
{
- oprot.writeI32(_iter330.getValue().size());
- for (Map.Entry<String, List<Mutation>> _iter331 : _iter330.getValue().entrySet())
+ oprot.writeI32(_iter322.getValue().size());
+ for (Map.Entry<String, List<Mutation>> _iter323 : _iter322.getValue().entrySet())
{
- oprot.writeString(_iter331.getKey());
+ oprot.writeString(_iter323.getKey());
{
- oprot.writeI32(_iter331.getValue().size());
- for (Mutation _iter332 : _iter331.getValue())
+ oprot.writeI32(_iter323.getValue().size());
+ for (Mutation _iter324 : _iter323.getValue())
{
- _iter332.write(oprot);
+ _iter324.write(oprot);
}
}
}
@@ -27900,36 +27730,36 @@ public class Cassandra {
public void read(org.apache.thrift.protocol.TProtocol prot, batch_mutate_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map333 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
- struct.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map333.size);
- for (int _i334 = 0; _i334 < _map333.size; ++_i334)
+ org.apache.thrift.protocol.TMap _map325 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map325.size);
+ for (int _i326 = 0; _i326 < _map325.size; ++_i326)
{
- ByteBuffer _key335;
- Map<String,List<Mutation>> _val336;
- _key335 = iprot.readBinary();
+ ByteBuffer _key327;
+ Map<String,List<Mutation>> _val328;
+ _key327 = iprot.readBinary();
{
- org.apache.thrift.protocol.TMap _map337 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
- _val336 = new HashMap<String,List<Mutation>>(2*_map337.size);
- for (int _i338 = 0; _i338 < _map337.size; ++_i338)
+ org.apache.thrift.protocol.TMap _map329 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+ _val328 = new HashMap<String,List<Mutation>>(2*_map329.size);
+ for (int _i330 = 0; _i330 < _map329.size; ++_i330)
{
- String _key339;
- List<Mutation> _val340;
- _key339 = iprot.readString();
+ String _key331;
+ List<Mutation> _val332;
+ _key331 = iprot.readString();
{
- org.apache.thrift.protocol.TList _list341 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- _val340 = new ArrayList<Mutation>(_list341.size);
- for (int _i342 = 0; _i342 < _list341.size; ++_i342)
+ org.apache.thrift.protocol.TList _list333 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ _val332 = new ArrayList<Mutation>(_list333.size);
+ for (int _i334 = 0; _i334 < _list333.size; ++_i334)
{
- Mutation _elem343;
- _elem343 = new Mutation();
- _elem343.read(iprot);
- _val340.add(_elem343);
+ Mutation _elem335;
+ _elem335 = new Mutation();
+ _elem335.read(iprot);
+ _val332.add(_elem335);
}
}
- _val336.put(_key339, _val340);
+ _val328.put(_key331, _val332);
}
}
- struct.mutation_map.put(_key335, _val336);
+ struct.mutation_map.put(_key327, _val328);
}
}
struct.setMutation_mapIsSet(true);
@@ -28963,38 +28793,38 @@ public class Cassandra {
case 1: // MUTATION_MAP
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map344 = iprot.readMapBegin();
- struct.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map344.size);
- for (int _i345 = 0; _i345 < _map344.size; ++_i345)
+ org.apache.thrift.protocol.TMap _map336 = iprot.readMapBegin();
+ struct.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map336.size);
+ for (int _i337 = 0; _i337 < _map336.size; ++_i337)
{
- ByteBuffer _key346;
- Map<String,List<Mutation>> _val347;
- _key346 = iprot.readBinary();
+ ByteBuffer _key338;
+ Map<String,List<Mutation>> _val339;
+ _key338 = iprot.readBinary();
{
- org.apache.thrift.protocol.TMap _map348 = iprot.readMapBegin();
- _val347 = new HashMap<String,List<Mutation>>(2*_map348.size);
- for (int _i349 = 0; _i349 < _map348.size; ++_i349)
+ org.apache.thrift.protocol.TMap _map340 = iprot.readMapBegin();
+ _val339 = new HashMap<String,List<Mutation>>(2*_map340.size);
+ for (int _i341 = 0; _i341 < _map340.size; ++_i341)
{
- String _key350;
- List<Mutation> _val351;
- _key350 = iprot.readString();
+ String _key342;
+ List<Mutation> _val343;
+ _key342 = iprot.readString();
{
- org.apache.thrift.protocol.TList _list352 = iprot.readListBegin();
- _val351 = new ArrayList<Mutation>(_list352.size);
- for (int _i353 = 0; _i353 < _list352.size; ++_i353)
+ org.apache.thrift.protocol.TList _list344 = iprot.readListBegin();
+ _val343 = new ArrayList<Mutation>(_list344.size);
+ for (int _i345 = 0; _i345 < _list344.size; ++_i345)
{
- Mutation _elem354;
- _elem354 = new Mutation();
- _elem354.read(iprot);
- _val351.add(_elem354);
+ Mutation _elem346;
+ _elem346 = new Mutation();
+ _elem346.read(iprot);
+ _val343.add(_elem346);
}
iprot.readListEnd();
}
- _val347.put(_key350, _val351);
+ _val339.put(_key342, _val343);
}
iprot.readMapEnd();
}
- struct.mutation_map.put(_key346, _val347);
+ struct.mutation_map.put(_key338, _val339);
}
iprot.readMapEnd();
}
@@ -29030,19 +28860,19 @@ public class Cassandra {
oprot.writeFieldBegin(MUTATION_MAP_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.mutation_map.size()));
- for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter355 : struct.mutation_map.entrySet())
+ for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter347 : struct.mutation_map.entrySet())
{
- oprot.writeBinary(_iter355.getKey());
+ oprot.writeBinary(_iter347.getKey());
{
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, _iter355.getValue().size()));
- for (Map.Entry<String, List<Mutation>> _iter356 : _iter355.getValue().entrySet())
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, _iter347.getValue().size()));
+ for (Map.Entry<String, List<Mutation>> _iter348 : _iter347.getValue().entrySet())
{
- oprot.writeString(_iter356.getKey());
+ oprot.writeString(_iter348.getKey());
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter356.getValue().size()));
- for (Mutation _iter357 : _iter356.getValue())
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter348.getValue().size()));
+ for (Mutation _iter349 : _iter348.getValue())
{
- _iter357.write(oprot);
+ _iter349.write(oprot);
}
oprot.writeListEnd();
}
@@ -29078,19 +28908,19 @@ public class Cassandra {
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.mutation_map.size());
- for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter358 : struct.mutation_map.entrySet())
+ for (Map.Entry<ByteBuffer, Map<String,List<Mutation>>> _iter350 : struct.mutation_map.entrySet())
{
- oprot.writeBinary(_iter358.getKey());
+ oprot.writeBinary(_iter350.getKey());
{
- oprot.writeI32(_iter358.getValue().size());
- for (Map.Entry<String, List<Mutation>> _iter359 : _iter358.getValue().entrySet())
+ oprot.writeI32(_iter350.getValue().size());
+ for (Map.Entry<String, List<Mutation>> _iter351 : _iter350.getValue().entrySet())
{
- oprot.writeString(_iter359.getKey());
+ oprot.writeString(_iter351.getKey());
{
- oprot.writeI32(_iter359.getValue().size());
- for (Mutation _iter360 : _iter359.getValue())
+ oprot.writeI32(_iter351.getValue().size());
+ for (Mutation _iter352 : _iter351.getValue())
{
- _iter360.write(oprot);
+ _iter352.write(oprot);
}
}
}
@@ -29104,36 +28934,36 @@ public class Cassandra {
public void read(org.apache.thrift.protocol.TProtocol prot, atomic_batch_mutate_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map361 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
- struct.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map361.size);
- for (int _i362 = 0; _i362 < _map361.size; ++_i362)
+ org.apache.thrift.protocol.TMap _map353 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+ struct.mutation_map = new HashMap<ByteBuffer,Map<String,List<Mutation>>>(2*_map353.size);
+ for (int _i354 = 0; _i354 < _map353.size; ++_i354)
{
- ByteBuffer _key363;
- Map<String,List<Mutation>> _val364;
- _key363 = iprot.readBinary();
+ ByteBuffer _key355;
+ Map<String,List<Mutation>> _val356;
+ _key355 = iprot.readBinary();
{
- org.apache.thrift.protocol.TMap _map365 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
- _val364 = new HashMap<String,List<Mutation>>(2*_map365.size);
- for (int _i366 = 0; _i366 < _map365.size; ++_i366)
+ org.apache.thrift.protocol.TMap _map357 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+ _val356 = new HashMap<String,List<Mutation>>(2*_map357.size);
+ for (int _i358 = 0; _i358 < _map357.size; ++_i358)
{
- String _key367;
- List<Mutation> _val368;
- _key367 = iprot.readString();
+ String _key359;
+ List<Mutation> _val360;
+ _key359 = iprot.readString();
{
- org.apache.thrift.protocol.TList _list369 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- _val368 = new ArrayList<Mutation>(_list369.size);
- for (int _i370 = 0; _i370 < _list369.size; ++_i370)
+ org.apache.thrift.protocol.TList _list361 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ _val360 = new ArrayList<Mutation>(_list361.size);
+ for (int _i362 = 0; _i362 < _list361.size; ++_i362)
{
- Mutation _elem371;
- _elem371 = new Mutation();
- _elem371.read(iprot);
- _val368.add(_elem371);
+ Mutation _elem363;
+ _elem363 = new Mutation();
+ _elem363.read(iprot);
+ _val360.add(_elem363);
}
}
- _val364.put(_key367, _val368);
+ _val356.put(_key359, _val360);
}
}
- struct.mutation_map.put(_key363, _val364);
+ struct.mutation_map.put(_key355, _val356);
}
}
struct.setMutation_mapIsSet(true);
@@ -30652,22 +30482,20 @@ public class Cassandra {
}
- public static class get_multi_slice_args implements org.apache.thrift.TBase<get_multi_slice_args, get_multi_slice_args._Fields>, java.io.Serializable, Cloneable, Comparable<get_multi_slice_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_multi_slice_args");
+ public static class describe_schema_versions_args implements org.apache.thrift.TBase<describe_schema_versions_args, describe_schema_versions_args._Fields>, java.io.Serializable, Cloneable, Comparable<describe_schema_versions_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("describe_schema_versions_args");
- private static final org.apache.thrift.protocol.TField REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("request", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new get_multi_slice_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new get_multi_slice_argsTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new describe_schema_versions_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new describe_schema_versions_argsTupleSchemeFactory());
}
- public MultiSliceRequest request; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- REQUEST((short)1, "request");
+;
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -30682,8 +30510,6 @@ public class Cassandra {
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // REQUEST
- return REQUEST;
default:
return null;
}
@@ -30722,87 +30548,37 @@ public class Cassandra {
return _fieldName;
}
}
-
- // 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);
- tmpMap.put(_Fields.REQUEST, new org.apache.thrift.meta_data.FieldMetaData("request", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MultiSliceRequest.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(get_multi_slice_args.class, metaDataMap);
- }
-
- public get_multi_slice_args() {
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(describe_schema_versions_args.class, metaDataMap);
}
- public get_multi_slice_args(
- MultiSliceRequest request)
- {
- this();
- this.request = request;
+ public describe_schema_versions_args() {
}
/**
* Performs a deep copy on <i>other</i>.
*/
- public get_multi_slice_args(get_multi_slice_args other) {
- if (other.isSetRequest()) {
- this.request = new MultiSliceRequest(other.request);
- }
+ public describe_schema_versions_args(describe_schema_versions_args other) {
}
- public get_multi_slice_args deepCopy() {
- return new get_multi_slice_args(this);
+ public describe_schema_versions_args deepCopy() {
+
<TRUNCATED>
[3/3] cassandra git commit: Revert "add Thrift get_multi_slice call"
Posted by jb...@apache.org.
Revert "add Thrift get_multi_slice call"
This reverts commit 60fb923018a6fd2dabf04a1d4500f7b29a23a6f1.
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/thrift/CassandraServer.java
test/system/test_thrift_server.py
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
test/unit/org/apache/cassandra/thrift/MultiSliceTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f070250
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f070250
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f070250
Branch: refs/heads/trunk
Commit: 3f0702509b3f12cfc159fc33a114bcf52ecf9fc9
Parents: c7db18b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri May 8 11:59:57 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri May 8 11:59:57 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
interface/cassandra.thrift | 37 +-
.../org/apache/cassandra/thrift/Cassandra.java | 3071 +++++-------------
.../apache/cassandra/thrift/ColumnSlice.java | 551 ----
.../cassandra/thrift/MultiSliceRequest.java | 1042 ------
.../cassandra/thrift/cassandraConstants.java | 2 +-
.../cassandra/thrift/CassandraServer.java | 72 -
.../cassandra/db/ColumnFamilyStoreTest.java | 20 +-
.../apache/cassandra/thrift/MultiSliceTest.java | 186 --
9 files changed, 920 insertions(+), 4063 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4639bff..675e46c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -80,7 +80,6 @@
* Move sstable RandomAccessReader to nio2, which allows using the
FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
* Remove CQL2 (CASSANDRA-5918)
- * Add Thrift get_multi_slice call (CASSANDRA-6757)
* Optimize fetching multiple cells by name (CASSANDRA-6933)
* Allow compilation in java 8 (CASSANDRA-7028)
* Make incremental repair default (CASSANDRA-7250)
@@ -99,6 +98,7 @@
* Save repair data to system table (CASSANDRA-5839)
* fix nodetool names that reference column families (CASSANDRA-8872)
+
2.1.6
* Delete processed sstables in sstablesplit/sstableupgrade (CASSANDRA-8606)
* Improve sstable exclusion from partition tombstones (CASSANDRA-9298)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f070250/interface/cassandra.thrift
----------------------------------------------------------------------
diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift
index 0af7e64..835fa8c 100644
--- a/interface/cassandra.thrift
+++ b/interface/cassandra.thrift
@@ -55,7 +55,7 @@ namespace rb CassandraThrift
# An effort should be made not to break forward-client-compatibility either
# (e.g. one should avoid removing obsolete fields from the IDL), but no
# guarantees in this respect are made by the Cassandra project.
-const string VERSION = "20.1.0"
+const string VERSION = "20.0.0"
#
@@ -571,35 +571,6 @@ struct CfSplit {
3: required i64 row_count
}
-/** The ColumnSlice is used to select a set of columns from inside a row.
- * If start or finish are unspecified they will default to the start-of
- * end-of value.
- * @param start. The start of the ColumnSlice inclusive
- * @param finish. The end of the ColumnSlice inclusive
- */
-struct ColumnSlice {
- 1: optional binary start,
- 2: optional binary finish
-}
-
-/**
- * Used to perform multiple slices on a single row key in one rpc operation
- * @param key. The row key to be multi sliced
- * @param column_parent. The column family (super columns are unsupported)
- * @param column_slices. 0 to many ColumnSlice objects each will be used to select columns
- * @param reversed. Direction of slice
- * @param count. Maximum number of columns
- * @param consistency_level. Level to perform the operation at
- */
-struct MultiSliceRequest {
- 1: optional binary key,
- 2: optional ColumnParent column_parent,
- 3: optional list<ColumnSlice> column_slices,
- 4: optional bool reversed=false,
- 5: optional i32 count=1000,
- 6: optional ConsistencyLevel consistency_level=ConsistencyLevel.ONE
-}
-
service Cassandra {
# auth methods
void login(1: required AuthenticationRequest auth_request) throws (1:AuthenticationException authnx, 2:AuthorizationException authzx),
@@ -778,11 +749,7 @@ service Cassandra {
void truncate(1:required string cfname)
throws (1: InvalidRequestException ire, 2: UnavailableException ue, 3: TimedOutException te),
- /**
- * Select multiple slices of a key in a single RPC operation
- */
- list<ColumnOrSuperColumn> get_multi_slice(1:required MultiSliceRequest request)
- throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te),
+
// Meta-APIs -- APIs to get information about the node or cluster,
// rather than user data. The nodeprobe program provides usage examples.