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 2009/07/16 00:04:45 UTC
svn commit: r794429 [3/5] - in /incubator/cassandra/trunk: ./ interface/
interface/gen-java/org/apache/cassandra/service/
src/java/org/apache/cassandra/cli/ src/java/org/apache/cassandra/config/
src/java/org/apache/cassandra/cql/common/ src/java/org/ap...
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java (from r794079, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java&r1=794079&r2=794429&rev=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java Wed Jul 15 22:04:43 2009
@@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
-/*
- *
- * 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 java.util.List;
import java.util.ArrayList;
@@ -39,14 +18,14 @@
import org.apache.thrift.meta_data.*;
import org.apache.thrift.protocol.*;
-public class column_t implements TBase, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("column_t");
- private static final TField COLUMN_NAME_FIELD_DESC = new TField("columnName", TType.STRING, (short)1);
+public class Column implements TBase, java.io.Serializable, Cloneable {
+ private static final TStruct STRUCT_DESC = new TStruct("Column");
+ private static final TField COLUMN_NAME_FIELD_DESC = new TField("column_name", TType.STRING, (short)1);
private static final TField VALUE_FIELD_DESC = new TField("value", TType.STRING, (short)2);
private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)3);
- public String columnName;
- public static final int COLUMNNAME = 1;
+ public String column_name;
+ public static final int COLUMN_NAME = 1;
public byte[] value;
public static final int VALUE = 2;
public long timestamp;
@@ -58,7 +37,7 @@
}
public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
- put(COLUMNNAME, new FieldMetaData("columnName", TFieldRequirementType.DEFAULT,
+ put(COLUMN_NAME, new FieldMetaData("column_name", TFieldRequirementType.DEFAULT,
new FieldValueMetaData(TType.STRING)));
put(VALUE, new FieldMetaData("value", TFieldRequirementType.DEFAULT,
new FieldValueMetaData(TType.STRING)));
@@ -67,19 +46,19 @@
}});
static {
- FieldMetaData.addStructMetaDataMap(column_t.class, metaDataMap);
+ FieldMetaData.addStructMetaDataMap(Column.class, metaDataMap);
}
- public column_t() {
+ public Column() {
}
- public column_t(
- String columnName,
+ public Column(
+ String column_name,
byte[] value,
long timestamp)
{
this();
- this.columnName = columnName;
+ this.column_name = column_name;
this.value = value;
this.timestamp = timestamp;
this.__isset.timestamp = true;
@@ -88,9 +67,9 @@
/**
* Performs a deep copy on <i>other</i>.
*/
- public column_t(column_t other) {
- if (other.isSetColumnName()) {
- this.columnName = other.columnName;
+ public Column(Column other) {
+ if (other.isSetColumn_name()) {
+ this.column_name = other.column_name;
}
if (other.isSetValue()) {
this.value = new byte[other.value.length];
@@ -101,30 +80,30 @@
}
@Override
- public column_t clone() {
- return new column_t(this);
+ public Column clone() {
+ return new Column(this);
}
- public String getColumnName() {
- return this.columnName;
+ public String getColumn_name() {
+ return this.column_name;
}
- public void setColumnName(String columnName) {
- this.columnName = columnName;
+ public void setColumn_name(String column_name) {
+ this.column_name = column_name;
}
- public void unsetColumnName() {
- this.columnName = null;
+ public void unsetColumn_name() {
+ this.column_name = null;
}
- // Returns true if field columnName is set (has been asigned a value) and false otherwise
- public boolean isSetColumnName() {
- return this.columnName != null;
+ // Returns true if field column_name is set (has been asigned a value) and false otherwise
+ public boolean isSetColumn_name() {
+ return this.column_name != null;
}
- public void setColumnNameIsSet(boolean value) {
+ public void setColumn_nameIsSet(boolean value) {
if (!value) {
- this.columnName = null;
+ this.column_name = null;
}
}
@@ -175,11 +154,11 @@
public void setFieldValue(int fieldID, Object value) {
switch (fieldID) {
- case COLUMNNAME:
+ case COLUMN_NAME:
if (value == null) {
- unsetColumnName();
+ unsetColumn_name();
} else {
- setColumnName((String)value);
+ setColumn_name((String)value);
}
break;
@@ -206,8 +185,8 @@
public Object getFieldValue(int fieldID) {
switch (fieldID) {
- case COLUMNNAME:
- return getColumnName();
+ case COLUMN_NAME:
+ return getColumn_name();
case VALUE:
return getValue();
@@ -223,8 +202,8 @@
// Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
public boolean isSet(int fieldID) {
switch (fieldID) {
- case COLUMNNAME:
- return isSetColumnName();
+ case COLUMN_NAME:
+ return isSetColumn_name();
case VALUE:
return isSetValue();
case TIMESTAMP:
@@ -238,21 +217,21 @@
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof column_t)
- return this.equals((column_t)that);
+ if (that instanceof Column)
+ return this.equals((Column)that);
return false;
}
- public boolean equals(column_t that) {
+ public boolean equals(Column that) {
if (that == null)
return false;
- boolean this_present_columnName = true && this.isSetColumnName();
- boolean that_present_columnName = true && that.isSetColumnName();
- if (this_present_columnName || that_present_columnName) {
- if (!(this_present_columnName && that_present_columnName))
+ boolean this_present_column_name = true && this.isSetColumn_name();
+ boolean that_present_column_name = true && that.isSetColumn_name();
+ if (this_present_column_name || that_present_column_name) {
+ if (!(this_present_column_name && that_present_column_name))
return false;
- if (!this.columnName.equals(that.columnName))
+ if (!this.column_name.equals(that.column_name))
return false;
}
@@ -293,9 +272,9 @@
}
switch (field.id)
{
- case COLUMNNAME:
+ case COLUMN_NAME:
if (field.type == TType.STRING) {
- this.columnName = iprot.readString();
+ this.column_name = iprot.readString();
} else {
TProtocolUtil.skip(iprot, field.type);
}
@@ -332,9 +311,9 @@
validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (this.columnName != null) {
+ if (this.column_name != null) {
oprot.writeFieldBegin(COLUMN_NAME_FIELD_DESC);
- oprot.writeString(this.columnName);
+ oprot.writeString(this.column_name);
oprot.writeFieldEnd();
}
if (this.value != null) {
@@ -351,14 +330,14 @@
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("column_t(");
+ StringBuilder sb = new StringBuilder("Column(");
boolean first = true;
- sb.append("columnName:");
- if (this.columnName == null) {
+ sb.append("column_name:");
+ if (this.column_name == null) {
sb.append("null");
} else {
- sb.append(this.columnName);
+ sb.append(this.column_name);
}
first = false;
if (!first) sb.append(", ");
Added: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java?rev=794429&view=auto
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java (added)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java Wed Jul 15 22:04:43 2009
@@ -0,0 +1,296 @@
+/**
+ * Autogenerated by Thrift
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.cassandra.service;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+import org.apache.log4j.Logger;
+
+import org.apache.thrift.*;
+import org.apache.thrift.meta_data.*;
+import org.apache.thrift.protocol.*;
+
+public class ColumnParent implements TBase, java.io.Serializable, Cloneable {
+ private static final TStruct STRUCT_DESC = new TStruct("ColumnParent");
+ private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("column_family", TType.STRING, (short)3);
+ private static final TField SUPER_COLUMN_FIELD_DESC = new TField("super_column", TType.STRING, (short)4);
+
+ public String column_family;
+ public static final int COLUMN_FAMILY = 3;
+ public String super_column;
+ public static final int SUPER_COLUMN = 4;
+
+ private final Isset __isset = new Isset();
+ private static final class Isset implements java.io.Serializable {
+ }
+
+ public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
+ put(COLUMN_FAMILY, new FieldMetaData("column_family", TFieldRequirementType.DEFAULT,
+ new FieldValueMetaData(TType.STRING)));
+ put(SUPER_COLUMN, new FieldMetaData("super_column", TFieldRequirementType.OPTIONAL,
+ new FieldValueMetaData(TType.STRING)));
+ }});
+
+ static {
+ FieldMetaData.addStructMetaDataMap(ColumnParent.class, metaDataMap);
+ }
+
+ public ColumnParent() {
+ }
+
+ public ColumnParent(
+ String column_family,
+ String super_column)
+ {
+ this();
+ this.column_family = column_family;
+ this.super_column = super_column;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public ColumnParent(ColumnParent other) {
+ if (other.isSetColumn_family()) {
+ this.column_family = other.column_family;
+ }
+ if (other.isSetSuper_column()) {
+ this.super_column = other.super_column;
+ }
+ }
+
+ @Override
+ public ColumnParent clone() {
+ return new ColumnParent(this);
+ }
+
+ public String getColumn_family() {
+ return this.column_family;
+ }
+
+ public void setColumn_family(String column_family) {
+ this.column_family = column_family;
+ }
+
+ public void unsetColumn_family() {
+ this.column_family = null;
+ }
+
+ // Returns true if field column_family is set (has been asigned a value) and false otherwise
+ public boolean isSetColumn_family() {
+ return this.column_family != null;
+ }
+
+ public void setColumn_familyIsSet(boolean value) {
+ if (!value) {
+ this.column_family = null;
+ }
+ }
+
+ public String getSuper_column() {
+ return this.super_column;
+ }
+
+ public void setSuper_column(String super_column) {
+ this.super_column = super_column;
+ }
+
+ public void unsetSuper_column() {
+ this.super_column = null;
+ }
+
+ // Returns true if field super_column is set (has been asigned a value) and false otherwise
+ public boolean isSetSuper_column() {
+ return this.super_column != null;
+ }
+
+ public void setSuper_columnIsSet(boolean value) {
+ if (!value) {
+ this.super_column = null;
+ }
+ }
+
+ public void setFieldValue(int fieldID, Object value) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ if (value == null) {
+ unsetColumn_family();
+ } else {
+ setColumn_family((String)value);
+ }
+ break;
+
+ case SUPER_COLUMN:
+ if (value == null) {
+ unsetSuper_column();
+ } else {
+ setSuper_column((String)value);
+ }
+ break;
+
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ public Object getFieldValue(int fieldID) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ return getColumn_family();
+
+ case SUPER_COLUMN:
+ return getSuper_column();
+
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
+ public boolean isSet(int fieldID) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ return isSetColumn_family();
+ case SUPER_COLUMN:
+ return isSetSuper_column();
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof ColumnParent)
+ return this.equals((ColumnParent)that);
+ return false;
+ }
+
+ public boolean equals(ColumnParent that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_column_family = true && this.isSetColumn_family();
+ boolean that_present_column_family = true && that.isSetColumn_family();
+ if (this_present_column_family || that_present_column_family) {
+ if (!(this_present_column_family && that_present_column_family))
+ return false;
+ if (!this.column_family.equals(that.column_family))
+ return false;
+ }
+
+ boolean this_present_super_column = true && this.isSetSuper_column();
+ boolean that_present_super_column = true && that.isSetSuper_column();
+ if (this_present_super_column || that_present_super_column) {
+ if (!(this_present_super_column && that_present_super_column))
+ return false;
+ if (!this.super_column.equals(that.super_column))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ public void read(TProtocol iprot) throws TException {
+ TField field;
+ iprot.readStructBegin();
+ while (true)
+ {
+ field = iprot.readFieldBegin();
+ if (field.type == TType.STOP) {
+ break;
+ }
+ switch (field.id)
+ {
+ case COLUMN_FAMILY:
+ if (field.type == TType.STRING) {
+ this.column_family = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case SUPER_COLUMN:
+ if (field.type == TType.STRING) {
+ this.super_column = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
+ break;
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ validate();
+ }
+
+ public void write(TProtocol oprot) throws TException {
+ validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (this.column_family != null) {
+ oprot.writeFieldBegin(COLUMN_FAMILY_FIELD_DESC);
+ oprot.writeString(this.column_family);
+ oprot.writeFieldEnd();
+ }
+ if (this.super_column != null) {
+ oprot.writeFieldBegin(SUPER_COLUMN_FIELD_DESC);
+ oprot.writeString(this.super_column);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("ColumnParent(");
+ boolean first = true;
+
+ sb.append("column_family:");
+ if (this.column_family == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.column_family);
+ }
+ first = false;
+ if (isSetSuper_column()) {
+ if (!first) sb.append(", ");
+ sb.append("super_column:");
+ if (this.super_column == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.super_column);
+ }
+ first = false;
+ }
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws TException {
+ // check for required fields
+ // check that fields of type enum have valid values
+ }
+
+}
+
Added: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java?rev=794429&view=auto
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java (added)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java Wed Jul 15 22:04:43 2009
@@ -0,0 +1,371 @@
+/**
+ * Autogenerated by Thrift
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.cassandra.service;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+import org.apache.log4j.Logger;
+
+import org.apache.thrift.*;
+import org.apache.thrift.meta_data.*;
+import org.apache.thrift.protocol.*;
+
+public class ColumnPath implements TBase, java.io.Serializable, Cloneable {
+ private static final TStruct STRUCT_DESC = new TStruct("ColumnPath");
+ private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("column_family", TType.STRING, (short)3);
+ private static final TField SUPER_COLUMN_FIELD_DESC = new TField("super_column", TType.STRING, (short)4);
+ private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRING, (short)5);
+
+ public String column_family;
+ public static final int COLUMN_FAMILY = 3;
+ public String super_column;
+ public static final int SUPER_COLUMN = 4;
+ public String column;
+ public static final int COLUMN = 5;
+
+ private final Isset __isset = new Isset();
+ private static final class Isset implements java.io.Serializable {
+ }
+
+ public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
+ put(COLUMN_FAMILY, new FieldMetaData("column_family", TFieldRequirementType.DEFAULT,
+ new FieldValueMetaData(TType.STRING)));
+ put(SUPER_COLUMN, new FieldMetaData("super_column", TFieldRequirementType.OPTIONAL,
+ new FieldValueMetaData(TType.STRING)));
+ put(COLUMN, new FieldMetaData("column", TFieldRequirementType.DEFAULT,
+ new FieldValueMetaData(TType.STRING)));
+ }});
+
+ static {
+ FieldMetaData.addStructMetaDataMap(ColumnPath.class, metaDataMap);
+ }
+
+ public ColumnPath() {
+ }
+
+ public ColumnPath(
+ String column_family,
+ String super_column,
+ String column)
+ {
+ this();
+ this.column_family = column_family;
+ this.super_column = super_column;
+ this.column = column;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public ColumnPath(ColumnPath other) {
+ if (other.isSetColumn_family()) {
+ this.column_family = other.column_family;
+ }
+ if (other.isSetSuper_column()) {
+ this.super_column = other.super_column;
+ }
+ if (other.isSetColumn()) {
+ this.column = other.column;
+ }
+ }
+
+ @Override
+ public ColumnPath clone() {
+ return new ColumnPath(this);
+ }
+
+ public String getColumn_family() {
+ return this.column_family;
+ }
+
+ public void setColumn_family(String column_family) {
+ this.column_family = column_family;
+ }
+
+ public void unsetColumn_family() {
+ this.column_family = null;
+ }
+
+ // Returns true if field column_family is set (has been asigned a value) and false otherwise
+ public boolean isSetColumn_family() {
+ return this.column_family != null;
+ }
+
+ public void setColumn_familyIsSet(boolean value) {
+ if (!value) {
+ this.column_family = null;
+ }
+ }
+
+ public String getSuper_column() {
+ return this.super_column;
+ }
+
+ public void setSuper_column(String super_column) {
+ this.super_column = super_column;
+ }
+
+ public void unsetSuper_column() {
+ this.super_column = null;
+ }
+
+ // Returns true if field super_column is set (has been asigned a value) and false otherwise
+ public boolean isSetSuper_column() {
+ return this.super_column != null;
+ }
+
+ public void setSuper_columnIsSet(boolean value) {
+ if (!value) {
+ this.super_column = null;
+ }
+ }
+
+ public String getColumn() {
+ return this.column;
+ }
+
+ public void setColumn(String column) {
+ this.column = column;
+ }
+
+ public void unsetColumn() {
+ this.column = null;
+ }
+
+ // Returns true if field column is set (has been asigned a value) and false otherwise
+ public boolean isSetColumn() {
+ return this.column != null;
+ }
+
+ public void setColumnIsSet(boolean value) {
+ if (!value) {
+ this.column = null;
+ }
+ }
+
+ public void setFieldValue(int fieldID, Object value) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ if (value == null) {
+ unsetColumn_family();
+ } else {
+ setColumn_family((String)value);
+ }
+ break;
+
+ case SUPER_COLUMN:
+ if (value == null) {
+ unsetSuper_column();
+ } else {
+ setSuper_column((String)value);
+ }
+ break;
+
+ case COLUMN:
+ if (value == null) {
+ unsetColumn();
+ } else {
+ setColumn((String)value);
+ }
+ break;
+
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ public Object getFieldValue(int fieldID) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ return getColumn_family();
+
+ case SUPER_COLUMN:
+ return getSuper_column();
+
+ case COLUMN:
+ return getColumn();
+
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
+ public boolean isSet(int fieldID) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ return isSetColumn_family();
+ case SUPER_COLUMN:
+ return isSetSuper_column();
+ case COLUMN:
+ return isSetColumn();
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof ColumnPath)
+ return this.equals((ColumnPath)that);
+ return false;
+ }
+
+ public boolean equals(ColumnPath that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_column_family = true && this.isSetColumn_family();
+ boolean that_present_column_family = true && that.isSetColumn_family();
+ if (this_present_column_family || that_present_column_family) {
+ if (!(this_present_column_family && that_present_column_family))
+ return false;
+ if (!this.column_family.equals(that.column_family))
+ return false;
+ }
+
+ boolean this_present_super_column = true && this.isSetSuper_column();
+ boolean that_present_super_column = true && that.isSetSuper_column();
+ if (this_present_super_column || that_present_super_column) {
+ if (!(this_present_super_column && that_present_super_column))
+ return false;
+ if (!this.super_column.equals(that.super_column))
+ return false;
+ }
+
+ boolean this_present_column = true && this.isSetColumn();
+ boolean that_present_column = true && that.isSetColumn();
+ if (this_present_column || that_present_column) {
+ if (!(this_present_column && that_present_column))
+ return false;
+ if (!this.column.equals(that.column))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ public void read(TProtocol iprot) throws TException {
+ TField field;
+ iprot.readStructBegin();
+ while (true)
+ {
+ field = iprot.readFieldBegin();
+ if (field.type == TType.STOP) {
+ break;
+ }
+ switch (field.id)
+ {
+ case COLUMN_FAMILY:
+ if (field.type == TType.STRING) {
+ this.column_family = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case SUPER_COLUMN:
+ if (field.type == TType.STRING) {
+ this.super_column = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case COLUMN:
+ if (field.type == TType.STRING) {
+ this.column = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
+ break;
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ validate();
+ }
+
+ public void write(TProtocol oprot) throws TException {
+ validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (this.column_family != null) {
+ oprot.writeFieldBegin(COLUMN_FAMILY_FIELD_DESC);
+ oprot.writeString(this.column_family);
+ oprot.writeFieldEnd();
+ }
+ if (this.super_column != null) {
+ oprot.writeFieldBegin(SUPER_COLUMN_FIELD_DESC);
+ oprot.writeString(this.super_column);
+ oprot.writeFieldEnd();
+ }
+ if (this.column != null) {
+ oprot.writeFieldBegin(COLUMN_FIELD_DESC);
+ oprot.writeString(this.column);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("ColumnPath(");
+ boolean first = true;
+
+ sb.append("column_family:");
+ if (this.column_family == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.column_family);
+ }
+ first = false;
+ if (isSetSuper_column()) {
+ if (!first) sb.append(", ");
+ sb.append("super_column:");
+ if (this.super_column == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.super_column);
+ }
+ first = false;
+ }
+ if (!first) sb.append(", ");
+ sb.append("column:");
+ if (this.column == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.column);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws TException {
+ // check for required fields
+ // check that fields of type enum have valid values
+ }
+
+}
+
Added: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPathOrParent.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPathOrParent.java?rev=794429&view=auto
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPathOrParent.java (added)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPathOrParent.java Wed Jul 15 22:04:43 2009
@@ -0,0 +1,373 @@
+/**
+ * Autogenerated by Thrift
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.cassandra.service;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+import org.apache.log4j.Logger;
+
+import org.apache.thrift.*;
+import org.apache.thrift.meta_data.*;
+import org.apache.thrift.protocol.*;
+
+public class ColumnPathOrParent implements TBase, java.io.Serializable, Cloneable {
+ private static final TStruct STRUCT_DESC = new TStruct("ColumnPathOrParent");
+ private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("column_family", TType.STRING, (short)3);
+ private static final TField SUPER_COLUMN_FIELD_DESC = new TField("super_column", TType.STRING, (short)4);
+ private static final TField COLUMN_FIELD_DESC = new TField("column", TType.STRING, (short)5);
+
+ public String column_family;
+ public static final int COLUMN_FAMILY = 3;
+ public String super_column;
+ public static final int SUPER_COLUMN = 4;
+ public String column;
+ public static final int COLUMN = 5;
+
+ private final Isset __isset = new Isset();
+ private static final class Isset implements java.io.Serializable {
+ }
+
+ public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
+ put(COLUMN_FAMILY, new FieldMetaData("column_family", TFieldRequirementType.DEFAULT,
+ new FieldValueMetaData(TType.STRING)));
+ put(SUPER_COLUMN, new FieldMetaData("super_column", TFieldRequirementType.OPTIONAL,
+ new FieldValueMetaData(TType.STRING)));
+ put(COLUMN, new FieldMetaData("column", TFieldRequirementType.OPTIONAL,
+ new FieldValueMetaData(TType.STRING)));
+ }});
+
+ static {
+ FieldMetaData.addStructMetaDataMap(ColumnPathOrParent.class, metaDataMap);
+ }
+
+ public ColumnPathOrParent() {
+ }
+
+ public ColumnPathOrParent(
+ String column_family,
+ String super_column,
+ String column)
+ {
+ this();
+ this.column_family = column_family;
+ this.super_column = super_column;
+ this.column = column;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public ColumnPathOrParent(ColumnPathOrParent other) {
+ if (other.isSetColumn_family()) {
+ this.column_family = other.column_family;
+ }
+ if (other.isSetSuper_column()) {
+ this.super_column = other.super_column;
+ }
+ if (other.isSetColumn()) {
+ this.column = other.column;
+ }
+ }
+
+ @Override
+ public ColumnPathOrParent clone() {
+ return new ColumnPathOrParent(this);
+ }
+
+ public String getColumn_family() {
+ return this.column_family;
+ }
+
+ public void setColumn_family(String column_family) {
+ this.column_family = column_family;
+ }
+
+ public void unsetColumn_family() {
+ this.column_family = null;
+ }
+
+ // Returns true if field column_family is set (has been asigned a value) and false otherwise
+ public boolean isSetColumn_family() {
+ return this.column_family != null;
+ }
+
+ public void setColumn_familyIsSet(boolean value) {
+ if (!value) {
+ this.column_family = null;
+ }
+ }
+
+ public String getSuper_column() {
+ return this.super_column;
+ }
+
+ public void setSuper_column(String super_column) {
+ this.super_column = super_column;
+ }
+
+ public void unsetSuper_column() {
+ this.super_column = null;
+ }
+
+ // Returns true if field super_column is set (has been asigned a value) and false otherwise
+ public boolean isSetSuper_column() {
+ return this.super_column != null;
+ }
+
+ public void setSuper_columnIsSet(boolean value) {
+ if (!value) {
+ this.super_column = null;
+ }
+ }
+
+ public String getColumn() {
+ return this.column;
+ }
+
+ public void setColumn(String column) {
+ this.column = column;
+ }
+
+ public void unsetColumn() {
+ this.column = null;
+ }
+
+ // Returns true if field column is set (has been asigned a value) and false otherwise
+ public boolean isSetColumn() {
+ return this.column != null;
+ }
+
+ public void setColumnIsSet(boolean value) {
+ if (!value) {
+ this.column = null;
+ }
+ }
+
+ public void setFieldValue(int fieldID, Object value) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ if (value == null) {
+ unsetColumn_family();
+ } else {
+ setColumn_family((String)value);
+ }
+ break;
+
+ case SUPER_COLUMN:
+ if (value == null) {
+ unsetSuper_column();
+ } else {
+ setSuper_column((String)value);
+ }
+ break;
+
+ case COLUMN:
+ if (value == null) {
+ unsetColumn();
+ } else {
+ setColumn((String)value);
+ }
+ break;
+
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ public Object getFieldValue(int fieldID) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ return getColumn_family();
+
+ case SUPER_COLUMN:
+ return getSuper_column();
+
+ case COLUMN:
+ return getColumn();
+
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
+ public boolean isSet(int fieldID) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ return isSetColumn_family();
+ case SUPER_COLUMN:
+ return isSetSuper_column();
+ case COLUMN:
+ return isSetColumn();
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof ColumnPathOrParent)
+ return this.equals((ColumnPathOrParent)that);
+ return false;
+ }
+
+ public boolean equals(ColumnPathOrParent that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_column_family = true && this.isSetColumn_family();
+ boolean that_present_column_family = true && that.isSetColumn_family();
+ if (this_present_column_family || that_present_column_family) {
+ if (!(this_present_column_family && that_present_column_family))
+ return false;
+ if (!this.column_family.equals(that.column_family))
+ return false;
+ }
+
+ boolean this_present_super_column = true && this.isSetSuper_column();
+ boolean that_present_super_column = true && that.isSetSuper_column();
+ if (this_present_super_column || that_present_super_column) {
+ if (!(this_present_super_column && that_present_super_column))
+ return false;
+ if (!this.super_column.equals(that.super_column))
+ return false;
+ }
+
+ boolean this_present_column = true && this.isSetColumn();
+ boolean that_present_column = true && that.isSetColumn();
+ if (this_present_column || that_present_column) {
+ if (!(this_present_column && that_present_column))
+ return false;
+ if (!this.column.equals(that.column))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ public void read(TProtocol iprot) throws TException {
+ TField field;
+ iprot.readStructBegin();
+ while (true)
+ {
+ field = iprot.readFieldBegin();
+ if (field.type == TType.STOP) {
+ break;
+ }
+ switch (field.id)
+ {
+ case COLUMN_FAMILY:
+ if (field.type == TType.STRING) {
+ this.column_family = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case SUPER_COLUMN:
+ if (field.type == TType.STRING) {
+ this.super_column = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case COLUMN:
+ if (field.type == TType.STRING) {
+ this.column = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
+ break;
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ validate();
+ }
+
+ public void write(TProtocol oprot) throws TException {
+ validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (this.column_family != null) {
+ oprot.writeFieldBegin(COLUMN_FAMILY_FIELD_DESC);
+ oprot.writeString(this.column_family);
+ oprot.writeFieldEnd();
+ }
+ if (this.super_column != null) {
+ oprot.writeFieldBegin(SUPER_COLUMN_FIELD_DESC);
+ oprot.writeString(this.super_column);
+ oprot.writeFieldEnd();
+ }
+ if (this.column != null) {
+ oprot.writeFieldBegin(COLUMN_FIELD_DESC);
+ oprot.writeString(this.column);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("ColumnPathOrParent(");
+ boolean first = true;
+
+ sb.append("column_family:");
+ if (this.column_family == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.column_family);
+ }
+ first = false;
+ if (isSetSuper_column()) {
+ if (!first) sb.append(", ");
+ sb.append("super_column:");
+ if (this.super_column == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.super_column);
+ }
+ first = false;
+ }
+ if (isSetColumn()) {
+ if (!first) sb.append(", ");
+ sb.append("column:");
+ if (this.column == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.column);
+ }
+ first = false;
+ }
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws TException {
+ // check for required fields
+ // check that fields of type enum have valid values
+ }
+
+}
+
Added: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/CqlResult.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/CqlResult.java?rev=794429&view=auto
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/CqlResult.java (added)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/CqlResult.java Wed Jul 15 22:04:43 2009
@@ -0,0 +1,414 @@
+/**
+ * Autogenerated by Thrift
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.cassandra.service;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+import org.apache.log4j.Logger;
+
+import org.apache.thrift.*;
+import org.apache.thrift.meta_data.*;
+import org.apache.thrift.protocol.*;
+
+public class CqlResult implements TBase, java.io.Serializable, Cloneable {
+ private static final TStruct STRUCT_DESC = new TStruct("CqlResult");
+ private static final TField ERROR_CODE_FIELD_DESC = new TField("error_code", TType.I32, (short)1);
+ private static final TField ERROR_TXT_FIELD_DESC = new TField("error_txt", TType.STRING, (short)2);
+ private static final TField RESULT_SET_FIELD_DESC = new TField("result_set", TType.LIST, (short)3);
+
+ public int error_code;
+ public static final int ERROR_CODE = 1;
+ public String error_txt;
+ public static final int ERROR_TXT = 2;
+ public List<Map<String,String>> result_set;
+ public static final int RESULT_SET = 3;
+
+ private final Isset __isset = new Isset();
+ private static final class Isset implements java.io.Serializable {
+ public boolean error_code = false;
+ }
+
+ public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
+ put(ERROR_CODE, new FieldMetaData("error_code", TFieldRequirementType.DEFAULT,
+ new FieldValueMetaData(TType.I32)));
+ put(ERROR_TXT, new FieldMetaData("error_txt", TFieldRequirementType.DEFAULT,
+ new FieldValueMetaData(TType.STRING)));
+ put(RESULT_SET, new FieldMetaData("result_set", TFieldRequirementType.DEFAULT,
+ new FieldValueMetaData(TType.LIST)));
+ }});
+
+ static {
+ FieldMetaData.addStructMetaDataMap(CqlResult.class, metaDataMap);
+ }
+
+ public CqlResult() {
+ }
+
+ public CqlResult(
+ int error_code,
+ String error_txt,
+ List<Map<String,String>> result_set)
+ {
+ this();
+ this.error_code = error_code;
+ this.__isset.error_code = true;
+ this.error_txt = error_txt;
+ this.result_set = result_set;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public CqlResult(CqlResult other) {
+ __isset.error_code = other.__isset.error_code;
+ this.error_code = other.error_code;
+ if (other.isSetError_txt()) {
+ this.error_txt = other.error_txt;
+ }
+ if (other.isSetResult_set()) {
+ this.result_set = other.result_set;
+ }
+ }
+
+ @Override
+ public CqlResult clone() {
+ return new CqlResult(this);
+ }
+
+ public int getError_code() {
+ return this.error_code;
+ }
+
+ public void setError_code(int error_code) {
+ this.error_code = error_code;
+ this.__isset.error_code = true;
+ }
+
+ public void unsetError_code() {
+ this.__isset.error_code = false;
+ }
+
+ // Returns true if field error_code is set (has been asigned a value) and false otherwise
+ public boolean isSetError_code() {
+ return this.__isset.error_code;
+ }
+
+ public void setError_codeIsSet(boolean value) {
+ this.__isset.error_code = value;
+ }
+
+ public String getError_txt() {
+ return this.error_txt;
+ }
+
+ public void setError_txt(String error_txt) {
+ this.error_txt = error_txt;
+ }
+
+ public void unsetError_txt() {
+ this.error_txt = null;
+ }
+
+ // Returns true if field error_txt is set (has been asigned a value) and false otherwise
+ public boolean isSetError_txt() {
+ return this.error_txt != null;
+ }
+
+ public void setError_txtIsSet(boolean value) {
+ if (!value) {
+ this.error_txt = null;
+ }
+ }
+
+ public int getResult_setSize() {
+ return (this.result_set == null) ? 0 : this.result_set.size();
+ }
+
+ public java.util.Iterator<Map<String,String>> getResult_setIterator() {
+ return (this.result_set == null) ? null : this.result_set.iterator();
+ }
+
+ public void addToResult_set(Map<String,String> elem) {
+ if (this.result_set == null) {
+ this.result_set = new ArrayList<Map<String,String>>();
+ }
+ this.result_set.add(elem);
+ }
+
+ public List<Map<String,String>> getResult_set() {
+ return this.result_set;
+ }
+
+ public void setResult_set(List<Map<String,String>> result_set) {
+ this.result_set = result_set;
+ }
+
+ public void unsetResult_set() {
+ this.result_set = null;
+ }
+
+ // Returns true if field result_set is set (has been asigned a value) and false otherwise
+ public boolean isSetResult_set() {
+ return this.result_set != null;
+ }
+
+ public void setResult_setIsSet(boolean value) {
+ if (!value) {
+ this.result_set = null;
+ }
+ }
+
+ public void setFieldValue(int fieldID, Object value) {
+ switch (fieldID) {
+ case ERROR_CODE:
+ if (value == null) {
+ unsetError_code();
+ } else {
+ setError_code((Integer)value);
+ }
+ break;
+
+ case ERROR_TXT:
+ if (value == null) {
+ unsetError_txt();
+ } else {
+ setError_txt((String)value);
+ }
+ break;
+
+ case RESULT_SET:
+ if (value == null) {
+ unsetResult_set();
+ } else {
+ setResult_set((List<Map<String,String>>)value);
+ }
+ break;
+
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ public Object getFieldValue(int fieldID) {
+ switch (fieldID) {
+ case ERROR_CODE:
+ return new Integer(getError_code());
+
+ case ERROR_TXT:
+ return getError_txt();
+
+ case RESULT_SET:
+ return getResult_set();
+
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
+ public boolean isSet(int fieldID) {
+ switch (fieldID) {
+ case ERROR_CODE:
+ return isSetError_code();
+ case ERROR_TXT:
+ return isSetError_txt();
+ case RESULT_SET:
+ return isSetResult_set();
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof CqlResult)
+ return this.equals((CqlResult)that);
+ return false;
+ }
+
+ public boolean equals(CqlResult that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_error_code = true;
+ boolean that_present_error_code = true;
+ if (this_present_error_code || that_present_error_code) {
+ if (!(this_present_error_code && that_present_error_code))
+ return false;
+ if (this.error_code != that.error_code)
+ return false;
+ }
+
+ boolean this_present_error_txt = true && this.isSetError_txt();
+ boolean that_present_error_txt = true && that.isSetError_txt();
+ if (this_present_error_txt || that_present_error_txt) {
+ if (!(this_present_error_txt && that_present_error_txt))
+ return false;
+ if (!this.error_txt.equals(that.error_txt))
+ return false;
+ }
+
+ boolean this_present_result_set = true && this.isSetResult_set();
+ boolean that_present_result_set = true && that.isSetResult_set();
+ if (this_present_result_set || that_present_result_set) {
+ if (!(this_present_result_set && that_present_result_set))
+ return false;
+ if (!this.result_set.equals(that.result_set))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ public void read(TProtocol iprot) throws TException {
+ TField field;
+ iprot.readStructBegin();
+ while (true)
+ {
+ field = iprot.readFieldBegin();
+ if (field.type == TType.STOP) {
+ break;
+ }
+ switch (field.id)
+ {
+ case ERROR_CODE:
+ if (field.type == TType.I32) {
+ this.error_code = iprot.readI32();
+ this.__isset.error_code = true;
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case ERROR_TXT:
+ if (field.type == TType.STRING) {
+ this.error_txt = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case RESULT_SET:
+ if (field.type == TType.LIST) {
+ {
+ TList _list22 = iprot.readListBegin();
+ this.result_set = new ArrayList<Map<String,String>>(_list22.size);
+ for (int _i23 = 0; _i23 < _list22.size; ++_i23)
+ {
+ Map<String,String> _elem24;
+ {
+ TMap _map25 = iprot.readMapBegin();
+ _elem24 = new HashMap<String,String>(2*_map25.size);
+ for (int _i26 = 0; _i26 < _map25.size; ++_i26)
+ {
+ String _key27;
+ String _val28;
+ _key27 = iprot.readString();
+ _val28 = iprot.readString();
+ _elem24.put(_key27, _val28);
+ }
+ iprot.readMapEnd();
+ }
+ this.result_set.add(_elem24);
+ }
+ iprot.readListEnd();
+ }
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
+ break;
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ validate();
+ }
+
+ public void write(TProtocol oprot) throws TException {
+ validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ oprot.writeFieldBegin(ERROR_CODE_FIELD_DESC);
+ oprot.writeI32(this.error_code);
+ oprot.writeFieldEnd();
+ if (this.error_txt != null) {
+ oprot.writeFieldBegin(ERROR_TXT_FIELD_DESC);
+ oprot.writeString(this.error_txt);
+ oprot.writeFieldEnd();
+ }
+ if (this.result_set != null) {
+ oprot.writeFieldBegin(RESULT_SET_FIELD_DESC);
+ {
+ oprot.writeListBegin(new TList(TType.MAP, this.result_set.size()));
+ for (Map<String,String> _iter29 : this.result_set) {
+ {
+ oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, _iter29.size()));
+ for (Map.Entry<String, String> _iter30 : _iter29.entrySet()) {
+ oprot.writeString(_iter30.getKey());
+ oprot.writeString(_iter30.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("CqlResult(");
+ boolean first = true;
+
+ sb.append("error_code:");
+ sb.append(this.error_code);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("error_txt:");
+ if (this.error_txt == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.error_txt);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("result_set:");
+ if (this.result_set == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.result_set);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws TException {
+ // check for required fields
+ // check that fields of type enum have valid values
+ }
+
+}
+
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java Wed Jul 15 22:04:43 2009
@@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
-/*
- *
- * 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 java.util.List;
import java.util.ArrayList;
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java Wed Jul 15 22:04:43 2009
@@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
-/*
- *
- * 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 java.util.List;
import java.util.ArrayList;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java (from r794079, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java&r1=794079&r2=794429&rev=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java Wed Jul 15 22:04:43 2009
@@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
-/*
- *
- * 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 java.util.List;
import java.util.ArrayList;
@@ -39,14 +18,14 @@
import org.apache.thrift.meta_data.*;
import org.apache.thrift.protocol.*;
-public class superColumn_t implements TBase, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("superColumn_t");
+public class SuperColumn implements TBase, java.io.Serializable, Cloneable {
+ private static final TStruct STRUCT_DESC = new TStruct("SuperColumn");
private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short)1);
private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)2);
public String name;
public static final int NAME = 1;
- public List<column_t> columns;
+ public List<Column> columns;
public static final int COLUMNS = 2;
private final Isset __isset = new Isset();
@@ -58,19 +37,19 @@
new FieldValueMetaData(TType.STRING)));
put(COLUMNS, new FieldMetaData("columns", TFieldRequirementType.DEFAULT,
new ListMetaData(TType.LIST,
- new StructMetaData(TType.STRUCT, column_t.class))));
+ new StructMetaData(TType.STRUCT, Column.class))));
}});
static {
- FieldMetaData.addStructMetaDataMap(superColumn_t.class, metaDataMap);
+ FieldMetaData.addStructMetaDataMap(SuperColumn.class, metaDataMap);
}
- public superColumn_t() {
+ public SuperColumn() {
}
- public superColumn_t(
+ public SuperColumn(
String name,
- List<column_t> columns)
+ List<Column> columns)
{
this();
this.name = name;
@@ -80,22 +59,22 @@
/**
* Performs a deep copy on <i>other</i>.
*/
- public superColumn_t(superColumn_t other) {
+ public SuperColumn(SuperColumn other) {
if (other.isSetName()) {
this.name = other.name;
}
if (other.isSetColumns()) {
- List<column_t> __this__columns = new ArrayList<column_t>();
- for (column_t other_element : other.columns) {
- __this__columns.add(new column_t(other_element));
+ List<Column> __this__columns = new ArrayList<Column>();
+ for (Column other_element : other.columns) {
+ __this__columns.add(new Column(other_element));
}
this.columns = __this__columns;
}
}
@Override
- public superColumn_t clone() {
- return new superColumn_t(this);
+ public SuperColumn clone() {
+ return new SuperColumn(this);
}
public String getName() {
@@ -125,22 +104,22 @@
return (this.columns == null) ? 0 : this.columns.size();
}
- public java.util.Iterator<column_t> getColumnsIterator() {
+ public java.util.Iterator<Column> getColumnsIterator() {
return (this.columns == null) ? null : this.columns.iterator();
}
- public void addToColumns(column_t elem) {
+ public void addToColumns(Column elem) {
if (this.columns == null) {
- this.columns = new ArrayList<column_t>();
+ this.columns = new ArrayList<Column>();
}
this.columns.add(elem);
}
- public List<column_t> getColumns() {
+ public List<Column> getColumns() {
return this.columns;
}
- public void setColumns(List<column_t> columns) {
+ public void setColumns(List<Column> columns) {
this.columns = columns;
}
@@ -173,7 +152,7 @@
if (value == null) {
unsetColumns();
} else {
- setColumns((List<column_t>)value);
+ setColumns((List<Column>)value);
}
break;
@@ -211,12 +190,12 @@
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof superColumn_t)
- return this.equals((superColumn_t)that);
+ if (that instanceof SuperColumn)
+ return this.equals((SuperColumn)that);
return false;
}
- public boolean equals(superColumn_t that) {
+ public boolean equals(SuperColumn that) {
if (that == null)
return false;
@@ -268,11 +247,11 @@
if (field.type == TType.LIST) {
{
TList _list9 = iprot.readListBegin();
- this.columns = new ArrayList<column_t>(_list9.size);
+ this.columns = new ArrayList<Column>(_list9.size);
for (int _i10 = 0; _i10 < _list9.size; ++_i10)
{
- column_t _elem11;
- _elem11 = new column_t();
+ Column _elem11;
+ _elem11 = new Column();
_elem11.read(iprot);
this.columns.add(_elem11);
}
@@ -308,7 +287,7 @@
oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.columns.size()));
- for (column_t _iter12 : this.columns) {
+ for (Column _iter12 : this.columns) {
_iter12.write(oprot);
}
oprot.writeListEnd();
@@ -321,7 +300,7 @@
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("superColumn_t(");
+ StringBuilder sb = new StringBuilder("SuperColumn(");
boolean first = true;
sb.append("name:");
Added: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumnPath.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumnPath.java?rev=794429&view=auto
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumnPath.java (added)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumnPath.java Wed Jul 15 22:04:43 2009
@@ -0,0 +1,294 @@
+/**
+ * Autogenerated by Thrift
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ */
+package org.apache.cassandra.service;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+import org.apache.log4j.Logger;
+
+import org.apache.thrift.*;
+import org.apache.thrift.meta_data.*;
+import org.apache.thrift.protocol.*;
+
+public class SuperColumnPath implements TBase, java.io.Serializable, Cloneable {
+ private static final TStruct STRUCT_DESC = new TStruct("SuperColumnPath");
+ private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("column_family", TType.STRING, (short)3);
+ private static final TField SUPER_COLUMN_FIELD_DESC = new TField("super_column", TType.STRING, (short)4);
+
+ public String column_family;
+ public static final int COLUMN_FAMILY = 3;
+ public String super_column;
+ public static final int SUPER_COLUMN = 4;
+
+ private final Isset __isset = new Isset();
+ private static final class Isset implements java.io.Serializable {
+ }
+
+ public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
+ put(COLUMN_FAMILY, new FieldMetaData("column_family", TFieldRequirementType.DEFAULT,
+ new FieldValueMetaData(TType.STRING)));
+ put(SUPER_COLUMN, new FieldMetaData("super_column", TFieldRequirementType.DEFAULT,
+ new FieldValueMetaData(TType.STRING)));
+ }});
+
+ static {
+ FieldMetaData.addStructMetaDataMap(SuperColumnPath.class, metaDataMap);
+ }
+
+ public SuperColumnPath() {
+ }
+
+ public SuperColumnPath(
+ String column_family,
+ String super_column)
+ {
+ this();
+ this.column_family = column_family;
+ this.super_column = super_column;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public SuperColumnPath(SuperColumnPath other) {
+ if (other.isSetColumn_family()) {
+ this.column_family = other.column_family;
+ }
+ if (other.isSetSuper_column()) {
+ this.super_column = other.super_column;
+ }
+ }
+
+ @Override
+ public SuperColumnPath clone() {
+ return new SuperColumnPath(this);
+ }
+
+ public String getColumn_family() {
+ return this.column_family;
+ }
+
+ public void setColumn_family(String column_family) {
+ this.column_family = column_family;
+ }
+
+ public void unsetColumn_family() {
+ this.column_family = null;
+ }
+
+ // Returns true if field column_family is set (has been asigned a value) and false otherwise
+ public boolean isSetColumn_family() {
+ return this.column_family != null;
+ }
+
+ public void setColumn_familyIsSet(boolean value) {
+ if (!value) {
+ this.column_family = null;
+ }
+ }
+
+ public String getSuper_column() {
+ return this.super_column;
+ }
+
+ public void setSuper_column(String super_column) {
+ this.super_column = super_column;
+ }
+
+ public void unsetSuper_column() {
+ this.super_column = null;
+ }
+
+ // Returns true if field super_column is set (has been asigned a value) and false otherwise
+ public boolean isSetSuper_column() {
+ return this.super_column != null;
+ }
+
+ public void setSuper_columnIsSet(boolean value) {
+ if (!value) {
+ this.super_column = null;
+ }
+ }
+
+ public void setFieldValue(int fieldID, Object value) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ if (value == null) {
+ unsetColumn_family();
+ } else {
+ setColumn_family((String)value);
+ }
+ break;
+
+ case SUPER_COLUMN:
+ if (value == null) {
+ unsetSuper_column();
+ } else {
+ setSuper_column((String)value);
+ }
+ break;
+
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ public Object getFieldValue(int fieldID) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ return getColumn_family();
+
+ case SUPER_COLUMN:
+ return getSuper_column();
+
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
+ public boolean isSet(int fieldID) {
+ switch (fieldID) {
+ case COLUMN_FAMILY:
+ return isSetColumn_family();
+ case SUPER_COLUMN:
+ return isSetSuper_column();
+ default:
+ throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
+ }
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof SuperColumnPath)
+ return this.equals((SuperColumnPath)that);
+ return false;
+ }
+
+ public boolean equals(SuperColumnPath that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_column_family = true && this.isSetColumn_family();
+ boolean that_present_column_family = true && that.isSetColumn_family();
+ if (this_present_column_family || that_present_column_family) {
+ if (!(this_present_column_family && that_present_column_family))
+ return false;
+ if (!this.column_family.equals(that.column_family))
+ return false;
+ }
+
+ boolean this_present_super_column = true && this.isSetSuper_column();
+ boolean that_present_super_column = true && that.isSetSuper_column();
+ if (this_present_super_column || that_present_super_column) {
+ if (!(this_present_super_column && that_present_super_column))
+ return false;
+ if (!this.super_column.equals(that.super_column))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ public void read(TProtocol iprot) throws TException {
+ TField field;
+ iprot.readStructBegin();
+ while (true)
+ {
+ field = iprot.readFieldBegin();
+ if (field.type == TType.STOP) {
+ break;
+ }
+ switch (field.id)
+ {
+ case COLUMN_FAMILY:
+ if (field.type == TType.STRING) {
+ this.column_family = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ case SUPER_COLUMN:
+ if (field.type == TType.STRING) {
+ this.super_column = iprot.readString();
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
+ default:
+ TProtocolUtil.skip(iprot, field.type);
+ break;
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ validate();
+ }
+
+ public void write(TProtocol oprot) throws TException {
+ validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (this.column_family != null) {
+ oprot.writeFieldBegin(COLUMN_FAMILY_FIELD_DESC);
+ oprot.writeString(this.column_family);
+ oprot.writeFieldEnd();
+ }
+ if (this.super_column != null) {
+ oprot.writeFieldBegin(SUPER_COLUMN_FIELD_DESC);
+ oprot.writeString(this.super_column);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("SuperColumnPath(");
+ boolean first = true;
+
+ sb.append("column_family:");
+ if (this.column_family == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.column_family);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("super_column:");
+ if (this.super_column == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.super_column);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws TException {
+ // check for required fields
+ // check that fields of type enum have valid values
+ }
+
+}
+
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java Wed Jul 15 22:04:43 2009
@@ -4,27 +4,6 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
-/*
- *
- * 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 java.util.List;
import java.util.ArrayList;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java Wed Jul 15 22:04:43 2009
@@ -134,14 +134,14 @@
if (columnSpecCnt == 0)
{
// table.cf['key']
- List<column_t> columns = new ArrayList<column_t>();
- columns = thriftClient_.get_slice(tableName, key, columnFamily, "", "", true, 0, 1000000);
+ List<Column> columns = new ArrayList<Column>();
+ columns = thriftClient_.get_slice(tableName, key, new ColumnParent(columnFamily, null), "", "", true, 0, 1000000);
int size = columns.size();
- for (Iterator<column_t> colIter = columns.iterator(); colIter.hasNext(); )
+ for (Iterator<Column> colIter = columns.iterator(); colIter.hasNext(); )
{
- column_t col = colIter.next();
+ Column col = colIter.next();
css_.out.printf(" (column=%s, value=%s; timestamp=%d)\n",
- col.columnName, col.value, col.timestamp);
+ col.column_name, col.value, col.timestamp);
}
css_.out.println("Returned " + size + " rows.");
}
@@ -149,10 +149,10 @@
{
// table.cf['key']['column']
String columnName = CliCompiler.getColumn(columnFamilySpec, 0);
- column_t col = new column_t();
- col = thriftClient_.get_column(tableName, key, columnFamily + ":" + columnName);
+ Column col = new Column();
+ col = thriftClient_.get_column(tableName, key, new ColumnPath(columnFamily, null, columnName));
css_.out.printf("==> (name=%s, value=%s; timestamp=%d)\n",
- col.columnName, col.value, col.timestamp);
+ col.column_name, col.value, col.timestamp);
}
else
{
@@ -187,7 +187,7 @@
String columnName = CliCompiler.getColumn(columnFamilySpec, 0);
// do the insert
- thriftClient_.insert(tableName, key, columnFamily + ":" + columnName,
+ thriftClient_.insert(tableName, key, new ColumnPath(columnFamily, null, columnName),
value.getBytes(), System.currentTimeMillis(), 1);
css_.out.println("Value inserted.");
@@ -285,7 +285,7 @@
if (!CliMain.isConnected())
return;
- CqlResult_t result = thriftClient_.executeQuery(query);
+ CqlResult result = thriftClient_.executeQuery(query);
if (result == null)
{
@@ -293,13 +293,13 @@
return;
}
- if ((result.errorTxt != null) || (result.errorCode != 0))
+ if ((result.error_txt != null) || (result.error_code != 0))
{
- css_.out.println("Error: " + result.errorTxt);
+ css_.out.println("Error: " + result.error_txt);
}
else
{
- List<Map<String, String>> rows = result.resultSet;
+ List<Map<String, String>> rows = result.result_set;
if (rows != null)
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Wed Jul 15 22:04:43 2009
@@ -71,7 +71,7 @@
private static String d_columnMap_ = "COLUMN_MAP";
private static String d_columnKey_ = "COLUMN_KEY";
private static String d_columnValue_ = "COLUMN_VALUE";
- private static String d_columnTimestamp_ = "COLUMN_TIMESTAMP";
+ private static String d_columnTimestamp_ = "ColumnIMESTAMP";
private static Map<String, Double> tableKeysCachedFractions_;
/*
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java Wed Jul 15 22:04:43 2009
@@ -27,6 +27,7 @@
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.cql.execution.RuntimeErrorMsg;
import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.LogUtil;
@@ -80,24 +81,24 @@
public List<Map<String,String>> getRows()
{
- String columnFamily_column;
- String superColumnKey = null;
+ QueryPath path;
+ String superColumnKey = null;
if (superColumnKey_ != null)
{
superColumnKey = (String)(superColumnKey_.get());
- columnFamily_column = cfMetaData_.cfName + ":" + superColumnKey;
+ path = new QueryPath(cfMetaData_.cfName, superColumnKey);
}
else
{
- columnFamily_column = cfMetaData_.cfName;
+ path = new QueryPath(cfMetaData_.cfName);
}
Row row = null;
try
{
String key = (String)(rowKey_.get());
- ReadCommand readCommand = new SliceFromReadCommand(cfMetaData_.tableName, key, columnFamily_column, "", "", true, offset_, limit_);
+ ReadCommand readCommand = new SliceFromReadCommand(cfMetaData_.tableName, key, path, "", "", true, offset_, limit_);
row = StorageProxy.readProtocol(readCommand, StorageService.ConsistencyLevel.WEAK);
}
catch (Exception e)
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetColumnMap.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetColumnMap.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetColumnMap.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetColumnMap.java Wed Jul 15 22:04:43 2009
@@ -26,6 +26,7 @@
import org.apache.log4j.Logger;
import org.apache.cassandra.cql.execution.*;
import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.service.*;
/**
@@ -69,18 +70,6 @@
public CqlResult execute()
{
- String columnFamily_column;
-
- if (superColumnKey_ != null)
- {
- String superColumnKey = (String)(superColumnKey_.get());
- columnFamily_column = cfMetaData_.cfName + ":" + superColumnKey + ":";
- }
- else
- {
- columnFamily_column = cfMetaData_.cfName + ":";
- }
-
try
{
RowMutation rm = new RowMutation(cfMetaData_.tableName, (String)(rowKey_.get()));
@@ -91,7 +80,18 @@
OperandDef columnKey = entry.getFirst();
OperandDef value = entry.getSecond();
- rm.add(columnFamily_column + (String)(columnKey.get()), ((String)value.get()).getBytes(), time);
+ QueryPath path;
+ if (superColumnKey_ != null)
+ {
+ String superColumnKey = (String)(superColumnKey_.get());
+ path = new QueryPath(cfMetaData_.cfName, superColumnKey, (String)columnKey.get());
+ }
+ else
+ {
+ path = new QueryPath(cfMetaData_.cfName, null, (String)columnKey.get());
+ }
+
+ rm.add(path, ((String)value.get()).getBytes(), time);
}
StorageProxy.insert(rm);
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetSuperColumnMap.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetSuperColumnMap.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetSuperColumnMap.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetSuperColumnMap.java Wed Jul 15 22:04:43 2009
@@ -21,6 +21,7 @@
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.cql.execution.RuntimeErrorMsg;
import org.apache.cassandra.db.RowMutation;
+import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
@@ -62,13 +63,12 @@
OperandDef superColumnKey = superColumn.getFirst();
ColumnMapExpr columnMapExpr = superColumn.getSecond();
- String columnFamily_column = cfMetaData_.cfName + ":" + (String)(superColumnKey.get()) + ":";
-
for (Pair<OperandDef, OperandDef> entry : columnMapExpr)
{
OperandDef columnKey = entry.getFirst();
OperandDef value = entry.getSecond();
- rm.add(columnFamily_column + (String)(columnKey.get()), ((String)value.get()).getBytes(), time);
+ QueryPath path = new QueryPath(cfMetaData_.cfName, (String)(superColumnKey.get()), (String)(columnKey.get()));
+ rm.add(path, ((String)value.get()).getBytes(), time);
}
}
StorageProxy.insert(rm);
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetUniqueKey.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetUniqueKey.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetUniqueKey.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetUniqueKey.java Wed Jul 15 22:04:43 2009
@@ -21,6 +21,7 @@
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.cql.execution.RuntimeErrorMsg;
import org.apache.cassandra.db.RowMutation;
+import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.utils.LogUtil;
import org.apache.log4j.Logger;
@@ -71,22 +72,22 @@
public CqlResult execute()
{
String columnKey = (String)(columnKey_.get());
- String columnFamily_column;
+ QueryPath path;
if (superColumnKey_ != null)
{
String superColumnKey = (String)(superColumnKey_.get());
- columnFamily_column = cfMetaData_.cfName + ":" + superColumnKey + ":" + columnKey;
+ path = new QueryPath(cfMetaData_.cfName, superColumnKey, columnKey);
}
else
{
- columnFamily_column = cfMetaData_.cfName + ":" + columnKey;
+ path = new QueryPath(cfMetaData_.cfName, null, columnKey);
}
try
{
RowMutation rm = new RowMutation(cfMetaData_.tableName, (String)(rowKey_.get()));
- rm.add(columnFamily_column, ((String)value_.get()).getBytes(), System.currentTimeMillis());
+ rm.add(path, ((String)value_.get()).getBytes(), System.currentTimeMillis());
StorageProxy.insert(rm);
}
catch (Exception e)
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java Wed Jul 15 22:04:43 2009
@@ -27,6 +27,7 @@
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.cql.execution.RuntimeErrorMsg;
import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.LogUtil;
@@ -66,7 +67,7 @@
try
{
String key = (String)(rowKey_.get());
- ReadCommand readCommand = new SliceFromReadCommand(cfMetaData_.tableName, key, cfMetaData_.cfName, "", "", true, offset_, limit_);
+ ReadCommand readCommand = new SliceFromReadCommand(cfMetaData_.tableName, key, new QueryPath(cfMetaData_.cfName), "", "", true, offset_, limit_);
row = StorageProxy.readProtocol(readCommand, StorageService.ConsistencyLevel.WEAK);
}
catch (Exception e)
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java Wed Jul 15 22:04:43 2009
@@ -18,19 +18,12 @@
package org.apache.cassandra.cql.common;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.List;
+import java.util.*;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.cql.execution.RuntimeErrorMsg;
-import org.apache.cassandra.db.ColumnFamily;
-import org.apache.cassandra.db.ColumnReadCommand;
-import org.apache.cassandra.db.IColumn;
-import org.apache.cassandra.db.Row;
-import org.apache.cassandra.db.ReadCommand;
+import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.LogUtil;
@@ -69,24 +62,24 @@
public List<Map<String,String>> getRows() throws RuntimeException
{
String columnKey = (String)(columnKey_.get());
- String columnFamily_column;
+ QueryPath path = null;
String superColumnKey = null;
if (superColumnKey_ != null)
{
superColumnKey = (String)(superColumnKey_.get());
- columnFamily_column = cfMetaData_.cfName + ":" + superColumnKey + ":" + columnKey;
+ path = new QueryPath(cfMetaData_.cfName, superColumnKey);
}
else
{
- columnFamily_column = cfMetaData_.cfName + ":" + columnKey;
+ path = new QueryPath(cfMetaData_.cfName);
}
Row row = null;
try
{
String key = (String)(rowKey_.get());
- ReadCommand readCommand = new ColumnReadCommand(cfMetaData_.tableName, key, columnFamily_column);
+ ReadCommand readCommand = new SliceByNamesReadCommand(cfMetaData_.tableName, key, path, Arrays.asList(columnKey));
row = StorageProxy.readProtocol(readCommand, StorageService.ConsistencyLevel.WEAK);
}
catch (Exception e)