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

merge from 0.4 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830303 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-10-27 19:21:29 +00:00
parent 128cb03a5f
commit aa0b3d182a
5 changed files with 7 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -22,6 +22,7 @@
(CASSANDRA-493)
* Improve default garbage collector options (CASSANDRA-504)
* Add "nodeprobe flush" (CASSANDRA-505)
* remove NotFoundException from get_slice throws list (CASSANDRA-518)
0.4.1

1
README.txt
View File

@ -22,6 +22,7 @@ and running, and demonstrate some simple reads and writes.
* tar -zxvf cassandra-$VERSION.tgz
* cd cassandra-$VERSION
* sudo mkdir -p /var/log/cassandra
* sudo mkdir -p /var/lib/cassandra
* sudo chown -R `whoami` /var/lib/cassandra
Note: The sample configuration files in conf/ determine the file-system

2
interface/cassandra.thrift
View File

@ -134,7 +134,7 @@ service Cassandra {
3:required ColumnParent column_parent,
4:required SlicePredicate predicate,
5:required ConsistencyLevel consistency_level=1)
throws (1: InvalidRequestException ire, 2: NotFoundException nfe, 3: UnavailableException ue),
throws (1: InvalidRequestException ire, 3: UnavailableException ue),
map<string,ColumnOrSuperColumn> multiget(1:required string keyspace,
2:required list<string> keys,

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

@ -48,7 +48,7 @@ public class Cassandra {
public ColumnOrSuperColumn get(String keyspace, String key, ColumnPath column_path, int consistency_level) throws InvalidRequestException, NotFoundException, UnavailableException, TException;
public List<ColumnOrSuperColumn> get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, NotFoundException, UnavailableException, TException;
public List<ColumnOrSuperColumn> get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
public Map<String,ColumnOrSuperColumn> multiget(String keyspace, List<String> keys, ColumnPath column_path, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
@ -144,7 +144,7 @@ public class Cassandra {
throw new TApplicationException(TApplicationException.MISSING_RESULT, "get failed: unknown result");
}
public List<ColumnOrSuperColumn> get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, NotFoundException, UnavailableException, TException
public List<ColumnOrSuperColumn> get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level) throws InvalidRequestException, UnavailableException, TException
{
send_get_slice(keyspace, key, column_parent, predicate, consistency_level);
return recv_get_slice();
@ -164,7 +164,7 @@ public class Cassandra {
oprot_.getTransport().flush();
}
public List<ColumnOrSuperColumn> recv_get_slice() throws InvalidRequestException, NotFoundException, UnavailableException, TException
public List<ColumnOrSuperColumn> recv_get_slice() throws InvalidRequestException, UnavailableException, TException
{
TMessage msg = iprot_.readMessageBegin();
if (msg.type == TMessageType.EXCEPTION) {
@ -181,9 +181,6 @@ public class Cassandra {
if (result.ire != null) {
throw result.ire;
}
if (result.nfe != null) {
throw result.nfe;
}
if (result.ue != null) {
throw result.ue;
}
@ -671,8 +668,6 @@ public class Cassandra {
result.success = iface_.get_slice(args.keyspace, args.key, args.column_parent, args.predicate, args.consistency_level);
} catch (InvalidRequestException ire) {
result.ire = ire;
} catch (NotFoundException nfe) {
result.nfe = nfe;
} catch (UnavailableException ue) {
result.ue = ue;
} catch (Throwable th) {
@ -2548,16 +2543,13 @@ public class Cassandra {
private static final TStruct STRUCT_DESC = new TStruct("get_slice_result");
private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.LIST, (short)0);
private static final TField IRE_FIELD_DESC = new TField("ire", TType.STRUCT, (short)1);
private static final TField NFE_FIELD_DESC = new TField("nfe", TType.STRUCT, (short)2);
private static final TField UE_FIELD_DESC = new TField("ue", TType.STRUCT, (short)3);
public List<ColumnOrSuperColumn> success;
public InvalidRequestException ire;
public NotFoundException nfe;
public UnavailableException ue;
public static final int SUCCESS = 0;
public static final int IRE = 1;
public static final int NFE = 2;
public static final int UE = 3;
// isset id assignments
@ -2568,8 +2560,6 @@ public class Cassandra {
new StructMetaData(TType.STRUCT, ColumnOrSuperColumn.class))));
put(IRE, new FieldMetaData("ire", TFieldRequirementType.DEFAULT,
new FieldValueMetaData(TType.STRUCT)));
put(NFE, new FieldMetaData("nfe", TFieldRequirementType.DEFAULT,
new FieldValueMetaData(TType.STRUCT)));
put(UE, new FieldMetaData("ue", TFieldRequirementType.DEFAULT,
new FieldValueMetaData(TType.STRUCT)));
}});
@ -2584,13 +2574,11 @@ public class Cassandra {
public get_slice_result(
List<ColumnOrSuperColumn> success,
InvalidRequestException ire,
NotFoundException nfe,
UnavailableException ue)
{
this();
this.success = success;
this.ire = ire;
this.nfe = nfe;
this.ue = ue;
}
@ -2608,9 +2596,6 @@ public class Cassandra {
if (other.isSetIre()) {
this.ire = new InvalidRequestException(other.ire);
}
if (other.isSetNfe()) {
this.nfe = new NotFoundException(other.nfe);
}
if (other.isSetUe()) {
this.ue = new UnavailableException(other.ue);
}
@ -2673,30 +2658,6 @@ public class Cassandra {
}
}
public NotFoundException getNfe() {
return this.nfe;
}
public get_slice_result setNfe(NotFoundException nfe) {
this.nfe = nfe;
return this;
}
public void unsetNfe() {
this.nfe = null;
}
// Returns true if field nfe is set (has been asigned a value) and false otherwise
public boolean isSetNfe() {
return this.nfe != null;
}
public void setNfeIsSet(boolean value) {
if (!value) {
this.nfe = null;
}
}
public UnavailableException getUe() {
return this.ue;
}
@ -2739,14 +2700,6 @@ public class Cassandra {
}
break;
case NFE:
if (value == null) {
unsetNfe();
} else {
setNfe((NotFoundException)value);
}
break;
case UE:
if (value == null) {
unsetUe();
@ -2768,9 +2721,6 @@ public class Cassandra {
case IRE:
return getIre();
case NFE:
return getNfe();
case UE:
return getUe();
@ -2786,8 +2736,6 @@ public class Cassandra {
return isSetSuccess();
case IRE:
return isSetIre();
case NFE:
return isSetNfe();
case UE:
return isSetUe();
default:
@ -2826,15 +2774,6 @@ public class Cassandra {
return false;
}
boolean this_present_nfe = true && this.isSetNfe();
boolean that_present_nfe = true && that.isSetNfe();
if (this_present_nfe || that_present_nfe) {
if (!(this_present_nfe && that_present_nfe))
return false;
if (!this.nfe.equals(that.nfe))
return false;
}
boolean this_present_ue = true && this.isSetUe();
boolean that_present_ue = true && that.isSetUe();
if (this_present_ue || that_present_ue) {
@ -2876,14 +2815,6 @@ public class Cassandra {
if (lastComparison != 0) {
return lastComparison;
}
lastComparison = Boolean.valueOf(isSetNfe()).compareTo(isSetNfe());
if (lastComparison != 0) {
return lastComparison;
}
lastComparison = TBaseHelper.compareTo(nfe, typedOther.nfe);
if (lastComparison != 0) {
return lastComparison;
}
lastComparison = Boolean.valueOf(isSetUe()).compareTo(isSetUe());
if (lastComparison != 0) {
return lastComparison;
@ -2932,14 +2863,6 @@ public class Cassandra {
TProtocolUtil.skip(iprot, field.type);
}
break;
case NFE:
if (field.type == TType.STRUCT) {
this.nfe = new NotFoundException();
this.nfe.read(iprot);
} else {
TProtocolUtil.skip(iprot, field.type);
}
break;
case UE:
if (field.type == TType.STRUCT) {
this.ue = new UnavailableException();
@ -2979,10 +2902,6 @@ public class Cassandra {
oprot.writeFieldBegin(IRE_FIELD_DESC);
this.ire.write(oprot);
oprot.writeFieldEnd();
} else if (this.isSetNfe()) {
oprot.writeFieldBegin(NFE_FIELD_DESC);
this.nfe.write(oprot);
oprot.writeFieldEnd();
} else if (this.isSetUe()) {
oprot.writeFieldBegin(UE_FIELD_DESC);
this.ue.write(oprot);
@ -3013,14 +2932,6 @@ public class Cassandra {
}
first = false;
if (!first) sb.append(", ");
sb.append("nfe:");
if (this.nfe == null) {
sb.append("null");
} else {
sb.append(this.nfe);
}
first = false;
if (!first) sb.append(", ");
sb.append("ue:");
if (this.ue == null) {
sb.append("null");

2
src/java/org/apache/cassandra/service/CassandraServer.java
View File

@ -208,7 +208,7 @@ public class CassandraServer implements Cassandra.Iface
}
public List<ColumnOrSuperColumn> get_slice(String keyspace, String key, ColumnParent column_parent, SlicePredicate predicate, int consistency_level)
throws InvalidRequestException, NotFoundException, UnavailableException
throws InvalidRequestException, UnavailableException
{
if (logger.isDebugEnabled())
logger.debug("get_slice");