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 2010/01/05 21:34:22 UTC
svn commit: r896209 - in
/incubator/cassandra/trunk/src/java/org/apache/cassandra:
cli/CliClient.java db/RangeSliceCommand.java glue/ThriftGlue.java
service/CassandraServer.java service/ThriftGlue.java
service/ThriftValidation.java
Author: eevans
Date: Tue Jan 5 20:34:21 2010
New Revision: 896209
URL: http://svn.apache.org/viewvc?rev=896209&view=rev
Log:
reorganize ThriftGlue
* use static import of ThriftGlue methods
* move from o.a.c.glue to o.a.c.service package
Patch by eevans for CASSANDRA-547
Added:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftGlue.java
- copied, changed from r896208, incubator/cassandra/trunk/src/java/org/apache/cassandra/glue/ThriftGlue.java
Removed:
incubator/cassandra/trunk/src/java/org/apache/cassandra/glue/ThriftGlue.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java
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=896209&r1=896208&r2=896209&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 Tue Jan 5 20:34:21 2010
@@ -22,7 +22,9 @@
import org.apache.thrift.*;
import org.antlr.runtime.tree.*;
-import org.apache.cassandra.glue.ThriftGlue;
+
+import static org.apache.cassandra.service.ThriftGlue.*;
+
import org.apache.cassandra.service.*;
import java.util.*;
@@ -163,12 +165,12 @@
if (columnSpecCnt == 0)
{
- colParent = ThriftGlue.createColumnParent(columnFamily, null);
+ colParent = createColumnParent(columnFamily, null);
}
else
{
assert (columnSpecCnt == 1);
- colParent = ThriftGlue.createColumnParent(columnFamily, CliCompiler.getColumn(columnFamilySpec, 0).getBytes("UTF-8"));
+ colParent = createColumnParent(columnFamily, CliCompiler.getColumn(columnFamilySpec, 0).getBytes("UTF-8"));
}
int count = thriftClient_.get_count(tableName, key, colParent, ConsistencyLevel.ONE);
@@ -232,7 +234,7 @@
columnName = CliCompiler.getColumn(columnFamilySpec, 1).getBytes("UTF-8");
}
- thriftClient_.remove(tableName, key, ThriftGlue.createColumnPath(columnFamily, superColumnName, columnName),
+ thriftClient_.remove(tableName, key, createColumnPath(columnFamily, superColumnName, columnName),
System.currentTimeMillis(), ConsistencyLevel.ONE);
css_.out.println(String.format("%s removed.", (columnSpecCnt == 0) ? "row" : "column"));
}
@@ -242,8 +244,8 @@
{
SliceRange range = new SliceRange(ArrayUtils.EMPTY_BYTE_ARRAY, ArrayUtils.EMPTY_BYTE_ARRAY, true, 1000000);
List<ColumnOrSuperColumn> columns = thriftClient_.get_slice(keyspace, key,
- ThriftGlue.createColumnParent(columnFamily, superColumnName),
- ThriftGlue.createSlicePredicate(null, range), ConsistencyLevel.ONE);
+ createColumnParent(columnFamily, superColumnName),
+ createSlicePredicate(null, range), ConsistencyLevel.ONE);
int size = columns.size();
// Print out super columns or columns.
@@ -360,7 +362,7 @@
}
// Perform a get(), print out the results.
- ColumnPath path = ThriftGlue.createColumnPath(columnFamily, superColumnName, columnName);
+ ColumnPath path = createColumnPath(columnFamily, superColumnName, columnName);
Column column = thriftClient_.get(tableName, key, path, ConsistencyLevel.ONE).column;
css_.out.printf("=> (column=%s, value=%s, timestamp=%d)\n", formatColumnName(tableName, columnFamily, column),
new String(column.value, "UTF-8"), column.timestamp);
@@ -403,7 +405,7 @@
}
// do the insert
- thriftClient_.insert(tableName, key, ThriftGlue.createColumnPath(columnFamily, superColumnName, columnName),
+ thriftClient_.insert(tableName, key, createColumnPath(columnFamily, superColumnName, columnName),
value.getBytes(), System.currentTimeMillis(), ConsistencyLevel.ONE);
css_.out.println("Value inserted.");
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java?rev=896209&r1=896208&r2=896209&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java Tue Jan 5 20:34:21 2010
@@ -37,7 +37,9 @@
package org.apache.cassandra.db;
import org.apache.cassandra.concurrent.StageManager;
-import org.apache.cassandra.glue.ThriftGlue;
+
+import static org.apache.cassandra.service.ThriftGlue.createColumnParent;
+
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.net.Message;
@@ -165,7 +167,7 @@
DecoratedKey finishKey = DecoratedKey.serializer().deserialize(dis);
int max_keys = dis.readInt();
return new RangeSliceCommand(keyspace,
- ThriftGlue.createColumnParent(column_family, super_column),
+ createColumnParent(column_family, super_column),
pred,
startKey,
finishKey,
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java?rev=896209&r1=896208&r2=896209&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java Tue Jan 5 20:34:21 2010
@@ -33,7 +33,9 @@
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.db.filter.QueryPath;
-import org.apache.cassandra.glue.ThriftGlue;
+
+import static org.apache.cassandra.service.ThriftGlue.*;
+
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.Pair;
import org.apache.thrift.TException;
@@ -125,7 +127,7 @@
continue;
}
Column thrift_column = new Column(column.name(), column.value(), column.timestamp());
- thriftColumns.add(ThriftGlue.createColumnOrSuperColumn_Column(thrift_column));
+ thriftColumns.add(createColumnOrSuperColumn_Column(thrift_column));
}
// we have to do the reversing here, since internally we pass results around in ColumnFamily
@@ -147,7 +149,7 @@
continue;
}
SuperColumn superColumn = new SuperColumn(column.name(), subcolumns);
- thriftSuperColumns.add(ThriftGlue.createColumnOrSuperColumn_SuperColumn(superColumn));
+ thriftSuperColumns.add(createColumnOrSuperColumn_SuperColumn(superColumn));
}
if (reverseOrder)
@@ -331,8 +333,8 @@
else
{
columnorsupercolumn = column instanceof org.apache.cassandra.db.Column
- ? ThriftGlue.createColumnOrSuperColumn_Column(new Column(column.name(), column.value(), column.timestamp()))
- : ThriftGlue.createColumnOrSuperColumn_SuperColumn(new SuperColumn(column.name(), thriftifySubColumns(column.getSubColumns())));
+ ? createColumnOrSuperColumn_Column(new Column(column.name(), column.value(), column.timestamp()))
+ : createColumnOrSuperColumn_SuperColumn(new SuperColumn(column.name(), thriftifySubColumns(column.getSubColumns())));
}
}
Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftGlue.java (from r896208, incubator/cassandra/trunk/src/java/org/apache/cassandra/glue/ThriftGlue.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftGlue.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftGlue.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/glue/ThriftGlue.java&r1=896208&r2=896209&rev=896209&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/glue/ThriftGlue.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftGlue.java Tue Jan 5 20:34:21 2010
@@ -1,4 +1,4 @@
-package org.apache.cassandra.glue;
+package org.apache.cassandra.service;
import java.util.List;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java?rev=896209&r1=896208&r2=896209&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java Tue Jan 5 20:34:21 2010
@@ -29,7 +29,9 @@
import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.MarshalException;
-import org.apache.cassandra.glue.ThriftGlue;
+
+import static org.apache.cassandra.service.ThriftGlue.*;
+
import org.apache.cassandra.config.DatabaseDescriptor;
public class ThriftValidation
@@ -210,14 +212,14 @@
{
if (cosc.column != null)
{
- ThriftValidation.validateColumnPath(keyspace, ThriftGlue.createColumnPath(cfName, null, cosc.column.name));
+ ThriftValidation.validateColumnPath(keyspace, createColumnPath(cfName, null, cosc.column.name));
}
if (cosc.super_column != null)
{
for (Column c : cosc.super_column.columns)
{
- ThriftValidation.validateColumnPath(keyspace, ThriftGlue.createColumnPath(cfName, cosc.super_column.name, c.name));
+ ThriftValidation.validateColumnPath(keyspace, createColumnPath(cfName, cosc.super_column.name, c.name));
}
}
@@ -272,7 +274,7 @@
}
if (predicate.slice_range != null) {
- validateRange(keyspace, ThriftGlue.createColumnParent(cfName, scName), predicate.slice_range);
+ validateRange(keyspace, createColumnParent(cfName, scName), predicate.slice_range);
}
if (predicate.column_names != null) {