Author: jbellis
Date: Thu Mar 4 16:44:12 2010
New Revision: 919059
URL: http://svn.apache.org/viewvc?rev=919059&view=rev
Log:
inline ThriftGlue methods. patch by Ted Zlatanov; reviewed by jbellis for
CASSANDRA-848
Removed:
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftGlue.java
Modified:
incubator/cassandra/trunk/contrib/client_only/ClientOnlyExample.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java
Modified: incubator/cassandra/trunk/contrib/client_only/ClientOnlyExample.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/contrib/client_only/ClientOnlyExample.java?rev=919059&r1=919058&r2=919059&view=diff
==============================================================================
--- incubator/cassandra/trunk/contrib/client_only/ClientOnlyExample.java
(original)
+++ incubator/cassandra/trunk/contrib/client_only/ClientOnlyExample.java Thu
Mar 4 16:44:12 2010
@@ -24,8 +24,6 @@
import org.apache.cassandra.thrift.ConsistencyLevel;
import org.apache.cassandra.thrift.UnavailableException;
-import static org.apache.cassandra.thrift.ThriftGlue.createColumnPath;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -53,7 +51,7 @@
for (int i = 0; i < 100; i++)
{
RowMutation change = new RowMutation("Keyspace1", "key" + i);
- ColumnPath cp = createColumnPath("Standard1", null,
("colb").getBytes());
+ ColumnPath cp = new
ColumnPath("Standard1").setSuper_column(null).setColumn(("colb").getBytes());
change.add(new QueryPath(cp), ("value" + i).getBytes(), 0);
// don't call change.apply(). The reason is that is makes a
static call into Table, which will perform
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=919059&r1=919058&r2=919059&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
Thu Mar 4 16:44:12 2010
@@ -19,26 +19,11 @@
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.BytesType;
+import org.apache.cassandra.thrift.*;
import org.apache.thrift.*;
import org.antlr.runtime.tree.*;
-import static org.apache.cassandra.thrift.ThriftGlue.*;
-
-import org.apache.cassandra.service.*;
-import org.apache.cassandra.thrift.Cassandra;
-import org.apache.cassandra.thrift.Column;
-import org.apache.cassandra.thrift.ColumnOrSuperColumn;
-import org.apache.cassandra.thrift.ColumnParent;
-import org.apache.cassandra.thrift.ColumnPath;
-import org.apache.cassandra.thrift.ConsistencyLevel;
-import org.apache.cassandra.thrift.InvalidRequestException;
-import org.apache.cassandra.thrift.NotFoundException;
-import org.apache.cassandra.thrift.SliceRange;
-import org.apache.cassandra.thrift.SuperColumn;
-import org.apache.cassandra.thrift.TimedOutException;
-import org.apache.cassandra.thrift.UnavailableException;
-
import java.util.*;
import java.io.UnsupportedEncodingException;
@@ -177,12 +162,12 @@
if (columnSpecCnt == 0)
{
- colParent = createColumnParent(columnFamily, null);
+ colParent = new ColumnParent(columnFamily).setSuper_column(null);
}
else
{
assert (columnSpecCnt == 1);
- colParent = createColumnParent(columnFamily,
CliCompiler.getColumn(columnFamilySpec, 0).getBytes("UTF-8"));
+ colParent = new
ColumnParent(columnFamily).setSuper_column(CliCompiler.getColumn(columnFamilySpec,
0).getBytes("UTF-8"));
}
int count = thriftClient_.get_count(tableName, key, colParent,
ConsistencyLevel.ONE);
@@ -245,8 +230,8 @@
superColumnName = CliCompiler.getColumn(columnFamilySpec,
0).getBytes("UTF-8");
columnName = CliCompiler.getColumn(columnFamilySpec,
1).getBytes("UTF-8");
}
-
- thriftClient_.remove(tableName, key, createColumnPath(columnFamily,
superColumnName, columnName),
+
+ thriftClient_.remove(tableName, key, new
ColumnPath(columnFamily).setSuper_column(superColumnName).setColumn(columnName),
System.currentTimeMillis(), ConsistencyLevel.ONE);
css_.out.println(String.format("%s removed.", (columnSpecCnt == 0) ?
"row" : "column"));
}
@@ -255,9 +240,9 @@
throws InvalidRequestException, UnavailableException,
TimedOutException, TException, UnsupportedEncodingException,
IllegalAccessException, NotFoundException, InstantiationException,
ClassNotFoundException
{
SliceRange range = new SliceRange(ArrayUtils.EMPTY_BYTE_ARRAY,
ArrayUtils.EMPTY_BYTE_ARRAY, true, 1000000);
- List<ColumnOrSuperColumn> columns = thriftClient_.get_slice(keyspace,
key,
- createColumnParent(columnFamily, superColumnName),
- createSlicePredicate(null, range), ConsistencyLevel.ONE);
+ List<ColumnOrSuperColumn> columns = thriftClient_.get_slice(keyspace,
key,
+ new
ColumnParent(columnFamily).setSuper_column(superColumnName),
+ new
SlicePredicate().setColumn_names(null).setSlice_range(range),
ConsistencyLevel.ONE);
int size = columns.size();
// Print out super columns or columns.
@@ -374,7 +359,7 @@
}
// Perform a get(), print out the results.
- ColumnPath path = createColumnPath(columnFamily, superColumnName,
columnName);
+ ColumnPath path = new
ColumnPath(columnFamily).setSuper_column(superColumnName).setColumn(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);
@@ -423,7 +408,7 @@
}
// do the insert
- thriftClient_.insert(tableName, key, createColumnPath(columnFamily,
superColumnName, columnName),
+ thriftClient_.insert(tableName, key, new
ColumnPath(columnFamily).setSuper_column(superColumnName).setColumn(columnName),
value.getBytes(), System.currentTimeMillis(),
ConsistencyLevel.ONE);
css_.out.println("Value inserted.");
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=919059&r1=919058&r2=919059&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
Thu Mar 4 16:44:12 2010
@@ -40,13 +40,9 @@
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.Pair;
import org.apache.thrift.TException;
import org.json.simple.JSONValue;
-import static
org.apache.cassandra.thrift.ThriftGlue.createColumnOrSuperColumn_Column;
-import static
org.apache.cassandra.thrift.ThriftGlue.createColumnOrSuperColumn_SuperColumn;
-
public class CassandraServer implements Cassandra.Iface
{
public static String TOKEN_MAP = "token map";
@@ -147,7 +143,7 @@
continue;
}
Column thrift_column = new Column(column.name(), column.value(),
column.timestamp());
- thriftColumns.add(createColumnOrSuperColumn_Column(thrift_column));
+ thriftColumns.add(new
ColumnOrSuperColumn().setColumn(thrift_column));
}
// we have to do the reversing here, since internally we pass results
around in ColumnFamily
@@ -169,7 +165,7 @@
continue;
}
SuperColumn superColumn = new SuperColumn(column.name(),
subcolumns);
-
thriftSuperColumns.add(createColumnOrSuperColumn_SuperColumn(superColumn));
+ thriftSuperColumns.add(new
ColumnOrSuperColumn().setSuper_column(superColumn));
}
if (reverseOrder)
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java?rev=919059&r1=919058&r2=919059&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java
Thu Mar 4 16:44:12 2010
@@ -29,8 +29,6 @@
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.MarshalException;
-import static org.apache.cassandra.thrift.ThriftGlue.*;
-
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.RandomPartitioner;
@@ -218,14 +216,14 @@
{
if (cosc.column != null)
{
- ThriftValidation.validateColumnPath(keyspace,
createColumnPath(cfName, null, cosc.column.name));
+ ThriftValidation.validateColumnPath(keyspace, new
ColumnPath(cfName).setSuper_column(null).setColumn(cosc.column.name));
}
if (cosc.super_column != null)
{
for (Column c : cosc.super_column.columns)
{
- ThriftValidation.validateColumnPath(keyspace,
createColumnPath(cfName, cosc.super_column.name, c.name));
+ ThriftValidation.validateColumnPath(keyspace, new
ColumnPath(cfName).setSuper_column(cosc.super_column.name).setColumn(c.name));
}
}
@@ -277,7 +275,7 @@
throw new InvalidRequestException("A SlicePredicate must be given
a list of Columns, a SliceRange, or both");
if (predicate.slice_range != null)
- validateRange(keyspace, createColumnParent(cfName, scName),
predicate.slice_range);
+ validateRange(keyspace, new
ColumnParent(cfName).setSuper_column(scName), predicate.slice_range);
if (predicate.column_names != null)
validateColumns(keyspace, cfName, scName, predicate.column_names);
Modified:
incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java?rev=919059&r1=919058&r2=919059&view=diff
==============================================================================
---
incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java
(original)
+++
incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java
Thu Mar 4 16:44:12 2010
@@ -25,8 +25,6 @@
import org.apache.cassandra.thrift.ColumnPath;
import org.apache.cassandra.thrift.ConsistencyLevel;
-import static org.apache.cassandra.thrift.ThriftGlue.createColumnPath;
-
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.transport.TSocket;
@@ -89,7 +87,7 @@
for (int nRows = minRow; nRows < maxRow; nRows++)
{
String row = rowPrefix + nRows;
- ColumnPath col = createColumnPath("Standard1", null,
"col1".getBytes());
+ ColumnPath col = new
ColumnPath("Standard1").setSuper_column(null).setColumn("col1".getBytes());
List<InetAddress> endPoints = ringCache.getEndPoint(table, row);
String hosts="";
