You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ee...@apache.org on 2009/08/12 04:59:55 UTC
svn commit: r803355 - in /incubator/cassandra/trunk: interface/
interface/gen-java/org/apache/cassandra/service/
src/java/org/apache/cassandra/config/
Author: eevans
Date: Wed Aug 12 02:59:55 2009
New Revision: 803355
URL: http://svn.apache.org/viewvc?rev=803355&view=rev
Log:
CASSANDRA-361 cleanup left-over references to Cql
Patch by Michael Greene (+ regeneration of thrift code); reviewed
by eevans for CASSANDRA-361
Removed:
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/CqlResult.java
Modified:
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/SlicePredicate.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Modified: incubator/cassandra/trunk/interface/cassandra.thrift
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/cassandra.thrift?rev=803355&r1=803354&r2=803355&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/cassandra.thrift (original)
+++ incubator/cassandra/trunk/interface/cassandra.thrift Wed Aug 12 02:59:55 2009
@@ -63,12 +63,6 @@
typedef list<map<string, string>> ResultSet
-struct CqlResult {
- 1: i32 error_code, // 0 - success
- 2: string error_txt,
- 3: ResultSet result_set,
-}
-
#
# Exceptions
#
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java?rev=803355&r1=803354&r2=803355&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java Wed Aug 12 02:59:55 2009
@@ -1629,14 +1629,14 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list35 = iprot.readListBegin();
- this.success = new ArrayList<ColumnOrSuperColumn>(_list35.size);
- for (int _i36 = 0; _i36 < _list35.size; ++_i36)
+ TList _list26 = iprot.readListBegin();
+ this.success = new ArrayList<ColumnOrSuperColumn>(_list26.size);
+ for (int _i27 = 0; _i27 < _list26.size; ++_i27)
{
- ColumnOrSuperColumn _elem37;
- _elem37 = new ColumnOrSuperColumn();
- _elem37.read(iprot);
- this.success.add(_elem37);
+ ColumnOrSuperColumn _elem28;
+ _elem28 = new ColumnOrSuperColumn();
+ _elem28.read(iprot);
+ this.success.add(_elem28);
}
iprot.readListEnd();
}
@@ -1680,8 +1680,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
- for (ColumnOrSuperColumn _iter38 : this.success) {
- _iter38.write(oprot);
+ for (ColumnOrSuperColumn _iter29 : this.success) {
+ _iter29.write(oprot);
}
oprot.writeListEnd();
}
@@ -6945,13 +6945,13 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list39 = iprot.readListBegin();
- this.success = new ArrayList<String>(_list39.size);
- for (int _i40 = 0; _i40 < _list39.size; ++_i40)
+ TList _list30 = iprot.readListBegin();
+ this.success = new ArrayList<String>(_list30.size);
+ for (int _i31 = 0; _i31 < _list30.size; ++_i31)
{
- String _elem41;
- _elem41 = iprot.readString();
- this.success.add(_elem41);
+ String _elem32;
+ _elem32 = iprot.readString();
+ this.success.add(_elem32);
}
iprot.readListEnd();
}
@@ -6987,8 +6987,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.success.size()));
- for (String _iter42 : this.success) {
- oprot.writeString(_iter42);
+ for (String _iter33 : this.success) {
+ oprot.writeString(_iter33);
}
oprot.writeListEnd();
}
@@ -7784,13 +7784,13 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list43 = iprot.readListBegin();
- this.success = new ArrayList<String>(_list43.size);
- for (int _i44 = 0; _i44 < _list43.size; ++_i44)
+ TList _list34 = iprot.readListBegin();
+ this.success = new ArrayList<String>(_list34.size);
+ for (int _i35 = 0; _i35 < _list34.size; ++_i35)
{
- String _elem45;
- _elem45 = iprot.readString();
- this.success.add(_elem45);
+ String _elem36;
+ _elem36 = iprot.readString();
+ this.success.add(_elem36);
}
iprot.readListEnd();
}
@@ -7818,8 +7818,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.success.size()));
- for (String _iter46 : this.success) {
- oprot.writeString(_iter46);
+ for (String _iter37 : this.success) {
+ oprot.writeString(_iter37);
}
oprot.writeListEnd();
}
@@ -8282,27 +8282,27 @@
case SUCCESS:
if (field.type == TType.MAP) {
{
- TMap _map47 = iprot.readMapBegin();
- this.success = new HashMap<String,Map<String,String>>(2*_map47.size);
- for (int _i48 = 0; _i48 < _map47.size; ++_i48)
+ TMap _map38 = iprot.readMapBegin();
+ this.success = new HashMap<String,Map<String,String>>(2*_map38.size);
+ for (int _i39 = 0; _i39 < _map38.size; ++_i39)
{
- String _key49;
- Map<String,String> _val50;
- _key49 = iprot.readString();
+ String _key40;
+ Map<String,String> _val41;
+ _key40 = iprot.readString();
{
- TMap _map51 = iprot.readMapBegin();
- _val50 = new HashMap<String,String>(2*_map51.size);
- for (int _i52 = 0; _i52 < _map51.size; ++_i52)
+ TMap _map42 = iprot.readMapBegin();
+ _val41 = new HashMap<String,String>(2*_map42.size);
+ for (int _i43 = 0; _i43 < _map42.size; ++_i43)
{
- String _key53;
- String _val54;
- _key53 = iprot.readString();
- _val54 = iprot.readString();
- _val50.put(_key53, _val54);
+ String _key44;
+ String _val45;
+ _key44 = iprot.readString();
+ _val45 = iprot.readString();
+ _val41.put(_key44, _val45);
}
iprot.readMapEnd();
}
- this.success.put(_key49, _val50);
+ this.success.put(_key40, _val41);
}
iprot.readMapEnd();
}
@@ -8338,13 +8338,13 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.MAP, this.success.size()));
- for (Map.Entry<String, Map<String,String>> _iter55 : this.success.entrySet()) {
- oprot.writeString(_iter55.getKey());
+ for (Map.Entry<String, Map<String,String>> _iter46 : this.success.entrySet()) {
+ oprot.writeString(_iter46.getKey());
{
- oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, _iter55.getValue().size()));
- for (Map.Entry<String, String> _iter56 : _iter55.getValue().entrySet()) {
- oprot.writeString(_iter56.getKey());
- oprot.writeString(_iter56.getValue());
+ oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, _iter46.getValue().size()));
+ for (Map.Entry<String, String> _iter47 : _iter46.getValue().entrySet()) {
+ oprot.writeString(_iter47.getKey());
+ oprot.writeString(_iter47.getValue());
}
oprot.writeMapEnd();
}
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java?rev=803355&r1=803354&r2=803355&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java Wed Aug 12 02:59:55 2009
@@ -228,13 +228,13 @@
case COLUMN_NAMES:
if (field.type == TType.LIST) {
{
- TList _list31 = iprot.readListBegin();
- this.column_names = new ArrayList<byte[]>(_list31.size);
- for (int _i32 = 0; _i32 < _list31.size; ++_i32)
+ TList _list22 = iprot.readListBegin();
+ this.column_names = new ArrayList<byte[]>(_list22.size);
+ for (int _i23 = 0; _i23 < _list22.size; ++_i23)
{
- byte[] _elem33;
- _elem33 = iprot.readBinary();
- this.column_names.add(_elem33);
+ byte[] _elem24;
+ _elem24 = iprot.readBinary();
+ this.column_names.add(_elem24);
}
iprot.readListEnd();
}
@@ -272,8 +272,8 @@
oprot.writeFieldBegin(COLUMN_NAMES_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.column_names.size()));
- for (byte[] _iter34 : this.column_names) {
- oprot.writeBinary(_iter34);
+ for (byte[] _iter25 : this.column_names) {
+ oprot.writeBinary(_iter25);
}
oprot.writeListEnd();
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java?rev=803355&r1=803354&r2=803355&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java Wed Aug 12 02:59:55 2009
@@ -29,8 +29,6 @@
public AbstractType subcolumnComparator; // like comparator, for supercolumns
// The user chosen names (n_) for various parts of data in a column family.
- // CQL queries, for instance, will refer to/extract data within a column
- // family using these logical names.
public String n_rowKey;
public String n_superColumnMap; // only used if this is a super column family
public String n_superColumnKey; // only used if this is a super column family
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=803355&r1=803354&r2=803355&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 Aug 12 02:59:55 2009
@@ -75,7 +75,7 @@
private static List<String> tables_ = new ArrayList<String>();
private static Set<String> applicationColumnFamilies_ = new HashSet<String>();
- // Default descriptive names for use in CQL. The user can override
+ // Default descriptive names for introspection. The user can override
// these choices in the config file. These are not case sensitive.
// Hence, these are stored in UPPER case for easy comparison.
private static String d_rowKey_ = "ROW_KEY";