natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

regenerate with thrift compiler from THRIFT-575 to reject method calls with null parameters. patch by jbellis; reviewed by Sammy Yu for CASSANDRA-308 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.4@810993 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-09-03 15:29:56 +00:00
parent 33d5b16145
commit 58db081e87
12 changed files with 515 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
interface/cassandra.thrift
View File

@ -110,47 +110,81 @@ struct SlicePredicate {
service Cassandra {
# retrieval methods
ColumnOrSuperColumn get(1:string keyspace, 2:string key, 3:ColumnPath column_path, 4:ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
ColumnOrSuperColumn get(1:required string keyspace,
2:required string key,
3:required ColumnPath column_path,
4:required ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
list<ColumnOrSuperColumn> get_slice(1:string keyspace, 2:string key, 3:ColumnParent column_parent, 4:SlicePredicate predicate, 5:ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
list<ColumnOrSuperColumn> get_slice(1:required string keyspace,
2:required string key,
3:required ColumnParent column_parent,
4:required SlicePredicate predicate,
5:required ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
map<string,ColumnOrSuperColumn> multiget(1:string keyspace, 2:list<string> keys, 3:ColumnPath column_path, 4:ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire),
map<string,ColumnOrSuperColumn> multiget(1:required string keyspace,
2:required list<string> keys,
3:required ColumnPath column_path,
4:required ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire),
map<string,list<ColumnOrSuperColumn>> multiget_slice(1:string keyspace, 2:list<string> keys, 3:ColumnParent column_parent, 4:SlicePredicate predicate, 5:ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire),
map<string,list<ColumnOrSuperColumn>> multiget_slice(1:required string keyspace,
2:required list<string> keys,
3:required ColumnParent column_parent,
4:required SlicePredicate predicate,
5:required ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire),
i32 get_count(1:string keyspace, 2:string key, 3:ColumnParent column_parent, 5:ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire),
i32 get_count(1:required string keyspace,
2:required string key,
3:required ColumnParent column_parent,
4:required ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire),
# range query: returns matching keys
list<string> get_key_range(1:string keyspace, 2:string column_family, 3:string start="", 4:string finish="", 5:i32 count=100, 6:ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire),
list<string> get_key_range(1:required string keyspace,
2:required string column_family,
3:required string start="",
4:required string finish="",
5:required i32 count=100,
6:required ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire),
# modification methods
void insert(1:string keyspace, 2:string key, 3:ColumnPath column_path, 4:binary value, 5:i64 timestamp, 6:ConsistencyLevel consistency_level=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
void insert(1:required string keyspace,
2:required string key,
3:required ColumnPath column_path,
4:required binary value,
5:required i64 timestamp,
6:required ConsistencyLevel consistency_level=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
void batch_insert(1:string keyspace, 2:string key, 3:map<string, list<ColumnOrSuperColumn>> cfmap, 4:ConsistencyLevel consistency_level=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
void batch_insert(1:required string keyspace,
2:required string key,
3:required map<string, list<ColumnOrSuperColumn>> cfmap,
4:required ConsistencyLevel consistency_level=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
void remove(1:string keyspace, 2:string key, 3:ColumnPath column_path, 4:i64 timestamp, 5:ConsistencyLevel consistency_level=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
void remove(1:required string keyspace,
2:required string key,
3:required ColumnPath column_path,
4:required i64 timestamp,
5:ConsistencyLevel consistency_level=0)
throws (1: InvalidRequestException ire, 2: UnavailableException ue),
// Meta-APIs -- APIs to get information about the node or cluster,
// rather than user data. The nodeprobe program provides usage examples.
// get property whose value is of type "string"
string get_string_property(1:string property),
string get_string_property(1:required string property),
// get property whose value is list of "strings"
list<string> get_string_list_property(1:string property),
list<string> get_string_list_property(1:required string property),
// describe specified keyspace
map<string, map<string, string>> describe_keyspace(1:string keyspace)
throws (1: NotFoundException nfe),
map<string, map<string, string>> describe_keyspace(1:required string keyspace)
throws (1: NotFoundException nfe),
}

513
interface/gen-java/org/apache/cassandra/service/Cassandra.java
View File

File diff suppressed because it is too large Load Diff

11
interface/gen-java/org/apache/cassandra/service/Column.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
import java.util.BitSet;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -48,10 +49,10 @@ public class Column implements TBase, java.io.Serializable, Cloneable, Comparabl
private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)3);
public byte[] name;
public static final int NAME = 1;
public byte[] value;
public static final int VALUE = 2;
public long timestamp;
public static final int NAME = 1;
public static final int VALUE = 2;
public static final int TIMESTAMP = 3;
// isset id assignments
@ -103,7 +104,11 @@ public class Column implements TBase, java.io.Serializable, Cloneable, Comparabl
this.timestamp = other.timestamp;
}
@Override
public Column deepCopy() {
return new Column(this);
}
@Deprecated
public Column clone() {
return new Column(this);
}

9
interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
import java.util.BitSet;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -47,8 +48,8 @@ public class ColumnOrSuperColumn implements TBase, java.io.Serializable, Cloneab
private static final TField SUPER_COLUMN_FIELD_DESC = new TField("super_column", TType.STRUCT, (short)2);
public Column column;
public static final int COLUMN = 1;
public SuperColumn super_column;
public static final int COLUMN = 1;
public static final int SUPER_COLUMN = 2;
// isset id assignments
@ -88,7 +89,11 @@ public class ColumnOrSuperColumn implements TBase, java.io.Serializable, Cloneab
}
}
@Override
public ColumnOrSuperColumn deepCopy() {
return new ColumnOrSuperColumn(this);
}
@Deprecated
public ColumnOrSuperColumn clone() {
return new ColumnOrSuperColumn(this);
}

9
interface/gen-java/org/apache/cassandra/service/ColumnParent.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
import java.util.BitSet;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -47,8 +48,8 @@ public class ColumnParent implements TBase, java.io.Serializable, Cloneable, Com
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 byte[] super_column;
public static final int COLUMN_FAMILY = 3;
public static final int SUPER_COLUMN = 4;
// isset id assignments
@ -89,7 +90,11 @@ public class ColumnParent implements TBase, java.io.Serializable, Cloneable, Com
}
}
@Override
public ColumnParent deepCopy() {
return new ColumnParent(this);
}
@Deprecated
public ColumnParent clone() {
return new ColumnParent(this);
}

11
interface/gen-java/org/apache/cassandra/service/ColumnPath.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
import java.util.BitSet;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -48,10 +49,10 @@ public class ColumnPath implements TBase, java.io.Serializable, Cloneable, Compa
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 byte[] super_column;
public static final int SUPER_COLUMN = 4;
public byte[] column;
public static final int COLUMN_FAMILY = 3;
public static final int SUPER_COLUMN = 4;
public static final int COLUMN = 5;
// isset id assignments
@ -100,7 +101,11 @@ public class ColumnPath implements TBase, java.io.Serializable, Cloneable, Compa
}
}
@Override
public ColumnPath deepCopy() {
return new ColumnPath(this);
}
@Deprecated
public ColumnPath clone() {
return new ColumnPath(this);
}

7
interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
import java.util.BitSet;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -78,7 +79,11 @@ public class InvalidRequestException extends Exception implements TBase, java.io
}
}
@Override
public InvalidRequestException deepCopy() {
return new InvalidRequestException(this);
}
@Deprecated
public InvalidRequestException clone() {
return new InvalidRequestException(this);
}

7
interface/gen-java/org/apache/cassandra/service/NotFoundException.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
import java.util.BitSet;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -60,7 +61,11 @@ public class NotFoundException extends Exception implements TBase, java.io.Seria
public NotFoundException(NotFoundException other) {
}
@Override
public NotFoundException deepCopy() {
return new NotFoundException(this);
}
@Deprecated
public NotFoundException clone() {
return new NotFoundException(this);
}

12
interface/gen-java/org/apache/cassandra/service/SlicePredicate.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
import java.util.BitSet;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -47,8 +48,8 @@ public class SlicePredicate implements TBase, java.io.Serializable, Cloneable, C
private static final TField SLICE_RANGE_FIELD_DESC = new TField("slice_range", TType.STRUCT, (short)2);
public List<byte[]> column_names;
public static final int COLUMN_NAMES = 1;
public SliceRange slice_range;
public static final int COLUMN_NAMES = 1;
public static final int SLICE_RANGE = 2;
// isset id assignments
@ -95,7 +96,11 @@ public class SlicePredicate implements TBase, java.io.Serializable, Cloneable, C
}
}
@Override
public SlicePredicate deepCopy() {
return new SlicePredicate(this);
}
@Deprecated
public SlicePredicate clone() {
return new SlicePredicate(this);
}
@ -320,7 +325,8 @@ public class SlicePredicate implements TBase, java.io.Serializable, Cloneable, C
oprot.writeFieldBegin(COLUMN_NAMES_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.column_names.size()));
for (byte[] _iter7 : this.column_names) {
for (byte[] _iter7 : this.column_names)
{
oprot.writeBinary(_iter7);
}
oprot.writeListEnd();

13
interface/gen-java/org/apache/cassandra/service/SliceRange.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
import java.util.BitSet;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -49,12 +50,12 @@ public class SliceRange implements TBase, java.io.Serializable, Cloneable, Compa
private static final TField COUNT_FIELD_DESC = new TField("count", TType.I32, (short)4);
public byte[] start;
public static final int START = 1;
public byte[] finish;
public static final int FINISH = 2;
public boolean reversed;
public static final int REVERSED = 3;
public int count;
public static final int START = 1;
public static final int FINISH = 2;
public static final int REVERSED = 3;
public static final int COUNT = 4;
// isset id assignments
@ -117,7 +118,11 @@ public class SliceRange implements TBase, java.io.Serializable, Cloneable, Compa
this.count = other.count;
}
@Override
public SliceRange deepCopy() {
return new SliceRange(this);
}
@Deprecated
public SliceRange clone() {
return new SliceRange(this);
}

12
interface/gen-java/org/apache/cassandra/service/SuperColumn.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
import java.util.BitSet;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -47,8 +48,8 @@ public class SuperColumn implements TBase, java.io.Serializable, Cloneable, Comp
private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)2);
public byte[] name;
public static final int NAME = 1;
public List<Column> columns;
public static final int NAME = 1;
public static final int COLUMNS = 2;
// isset id assignments
@ -94,7 +95,11 @@ public class SuperColumn implements TBase, java.io.Serializable, Cloneable, Comp
}
}
@Override
public SuperColumn deepCopy() {
return new SuperColumn(this);
}
@Deprecated
public SuperColumn clone() {
return new SuperColumn(this);
}
@ -323,7 +328,8 @@ public class SuperColumn implements TBase, java.io.Serializable, Cloneable, Comp
oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.columns.size()));
for (Column _iter3 : this.columns) {
for (Column _iter3 : this.columns)
{
_iter3.write(oprot);
}
oprot.writeListEnd();

7
interface/gen-java/org/apache/cassandra/service/UnavailableException.java
View File

@ -34,6 +34,7 @@ import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
import java.util.BitSet;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -60,7 +61,11 @@ public class UnavailableException extends Exception implements TBase, java.io.Se
public UnavailableException(UnavailableException other) {
}
@Override
public UnavailableException deepCopy() {
return new UnavailableException(this);
}
@Deprecated
public UnavailableException clone() {
return new UnavailableException(this);
}