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 [1/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...
Author: jbellis
Date: Wed Jul 15 22:04:43 2009
New Revision: 794429
URL: http://svn.apache.org/viewvc?rev=794429&view=rev
Log:
thrift changes to remove : api.
use ColumnPath, ColumnParent, etc. structs to encapsulate optional SuperColumns (and occasionally, optional Columns).
patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139
Added:
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.java
- copied, changed from r794079, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutationSuper.java
- copied, changed from r794079, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java
- copied, changed from r794079, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPathOrParent.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/CqlResult.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java
- copied, changed from r794079, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumnPath.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryPath.java
Removed:
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/CqlResult_t.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/AbstractColumnFactory.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnReadCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/test/DBTest.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/test/TestChoice.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/test/TestRunner.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/test/UtilsTest.java
Modified:
incubator/cassandra/trunk/CHANGES.txt
incubator/cassandra/trunk/interface/cassandra.thrift
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/ColumnRangeQueryRSD.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetColumnMap.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetSuperColumnMap.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SetUniqueKey.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/SuperColumnRangeQueryRSD.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/cql/common/UniqueKeyQueryRSD.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnsSinceReadCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/IdentityQueryFilter.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/TimeQueryFilter.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CommitLogTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/NameSortTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/service/CassandraServerTest.java
Modified: incubator/cassandra/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/CHANGES.txt?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/CHANGES.txt (original)
+++ incubator/cassandra/trunk/CHANGES.txt Wed Jul 15 22:04:43 2009
@@ -1,10 +1,14 @@
0.4 dev
- * Added columnFamily argument to get_key_range.
- * Change signature of get_slice and get_slice_super to accept
- starting and ending columns as well as an offset. (This allows use
- of indexes.) Added "ascending" flag to allow reasonably-efficient
- reverse scans as well. Removed get_slice_by_range as redundant.
- * Similarly, changed signature of get_slice_super.
+ * Thrift API has changed a _lot_:
+ - removed colon-delimited strings in thrift api in favor of explicit
+ structs such as ColumnPath, ColumnParent, etc. Also normalized
+ thrift struct and argument naming.
+ - Added columnFamily argument to get_key_range.
+ - Change signature of get_slice and get_slice_super to accept
+ starting and ending columns as well as an offset. (This allows use
+ of indexes.) Added "ascending" flag to allow reasonably-efficient
+ reverse scans as well. Removed get_slice_by_range as redundant.
+ - Similarly, changed signature of get_slice_super.
* Removed the web interface. Node information can now be obtained by
using the newly introduced nodeprobe utility.
Modified: incubator/cassandra/trunk/interface/cassandra.thrift
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/cassandra.thrift?rev=794429&r1=794428&r2=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/cassandra.thrift (original)
+++ incubator/cassandra/trunk/interface/cassandra.thrift Wed Jul 15 22:04:43 2009
@@ -30,40 +30,38 @@
# structures
#
-struct column_t {
- 1: string columnName,
+struct Column {
+ 1: string column_name,
2: binary value,
3: i64 timestamp,
}
-typedef map< string, list<column_t> > column_family_map
+typedef map<string, list<Column>> column_family_map
-struct batch_mutation_t {
- 1: string table,
- 2: string key,
- 3: column_family_map cfmap,
+struct BatchMutation {
+ 1: string key,
+ 2: column_family_map cfmap,
}
-struct superColumn_t {
+struct SuperColumn {
1: string name,
- 2: list<column_t> columns,
+ 2: list<Column> columns,
}
-typedef map< string, list<superColumn_t> > superColumn_family_map
+typedef map<string, list<SuperColumn>> SuperColumnFamilyMap
-struct batch_mutation_super_t {
- 1: string table,
- 2: string key,
- 3: superColumn_family_map cfmap,
+struct BatchMutationSuper {
+ 1: string key,
+ 2: SuperColumnFamilyMap cfmap,
}
-typedef list<map<string, string>> resultSet_t
+typedef list<map<string, string>> ResultSet
-struct CqlResult_t {
- 1: i32 errorCode, // 0 - success
- 2: string errorTxt,
- 3: resultSet_t resultSet,
+struct CqlResult {
+ 1: i32 error_code, // 0 - success
+ 2: string error_txt,
+ 3: ResultSet result_set,
}
@@ -91,54 +89,68 @@
# service api
#
-# CF = ColumnFamily name
-# SC = SuperColumn name
-# C = Column name
-# columnParent: the parent of the columns you are specifying. "CF" or "CF:SC".
-# columnPath: full path to a column. "CF:C" or "CF:SC:C".
-# superColumnPath: full path to a supercolumn. "CF:SC" only.
-# columnPathOrParent: remove will wipe out any layer. "CF" or "CF:C" or "CF:SC" or "CF:SC:C".
+struct ColumnParent {
+ 3: string column_family,
+ 4: optional string super_column,
+}
+
+struct ColumnPath {
+ 3: string column_family,
+ 4: optional string super_column,
+ 5: string column,
+}
+
+struct SuperColumnPath {
+ 3: string column_family,
+ 4: string super_column,
+}
+
+struct ColumnPathOrParent {
+ 3: string column_family,
+ 4: optional string super_column,
+ 5: optional string column,
+}
service Cassandra {
- list<column_t> get_slice_by_names(1:string tablename, 2:string key, 3:string columnParent, 4:list<string> columnNames)
+ list<Column> get_slice_by_names(1:string table, 2:string key, 3:ColumnParent column_parent, 4:list<string> column_names)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- list<column_t> get_slice(1:string tablename, 2:string key, 3:string columnParent, 4:string start, 5:string finish, 6:bool isAscending, 7:i32 offset, 8:i32 count=100)
+ list<Column> get_slice(1:string table, 2:string key, 3:ColumnParent column_parent, 4:string start, 5:string finish, 6:bool is_ascending, 7:i32 offset, 8:i32 count=100)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- column_t get_column(1:string tablename, 2:string key, 3:string columnPath)
+ Column get_column(1:string table, 2:string key, 3:ColumnPath column_path)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- i32 get_column_count(1:string tablename, 2:string key, 3:string columnParent)
+ i32 get_column_count(1:string table, 2:string key, 3:ColumnParent column_parent)
throws (1: InvalidRequestException ire),
- void insert(1:string tablename, 2:string key, 3:string columnPath, 4:binary cellData, 5:i64 timestamp, 6:i32 block_for=0)
+ void insert(1:string table, 2:string key, 3:ColumnPath column_path, 4:binary value, 5:i64 timestamp, 6:i32 block_for=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
- void batch_insert(1: batch_mutation_t batchMutation, 2:i32 block_for=0)
+ void batch_insert(1:string table, 2:BatchMutation batch_mutation, 3:i32 block_for=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
- void remove(1:string tablename, 2:string key, 3:string columnPathOrParent, 4:i64 timestamp, 5:i32 block_for=0)
+ void remove(1:string table, 2:string key, 3:ColumnPathOrParent column_path_or_parent, 4:i64 timestamp, 5:i32 block_for=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
- list<column_t> get_columns_since(1:string tablename, 2:string key, 3:string columnParent, 4:i64 timeStamp)
+ list<Column> get_columns_since(1:string table, 2:string key, 3:ColumnParent column_parent, 4:i64 timeStamp)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- list<superColumn_t> get_slice_super(1:string tablename, 2:string key, 3:string columnFamily, 4:string start, 5:string finish, 6:bool isAscending, 7:i32 offset, 8:i32 count=100)
+ list<SuperColumn> get_slice_super(1:string table, 2:string key, 3:string column_family, 4:string start, 5:string finish, 6:bool is_ascending, 7:i32 offset, 8:i32 count=100)
throws (1: InvalidRequestException ire),
- list<superColumn_t> get_slice_super_by_names(1:string tablename, 2:string key, 3:string columnFamily, 4:list<string> superColumnNames)
+ list<SuperColumn> get_slice_super_by_names(1:string table, 2:string key, 3:string column_family, 4:list<string> super_column_names)
throws (1: InvalidRequestException ire),
- superColumn_t get_superColumn(1:string tablename, 2:string key, 3:string superColumnPath)
+ SuperColumn get_super_column(1:string table, 2:string key, 3:SuperColumnPath super_column_path)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
- void batch_insert_superColumn(1:batch_mutation_super_t batchMutationSuper, 2:i32 block_for=0)
+ void batch_insert_super_column(1:string table, 2:BatchMutationSuper batch_mutation_super, 3:i32 block_for=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
# range query: returns matching keys
- list<string> get_key_range(1:string tablename, 2:string columnFamily, 3:string startWith="", 4:string stopAt="", 5:i32 maxResults=100)
+ list<string> get_key_range(1:string table, 2:string column_family, 3:string startWith="", 4:string stopAt="", 5:i32 maxResults=100)
throws (1: InvalidRequestException ire),
/////////////////////////////////////////////////////////////////////////////////////
@@ -157,6 +169,6 @@
throws (1: NotFoundException nfe),
// execute a CQL query
- CqlResult_t executeQuery(1:string query)
+ CqlResult executeQuery(1:string query)
}
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.java (from r794079, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java&r1=794079&r2=794429&rev=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_t.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutation.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,26 +18,21 @@
import org.apache.thrift.meta_data.*;
import org.apache.thrift.protocol.*;
-public class batch_mutation_t implements TBase, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("batch_mutation_t");
- private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
- private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
- private static final TField CFMAP_FIELD_DESC = new TField("cfmap", TType.MAP, (short)3);
+public class BatchMutation implements TBase, java.io.Serializable, Cloneable {
+ private static final TStruct STRUCT_DESC = new TStruct("BatchMutation");
+ private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)1);
+ private static final TField CFMAP_FIELD_DESC = new TField("cfmap", TType.MAP, (short)2);
- public String table;
- public static final int TABLE = 1;
public String key;
- public static final int KEY = 2;
- public Map<String,List<column_t>> cfmap;
- public static final int CFMAP = 3;
+ public static final int KEY = 1;
+ public Map<String,List<Column>> cfmap;
+ public static final int CFMAP = 2;
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(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT,
- new FieldValueMetaData(TType.STRING)));
put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT,
new FieldValueMetaData(TType.STRING)));
put(CFMAP, new FieldMetaData("cfmap", TFieldRequirementType.DEFAULT,
@@ -66,19 +40,17 @@
}});
static {
- FieldMetaData.addStructMetaDataMap(batch_mutation_t.class, metaDataMap);
+ FieldMetaData.addStructMetaDataMap(BatchMutation.class, metaDataMap);
}
- public batch_mutation_t() {
+ public BatchMutation() {
}
- public batch_mutation_t(
- String table,
+ public BatchMutation(
String key,
- Map<String,List<column_t>> cfmap)
+ Map<String,List<Column>> cfmap)
{
this();
- this.table = table;
this.key = key;
this.cfmap = cfmap;
}
@@ -86,10 +58,7 @@
/**
* Performs a deep copy on <i>other</i>.
*/
- public batch_mutation_t(batch_mutation_t other) {
- if (other.isSetTable()) {
- this.table = other.table;
- }
+ public BatchMutation(BatchMutation other) {
if (other.isSetKey()) {
this.key = other.key;
}
@@ -99,31 +68,8 @@
}
@Override
- public batch_mutation_t clone() {
- return new batch_mutation_t(this);
- }
-
- public String getTable() {
- return this.table;
- }
-
- public void setTable(String table) {
- this.table = table;
- }
-
- public void unsetTable() {
- this.table = null;
- }
-
- // Returns true if field table is set (has been asigned a value) and false otherwise
- public boolean isSetTable() {
- return this.table != null;
- }
-
- public void setTableIsSet(boolean value) {
- if (!value) {
- this.table = null;
- }
+ public BatchMutation clone() {
+ return new BatchMutation(this);
}
public String getKey() {
@@ -153,18 +99,18 @@
return (this.cfmap == null) ? 0 : this.cfmap.size();
}
- public void putToCfmap(String key, List<column_t> val) {
+ public void putToCfmap(String key, List<Column> val) {
if (this.cfmap == null) {
- this.cfmap = new HashMap<String,List<column_t>>();
+ this.cfmap = new HashMap<String,List<Column>>();
}
this.cfmap.put(key, val);
}
- public Map<String,List<column_t>> getCfmap() {
+ public Map<String,List<Column>> getCfmap() {
return this.cfmap;
}
- public void setCfmap(Map<String,List<column_t>> cfmap) {
+ public void setCfmap(Map<String,List<Column>> cfmap) {
this.cfmap = cfmap;
}
@@ -185,14 +131,6 @@
public void setFieldValue(int fieldID, Object value) {
switch (fieldID) {
- case TABLE:
- if (value == null) {
- unsetTable();
- } else {
- setTable((String)value);
- }
- break;
-
case KEY:
if (value == null) {
unsetKey();
@@ -205,7 +143,7 @@
if (value == null) {
unsetCfmap();
} else {
- setCfmap((Map<String,List<column_t>>)value);
+ setCfmap((Map<String,List<Column>>)value);
}
break;
@@ -216,9 +154,6 @@
public Object getFieldValue(int fieldID) {
switch (fieldID) {
- case TABLE:
- return getTable();
-
case KEY:
return getKey();
@@ -233,8 +168,6 @@
// 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 TABLE:
- return isSetTable();
case KEY:
return isSetKey();
case CFMAP:
@@ -248,24 +181,15 @@
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof batch_mutation_t)
- return this.equals((batch_mutation_t)that);
+ if (that instanceof BatchMutation)
+ return this.equals((BatchMutation)that);
return false;
}
- public boolean equals(batch_mutation_t that) {
+ public boolean equals(BatchMutation that) {
if (that == null)
return false;
- boolean this_present_table = true && this.isSetTable();
- boolean that_present_table = true && that.isSetTable();
- if (this_present_table || that_present_table) {
- if (!(this_present_table && that_present_table))
- return false;
- if (!this.table.equals(that.table))
- return false;
- }
-
boolean this_present_key = true && this.isSetKey();
boolean that_present_key = true && that.isSetKey();
if (this_present_key || that_present_key) {
@@ -303,13 +227,6 @@
}
switch (field.id)
{
- case TABLE:
- if (field.type == TType.STRING) {
- this.table = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
case KEY:
if (field.type == TType.STRING) {
this.key = iprot.readString();
@@ -321,19 +238,19 @@
if (field.type == TType.MAP) {
{
TMap _map0 = iprot.readMapBegin();
- this.cfmap = new HashMap<String,List<column_t>>(2*_map0.size);
+ this.cfmap = new HashMap<String,List<Column>>(2*_map0.size);
for (int _i1 = 0; _i1 < _map0.size; ++_i1)
{
String _key2;
- List<column_t> _val3;
+ List<Column> _val3;
_key2 = iprot.readString();
{
TList _list4 = iprot.readListBegin();
- _val3 = new ArrayList<column_t>(_list4.size);
+ _val3 = new ArrayList<Column>(_list4.size);
for (int _i5 = 0; _i5 < _list4.size; ++_i5)
{
- column_t _elem6;
- _elem6 = new column_t();
+ Column _elem6;
+ _elem6 = new Column();
_elem6.read(iprot);
_val3.add(_elem6);
}
@@ -364,11 +281,6 @@
validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (this.table != null) {
- oprot.writeFieldBegin(TABLE_FIELD_DESC);
- oprot.writeString(this.table);
- oprot.writeFieldEnd();
- }
if (this.key != null) {
oprot.writeFieldBegin(KEY_FIELD_DESC);
oprot.writeString(this.key);
@@ -378,11 +290,11 @@
oprot.writeFieldBegin(CFMAP_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.LIST, this.cfmap.size()));
- for (Map.Entry<String, List<column_t>> _iter7 : this.cfmap.entrySet()) {
+ for (Map.Entry<String, List<Column>> _iter7 : this.cfmap.entrySet()) {
oprot.writeString(_iter7.getKey());
{
oprot.writeListBegin(new TList(TType.STRUCT, _iter7.getValue().size()));
- for (column_t _iter8 : _iter7.getValue()) {
+ for (Column _iter8 : _iter7.getValue()) {
_iter8.write(oprot);
}
oprot.writeListEnd();
@@ -398,17 +310,9 @@
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("batch_mutation_t(");
+ StringBuilder sb = new StringBuilder("BatchMutation(");
boolean first = true;
- sb.append("table:");
- if (this.table == null) {
- sb.append("null");
- } else {
- sb.append(this.table);
- }
- first = false;
- if (!first) sb.append(", ");
sb.append("key:");
if (this.key == null) {
sb.append("null");
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutationSuper.java (from r794079, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutationSuper.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutationSuper.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java&r1=794079&r2=794429&rev=794429&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/batch_mutation_super_t.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/BatchMutationSuper.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,26 +18,21 @@
import org.apache.thrift.meta_data.*;
import org.apache.thrift.protocol.*;
-public class batch_mutation_super_t implements TBase, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("batch_mutation_super_t");
- private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
- private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
- private static final TField CFMAP_FIELD_DESC = new TField("cfmap", TType.MAP, (short)3);
+public class BatchMutationSuper implements TBase, java.io.Serializable, Cloneable {
+ private static final TStruct STRUCT_DESC = new TStruct("BatchMutationSuper");
+ private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)1);
+ private static final TField CFMAP_FIELD_DESC = new TField("cfmap", TType.MAP, (short)2);
- public String table;
- public static final int TABLE = 1;
public String key;
- public static final int KEY = 2;
- public Map<String,List<superColumn_t>> cfmap;
- public static final int CFMAP = 3;
+ public static final int KEY = 1;
+ public Map<String,List<SuperColumn>> cfmap;
+ public static final int CFMAP = 2;
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(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT,
- new FieldValueMetaData(TType.STRING)));
put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT,
new FieldValueMetaData(TType.STRING)));
put(CFMAP, new FieldMetaData("cfmap", TFieldRequirementType.DEFAULT,
@@ -66,19 +40,17 @@
}});
static {
- FieldMetaData.addStructMetaDataMap(batch_mutation_super_t.class, metaDataMap);
+ FieldMetaData.addStructMetaDataMap(BatchMutationSuper.class, metaDataMap);
}
- public batch_mutation_super_t() {
+ public BatchMutationSuper() {
}
- public batch_mutation_super_t(
- String table,
+ public BatchMutationSuper(
String key,
- Map<String,List<superColumn_t>> cfmap)
+ Map<String,List<SuperColumn>> cfmap)
{
this();
- this.table = table;
this.key = key;
this.cfmap = cfmap;
}
@@ -86,10 +58,7 @@
/**
* Performs a deep copy on <i>other</i>.
*/
- public batch_mutation_super_t(batch_mutation_super_t other) {
- if (other.isSetTable()) {
- this.table = other.table;
- }
+ public BatchMutationSuper(BatchMutationSuper other) {
if (other.isSetKey()) {
this.key = other.key;
}
@@ -99,31 +68,8 @@
}
@Override
- public batch_mutation_super_t clone() {
- return new batch_mutation_super_t(this);
- }
-
- public String getTable() {
- return this.table;
- }
-
- public void setTable(String table) {
- this.table = table;
- }
-
- public void unsetTable() {
- this.table = null;
- }
-
- // Returns true if field table is set (has been asigned a value) and false otherwise
- public boolean isSetTable() {
- return this.table != null;
- }
-
- public void setTableIsSet(boolean value) {
- if (!value) {
- this.table = null;
- }
+ public BatchMutationSuper clone() {
+ return new BatchMutationSuper(this);
}
public String getKey() {
@@ -153,18 +99,18 @@
return (this.cfmap == null) ? 0 : this.cfmap.size();
}
- public void putToCfmap(String key, List<superColumn_t> val) {
+ public void putToCfmap(String key, List<SuperColumn> val) {
if (this.cfmap == null) {
- this.cfmap = new HashMap<String,List<superColumn_t>>();
+ this.cfmap = new HashMap<String,List<SuperColumn>>();
}
this.cfmap.put(key, val);
}
- public Map<String,List<superColumn_t>> getCfmap() {
+ public Map<String,List<SuperColumn>> getCfmap() {
return this.cfmap;
}
- public void setCfmap(Map<String,List<superColumn_t>> cfmap) {
+ public void setCfmap(Map<String,List<SuperColumn>> cfmap) {
this.cfmap = cfmap;
}
@@ -185,14 +131,6 @@
public void setFieldValue(int fieldID, Object value) {
switch (fieldID) {
- case TABLE:
- if (value == null) {
- unsetTable();
- } else {
- setTable((String)value);
- }
- break;
-
case KEY:
if (value == null) {
unsetKey();
@@ -205,7 +143,7 @@
if (value == null) {
unsetCfmap();
} else {
- setCfmap((Map<String,List<superColumn_t>>)value);
+ setCfmap((Map<String,List<SuperColumn>>)value);
}
break;
@@ -216,9 +154,6 @@
public Object getFieldValue(int fieldID) {
switch (fieldID) {
- case TABLE:
- return getTable();
-
case KEY:
return getKey();
@@ -233,8 +168,6 @@
// 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 TABLE:
- return isSetTable();
case KEY:
return isSetKey();
case CFMAP:
@@ -248,24 +181,15 @@
public boolean equals(Object that) {
if (that == null)
return false;
- if (that instanceof batch_mutation_super_t)
- return this.equals((batch_mutation_super_t)that);
+ if (that instanceof BatchMutationSuper)
+ return this.equals((BatchMutationSuper)that);
return false;
}
- public boolean equals(batch_mutation_super_t that) {
+ public boolean equals(BatchMutationSuper that) {
if (that == null)
return false;
- boolean this_present_table = true && this.isSetTable();
- boolean that_present_table = true && that.isSetTable();
- if (this_present_table || that_present_table) {
- if (!(this_present_table && that_present_table))
- return false;
- if (!this.table.equals(that.table))
- return false;
- }
-
boolean this_present_key = true && this.isSetKey();
boolean that_present_key = true && that.isSetKey();
if (this_present_key || that_present_key) {
@@ -303,13 +227,6 @@
}
switch (field.id)
{
- case TABLE:
- if (field.type == TType.STRING) {
- this.table = iprot.readString();
- } else {
- TProtocolUtil.skip(iprot, field.type);
- }
- break;
case KEY:
if (field.type == TType.STRING) {
this.key = iprot.readString();
@@ -321,19 +238,19 @@
if (field.type == TType.MAP) {
{
TMap _map13 = iprot.readMapBegin();
- this.cfmap = new HashMap<String,List<superColumn_t>>(2*_map13.size);
+ this.cfmap = new HashMap<String,List<SuperColumn>>(2*_map13.size);
for (int _i14 = 0; _i14 < _map13.size; ++_i14)
{
String _key15;
- List<superColumn_t> _val16;
+ List<SuperColumn> _val16;
_key15 = iprot.readString();
{
TList _list17 = iprot.readListBegin();
- _val16 = new ArrayList<superColumn_t>(_list17.size);
+ _val16 = new ArrayList<SuperColumn>(_list17.size);
for (int _i18 = 0; _i18 < _list17.size; ++_i18)
{
- superColumn_t _elem19;
- _elem19 = new superColumn_t();
+ SuperColumn _elem19;
+ _elem19 = new SuperColumn();
_elem19.read(iprot);
_val16.add(_elem19);
}
@@ -364,11 +281,6 @@
validate();
oprot.writeStructBegin(STRUCT_DESC);
- if (this.table != null) {
- oprot.writeFieldBegin(TABLE_FIELD_DESC);
- oprot.writeString(this.table);
- oprot.writeFieldEnd();
- }
if (this.key != null) {
oprot.writeFieldBegin(KEY_FIELD_DESC);
oprot.writeString(this.key);
@@ -378,11 +290,11 @@
oprot.writeFieldBegin(CFMAP_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.LIST, this.cfmap.size()));
- for (Map.Entry<String, List<superColumn_t>> _iter20 : this.cfmap.entrySet()) {
+ for (Map.Entry<String, List<SuperColumn>> _iter20 : this.cfmap.entrySet()) {
oprot.writeString(_iter20.getKey());
{
oprot.writeListBegin(new TList(TType.STRUCT, _iter20.getValue().size()));
- for (superColumn_t _iter21 : _iter20.getValue()) {
+ for (SuperColumn _iter21 : _iter20.getValue()) {
_iter21.write(oprot);
}
oprot.writeListEnd();
@@ -398,17 +310,9 @@
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("batch_mutation_super_t(");
+ StringBuilder sb = new StringBuilder("BatchMutationSuper(");
boolean first = true;
- sb.append("table:");
- if (this.table == null) {
- sb.append("null");
- } else {
- sb.append(this.table);
- }
- first = false;
- if (!first) sb.append(", ");
sb.append("key:");
if (this.key == null) {
sb.append("null");