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

refactor thrift-specific code ...server -> ...thrift 

This was mostly an IDE-driven effort.

Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904540 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Evans 2010-01-29 16:24:28 +00:00
parent 3bf9c81577
commit 542bd7904d
47 changed files with 98 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/cassandra
View File

@ -114,11 +114,11 @@ launch_service()
if [ "x$foreground" != "x" ]; then
cassandra_parms="$cassandra_parms -Dcassandra-foreground=yes"
$JAVA $JVM_OPTS $cassandra_parms -cp $CLASSPATH $props \
org.apache.cassandra.service.CassandraDaemon
org.apache.cassandra.thrift.CassandraDaemon
# Startup CassandraDaemon, background it, and write the pid.
else
exec $JAVA $JVM_OPTS $cassandra_parms -cp $CLASSPATH $props \
org.apache.cassandra.service.CassandraDaemon <&- &
org.apache.cassandra.thrift.CassandraDaemon <&- &
[ ! -z $pidpath ] && printf "%d" $! > $pidpath
fi

6
contrib/client_only/ClientOnlyExample.java
View File

@ -20,7 +20,11 @@ import org.apache.cassandra.db.*;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.service.*;
import static org.apache.cassandra.service.ThriftGlue.createColumnPath;
import org.apache.cassandra.thrift.ColumnPath;
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;

2
interface/cassandra.thrift
View File

@ -23,7 +23,7 @@
# Interface definition for Cassandra Service
#
namespace java org.apache.cassandra.service
namespace java org.apache.cassandra.thrift
namespace cpp org.apache.cassandra
namespace csharp Apache.Cassandra
namespace py cassandra

2
interface/gen-java/org/apache/cassandra/service/AuthenticationException.java → interface/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/AuthenticationRequest.java → interface/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/AuthorizationException.java → interface/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/Cassandra.java → interface/gen-java/org/apache/cassandra/thrift/Cassandra.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/Column.java → interface/gen-java/org/apache/cassandra/thrift/Column.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java → interface/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/ColumnParent.java → interface/gen-java/org/apache/cassandra/thrift/ColumnParent.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/ColumnPath.java → interface/gen-java/org/apache/cassandra/thrift/ColumnPath.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java → interface/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.Map;

2
interface/gen-java/org/apache/cassandra/service/Constants.java → interface/gen-java/org/apache/cassandra/thrift/Constants.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/Deletion.java → interface/gen-java/org/apache/cassandra/thrift/Deletion.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java → interface/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/KeySlice.java → interface/gen-java/org/apache/cassandra/thrift/KeySlice.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/Mutation.java → interface/gen-java/org/apache/cassandra/thrift/Mutation.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/NotFoundException.java → interface/gen-java/org/apache/cassandra/thrift/NotFoundException.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/SlicePredicate.java → interface/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/SliceRange.java → interface/gen-java/org/apache/cassandra/thrift/SliceRange.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/SuperColumn.java → interface/gen-java/org/apache/cassandra/thrift/SuperColumn.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/TimedOutException.java → interface/gen-java/org/apache/cassandra/thrift/TimedOutException.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

2
interface/gen-java/org/apache/cassandra/service/UnavailableException.java → interface/gen-java/org/apache/cassandra/thrift/UnavailableException.java
View File

@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
import java.util.ArrayList;

6
src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java
View File

@ -1,8 +1,8 @@
package org.apache.cassandra.auth;
import org.apache.cassandra.service.AuthenticationException;
import org.apache.cassandra.service.AuthenticationRequest;
import org.apache.cassandra.service.AuthorizationException;
import org.apache.cassandra.thrift.AuthenticationException;
import org.apache.cassandra.thrift.AuthenticationRequest;
import org.apache.cassandra.thrift.AuthorizationException;
public class AllowAllAuthenticator implements IAuthenticator
{

6
src/java/org/apache/cassandra/auth/IAuthenticator.java
View File

@ -1,8 +1,8 @@
package org.apache.cassandra.auth;
import org.apache.cassandra.service.AuthenticationException;
import org.apache.cassandra.service.AuthenticationRequest;
import org.apache.cassandra.service.AuthorizationException;
import org.apache.cassandra.thrift.AuthenticationException;
import org.apache.cassandra.thrift.AuthenticationRequest;
import org.apache.cassandra.thrift.AuthorizationException;
public interface IAuthenticator
{

3
src/java/org/apache/cassandra/auth/SimpleAuthenticator.java
View File

@ -6,6 +6,9 @@ import java.security.NoSuchAlgorithmException;
import java.util.Properties;
import org.apache.cassandra.service.*;
import org.apache.cassandra.thrift.AuthenticationException;
import org.apache.cassandra.thrift.AuthenticationRequest;
import org.apache.cassandra.thrift.AuthorizationException;
public class SimpleAuthenticator implements IAuthenticator
{

14
src/java/org/apache/cassandra/cli/CliClient.java
View File

@ -23,9 +23,21 @@ import org.apache.thrift.*;
import org.antlr.runtime.tree.*;
import static org.apache.cassandra.service.ThriftGlue.*;
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;

3
src/java/org/apache/cassandra/cli/CliMain.java
View File

@ -26,7 +26,8 @@ import org.apache.thrift.transport.TFramedTransport;
import jline.*;
import java.io.*;
import org.apache.cassandra.service.Cassandra;
import org.apache.cassandra.thrift.Cassandra;
import static org.apache.cassandra.db.Table.SYSTEM_TABLE;
//

4
src/java/org/apache/cassandra/client/RingCache.java
View File

@ -27,9 +27,9 @@ import org.apache.cassandra.locator.TokenMetadata;
import java.net.InetAddress;
import java.net.UnknownHostException;
import org.apache.cassandra.service.Cassandra;
import org.apache.cassandra.service.CassandraServer;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.thrift.Cassandra;
import org.apache.cassandra.thrift.CassandraServer;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;

2
src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java
View File

@ -18,7 +18,7 @@
package org.apache.cassandra.db;
import org.apache.cassandra.service.InvalidRequestException;
import org.apache.cassandra.thrift.InvalidRequestException;
public class ColumnFamilyNotDefinedException extends InvalidRequestException
{

2
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -35,7 +35,6 @@ import org.apache.cassandra.cache.IAggregatableCacheProvider;
import org.apache.cassandra.cache.InstrumentedCache;
import org.apache.cassandra.cache.JMXAggregatingCache;
import org.apache.cassandra.cache.JMXInstrumentedCache;
import org.apache.cassandra.service.SliceRange;
import org.apache.log4j.Logger;
import org.apache.cassandra.config.DatabaseDescriptor;
@ -47,6 +46,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.thrift.SliceRange;
import org.apache.cassandra.utils.*;
import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
import org.apache.cassandra.concurrent.NamedThreadFactory;

1
src/java/org/apache/cassandra/db/HintedHandOffManager.java
View File

@ -40,6 +40,7 @@ import org.apache.commons.lang.ArrayUtils;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.*;
import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.cassandra.db.filter.IdentityQueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.utils.WrappedRunnable;

2
src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java
View File

@ -18,7 +18,7 @@
*/
package org.apache.cassandra.db;
import org.apache.cassandra.service.InvalidRequestException;
import org.apache.cassandra.thrift.InvalidRequestException;
public class KeyspaceNotDefinedException extends InvalidRequestException
{

6
src/java/org/apache/cassandra/db/RangeSliceCommand.java
View File

@ -38,14 +38,14 @@ package org.apache.cassandra.db;
import org.apache.cassandra.concurrent.StageManager;
import static org.apache.cassandra.service.ThriftGlue.createColumnParent;
import static org.apache.cassandra.thrift.ThriftGlue.createColumnParent;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.service.ColumnParent;
import org.apache.cassandra.service.SlicePredicate;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.thrift.ColumnParent;
import org.apache.cassandra.thrift.SlicePredicate;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.thrift.TDeserializer;
import org.apache.thrift.TException;

7
src/java/org/apache/cassandra/db/RowMutation.java
View File

@ -37,6 +37,9 @@ import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.service.*;
import org.apache.cassandra.thrift.ColumnOrSuperColumn;
import org.apache.cassandra.thrift.Deletion;
import org.apache.cassandra.thrift.Mutation;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.config.DatabaseDescriptor;
@ -246,7 +249,7 @@ public class RowMutation
if (cosc.column == null)
{
assert cosc.super_column != null;
for (org.apache.cassandra.service.Column column : cosc.super_column.columns)
for (org.apache.cassandra.thrift.Column column : cosc.super_column.columns)
{
rm.add(new QueryPath(cfName, cosc.super_column.name, column.name), column.value, column.timestamp);
}
@ -281,7 +284,7 @@ public class RowMutation
{
if (cosc.column == null)
{
for (org.apache.cassandra.service.Column column : cosc.super_column.columns)
for (org.apache.cassandra.thrift.Column column : cosc.super_column.columns)
{
rm.add(new QueryPath(cfName, cosc.super_column.name, column.name), column.value, column.timestamp);
}

2
src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
View File

@ -22,7 +22,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.*;
import org.apache.cassandra.service.ColumnParent;
import org.apache.cassandra.thrift.ColumnParent;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.db.filter.NamesQueryFilter;

2
src/java/org/apache/cassandra/db/SliceFromReadCommand.java
View File

@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.db.filter.SliceQueryFilter;
import org.apache.cassandra.service.ColumnParent;
import org.apache.cassandra.thrift.ColumnParent;
public class SliceFromReadCommand extends ReadCommand
{

4
src/java/org/apache/cassandra/db/filter/QueryPath.java
View File

@ -27,8 +27,8 @@ import java.io.DataInputStream;
import org.apache.commons.lang.ArrayUtils;
import org.apache.cassandra.service.ColumnParent;
import org.apache.cassandra.service.ColumnPath;
import org.apache.cassandra.thrift.ColumnParent;
import org.apache.cassandra.thrift.ColumnPath;
import org.apache.cassandra.db.ColumnSerializer;
public class QueryPath

2
src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
View File

@ -28,10 +28,10 @@ import com.google.common.collect.Multimap;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.gms.FailureDetector;
import org.apache.cassandra.service.ConsistencyLevel;
import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.service.WriteResponseHandler;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.thrift.ConsistencyLevel;
import org.apache.cassandra.utils.FBUtilities;
/**

1
src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
View File

@ -31,6 +31,7 @@ import java.util.Map.Entry;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.service.*;
import org.apache.cassandra.thrift.ConsistencyLevel;
/**
* This Stategy is little diffrent than the Rack aware Statergy. If there is

6
src/java/org/apache/cassandra/service/StorageProxy.java
View File

@ -37,6 +37,9 @@ import org.apache.cassandra.net.IAsyncResult;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.LatencyTracker;
import org.apache.cassandra.thrift.ConsistencyLevel;
import org.apache.cassandra.thrift.UnavailableException;
import org.apache.cassandra.utils.TimedStatsDeque;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.WrappedRunnable;
@ -530,7 +533,8 @@ public class StorageProxy implements StorageProxyMBean
return rows;
}
static List<Pair<String, ColumnFamily>> getRangeSlice(RangeSliceCommand command, ConsistencyLevel consistency_level) throws IOException, UnavailableException, TimeoutException
public static List<Pair<String, ColumnFamily>> getRangeSlice(RangeSliceCommand command, ConsistencyLevel consistency_level)
throws IOException, UnavailableException, TimeoutException
{
long startTime = System.currentTimeMillis();
TokenMetadata tokenMetadata = StorageService.instance.getTokenMetadata();

4
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -37,6 +37,8 @@ import org.apache.cassandra.gms.*;
import org.apache.cassandra.locator.*;
import org.apache.cassandra.net.*;
import org.apache.cassandra.service.AntiEntropyService.TreeRequestVerbHandler;
import org.apache.cassandra.thrift.ConsistencyLevel;
import org.apache.cassandra.thrift.UnavailableException;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.WrappedRunnable;
import org.apache.cassandra.io.SSTableReader;
@ -1192,7 +1194,7 @@ public class StorageService implements IEndPointStateChangeSubscriber, StorageSe
throw new UnavailableException(); // no nodes that could contain key are alive
}
Map<String, String> getStringEndpointMap()
public Map<String, String> getStringEndpointMap()
{
HashMap<String, String> map = new HashMap<String, String>();
for (Token t : tokenMetadata_.sortedTokens())

4
src/java/org/apache/cassandra/service/CassandraDaemon.java → src/java/org/apache/cassandra/thrift/CassandraDaemon.java
View File

@ -16,7 +16,7 @@
* limitations under the License.
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.io.File;
import java.io.IOException;
@ -35,6 +35,8 @@ import org.apache.thrift.transport.TTransportFactory;
import org.apache.thrift.transport.TFramedTransport;
import org.apache.thrift.TProcessorFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.thrift.Cassandra.Processor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.db.RecoveryManager;

6
src/java/org/apache/cassandra/service/CassandraServer.java → src/java/org/apache/cassandra/thrift/CassandraServer.java
View File

@ -16,7 +16,7 @@
* limitations under the License.
*/
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
@ -35,9 +35,11 @@ import org.apache.cassandra.db.*;
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.db.filter.QueryPath;
import static org.apache.cassandra.service.ThriftGlue.*;
import static org.apache.cassandra.thrift.ThriftGlue.*;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.thrift.Cassandra.Iface;
import org.apache.cassandra.utils.Pair;
import org.apache.thrift.TException;
import org.json.simple.JSONValue;

3
src/java/org/apache/cassandra/service/ThriftGlue.java → src/java/org/apache/cassandra/thrift/ThriftGlue.java
View File

@ -1,7 +1,8 @@
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
import java.util.List;
public class ThriftGlue
{
private static ColumnOrSuperColumn createColumnOrSuperColumn(Column col, SuperColumn scol)

4
src/java/org/apache/cassandra/service/ThriftValidation.java → src/java/org/apache/cassandra/thrift/ThriftValidation.java
View File

@ -1,4 +1,4 @@
package org.apache.cassandra.service;
package org.apache.cassandra.thrift;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@ -30,7 +30,7 @@ import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.MarshalException;
import static org.apache.cassandra.service.ThriftGlue.*;
import static org.apache.cassandra.thrift.ThriftGlue.*;
import org.apache.cassandra.config.DatabaseDescriptor;

12
test/unit/org/apache/cassandra/client/TestRingCache.java
View File

@ -20,11 +20,13 @@ package org.apache.cassandra.client;
import java.net.InetAddress;
import java.util.List;
import org.apache.cassandra.service.Cassandra;
import org.apache.cassandra.service.Column;
import org.apache.cassandra.service.ColumnPath;
import org.apache.cassandra.service.ConsistencyLevel;
import static org.apache.cassandra.service.ThriftGlue.createColumnPath;
import org.apache.cassandra.thrift.Cassandra;
import org.apache.cassandra.thrift.Column;
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;