From 542bd7904dcf54cce2276930aa43841b6eec8e0f Mon Sep 17 00:00:00 2001 From: Eric Evans Date: Fri, 29 Jan 2010 16:24:28 +0000 Subject: [PATCH] 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 --- bin/cassandra | 4 ++-- contrib/client_only/ClientOnlyExample.java | 6 +++++- interface/cassandra.thrift | 2 +- .../AuthenticationException.java | 2 +- .../{service => thrift}/AuthenticationRequest.java | 2 +- .../AuthorizationException.java | 2 +- .../cassandra/{service => thrift}/Cassandra.java | 2 +- .../cassandra/{service => thrift}/Column.java | 2 +- .../{service => thrift}/ColumnOrSuperColumn.java | 2 +- .../{service => thrift}/ColumnParent.java | 2 +- .../cassandra/{service => thrift}/ColumnPath.java | 2 +- .../{service => thrift}/ConsistencyLevel.java | 2 +- .../cassandra/{service => thrift}/Constants.java | 2 +- .../cassandra/{service => thrift}/Deletion.java | 2 +- .../InvalidRequestException.java | 2 +- .../cassandra/{service => thrift}/KeySlice.java | 2 +- .../cassandra/{service => thrift}/Mutation.java | 2 +- .../{service => thrift}/NotFoundException.java | 2 +- .../{service => thrift}/SlicePredicate.java | 2 +- .../cassandra/{service => thrift}/SliceRange.java | 2 +- .../cassandra/{service => thrift}/SuperColumn.java | 2 +- .../{service => thrift}/TimedOutException.java | 2 +- .../{service => thrift}/UnavailableException.java | 2 +- .../cassandra/auth/AllowAllAuthenticator.java | 6 +++--- .../org/apache/cassandra/auth/IAuthenticator.java | 6 +++--- .../apache/cassandra/auth/SimpleAuthenticator.java | 3 +++ src/java/org/apache/cassandra/cli/CliClient.java | 14 +++++++++++++- src/java/org/apache/cassandra/cli/CliMain.java | 3 ++- .../org/apache/cassandra/client/RingCache.java | 4 ++-- .../db/ColumnFamilyNotDefinedException.java | 2 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../apache/cassandra/db/HintedHandOffManager.java | 1 + .../cassandra/db/KeyspaceNotDefinedException.java | 2 +- .../org/apache/cassandra/db/RangeSliceCommand.java | 6 +++--- src/java/org/apache/cassandra/db/RowMutation.java | 7 +++++-- .../cassandra/db/SliceByNamesReadCommand.java | 2 +- .../apache/cassandra/db/SliceFromReadCommand.java | 2 +- .../org/apache/cassandra/db/filter/QueryPath.java | 4 ++-- .../locator/AbstractReplicationStrategy.java | 2 +- .../cassandra/locator/DatacenterShardStategy.java | 1 + .../org/apache/cassandra/service/StorageProxy.java | 6 +++++- .../apache/cassandra/service/StorageService.java | 4 +++- .../{service => thrift}/CassandraDaemon.java | 4 +++- .../{service => thrift}/CassandraServer.java | 6 ++++-- .../cassandra/{service => thrift}/ThriftGlue.java | 3 ++- .../{service => thrift}/ThriftValidation.java | 4 ++-- .../org/apache/cassandra/client/TestRingCache.java | 12 +++++++----- 47 files changed, 98 insertions(+), 60 deletions(-) rename interface/gen-java/org/apache/cassandra/{service => thrift}/AuthenticationException.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/AuthenticationRequest.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/AuthorizationException.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/Cassandra.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/Column.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/ColumnOrSuperColumn.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/ColumnParent.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/ColumnPath.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/ConsistencyLevel.java (98%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/Constants.java (93%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/Deletion.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/InvalidRequestException.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/KeySlice.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/Mutation.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/NotFoundException.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/SlicePredicate.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/SliceRange.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/SuperColumn.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/TimedOutException.java (99%) rename interface/gen-java/org/apache/cassandra/{service => thrift}/UnavailableException.java (99%) rename src/java/org/apache/cassandra/{service => thrift}/CassandraDaemon.java (97%) rename src/java/org/apache/cassandra/{service => thrift}/CassandraServer.java (99%) rename src/java/org/apache/cassandra/{service => thrift}/ThriftGlue.java (97%) rename src/java/org/apache/cassandra/{service => thrift}/ThriftValidation.java (99%) diff --git a/bin/cassandra b/bin/cassandra index f31cb56008..6c6d74cbea 100755 --- a/bin/cassandra +++ b/bin/cassandra @@ -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 diff --git a/contrib/client_only/ClientOnlyExample.java b/contrib/client_only/ClientOnlyExample.java index 3d9780a346..fb24a8a6ff 100644 --- a/contrib/client_only/ClientOnlyExample.java +++ b/contrib/client_only/ClientOnlyExample.java @@ -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; diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift index e3ed366444..04839f64d5 100644 --- a/interface/cassandra.thrift +++ b/interface/cassandra.thrift @@ -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 diff --git a/interface/gen-java/org/apache/cassandra/service/AuthenticationException.java b/interface/gen-java/org/apache/cassandra/thrift/AuthenticationException.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/AuthenticationException.java rename to interface/gen-java/org/apache/cassandra/thrift/AuthenticationException.java index d46d59a9d2..55e287e26c 100644 --- a/interface/gen-java/org/apache/cassandra/service/AuthenticationException.java +++ b/interface/gen-java/org/apache/cassandra/thrift/AuthenticationException.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/AuthenticationRequest.java b/interface/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/AuthenticationRequest.java rename to interface/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java index df4c92e764..fdcd61e38f 100644 --- a/interface/gen-java/org/apache/cassandra/service/AuthenticationRequest.java +++ b/interface/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/AuthorizationException.java b/interface/gen-java/org/apache/cassandra/thrift/AuthorizationException.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/AuthorizationException.java rename to interface/gen-java/org/apache/cassandra/thrift/AuthorizationException.java index 9c2683b923..0016771a52 100644 --- a/interface/gen-java/org/apache/cassandra/service/AuthorizationException.java +++ b/interface/gen-java/org/apache/cassandra/thrift/AuthorizationException.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/Cassandra.java b/interface/gen-java/org/apache/cassandra/thrift/Cassandra.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/Cassandra.java rename to interface/gen-java/org/apache/cassandra/thrift/Cassandra.java index 2c6d2bf10f..c03d269710 100644 --- a/interface/gen-java/org/apache/cassandra/service/Cassandra.java +++ b/interface/gen-java/org/apache/cassandra/thrift/Cassandra.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/Column.java b/interface/gen-java/org/apache/cassandra/thrift/Column.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/Column.java rename to interface/gen-java/org/apache/cassandra/thrift/Column.java index 538e1f914c..a2f9dd5dfb 100644 --- a/interface/gen-java/org/apache/cassandra/service/Column.java +++ b/interface/gen-java/org/apache/cassandra/thrift/Column.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java b/interface/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java rename to interface/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java index 9e320a1ac7..011593d665 100644 --- a/interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java +++ b/interface/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/ColumnParent.java b/interface/gen-java/org/apache/cassandra/thrift/ColumnParent.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/ColumnParent.java rename to interface/gen-java/org/apache/cassandra/thrift/ColumnParent.java index dea9533393..eed9b5b16c 100644 --- a/interface/gen-java/org/apache/cassandra/service/ColumnParent.java +++ b/interface/gen-java/org/apache/cassandra/thrift/ColumnParent.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/ColumnPath.java b/interface/gen-java/org/apache/cassandra/thrift/ColumnPath.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/ColumnPath.java rename to interface/gen-java/org/apache/cassandra/thrift/ColumnPath.java index 73e9254eb3..6153608b9b 100644 --- a/interface/gen-java/org/apache/cassandra/service/ColumnPath.java +++ b/interface/gen-java/org/apache/cassandra/thrift/ColumnPath.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java b/interface/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java similarity index 98% rename from interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java rename to interface/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java index 27d7c838fd..ba2e1067b7 100644 --- a/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java +++ b/interface/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/Constants.java b/interface/gen-java/org/apache/cassandra/thrift/Constants.java similarity index 93% rename from interface/gen-java/org/apache/cassandra/service/Constants.java rename to interface/gen-java/org/apache/cassandra/thrift/Constants.java index 1f8c082293..0a568b4408 100644 --- a/interface/gen-java/org/apache/cassandra/service/Constants.java +++ b/interface/gen-java/org/apache/cassandra/thrift/Constants.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/Deletion.java b/interface/gen-java/org/apache/cassandra/thrift/Deletion.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/Deletion.java rename to interface/gen-java/org/apache/cassandra/thrift/Deletion.java index 85415f8c26..04723ae9d7 100644 --- a/interface/gen-java/org/apache/cassandra/service/Deletion.java +++ b/interface/gen-java/org/apache/cassandra/thrift/Deletion.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java b/interface/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java rename to interface/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java index a9db9f2fa1..c3ca34a2b0 100644 --- a/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java +++ b/interface/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/KeySlice.java b/interface/gen-java/org/apache/cassandra/thrift/KeySlice.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/KeySlice.java rename to interface/gen-java/org/apache/cassandra/thrift/KeySlice.java index adcf2feafa..da14fda3b3 100644 --- a/interface/gen-java/org/apache/cassandra/service/KeySlice.java +++ b/interface/gen-java/org/apache/cassandra/thrift/KeySlice.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/Mutation.java b/interface/gen-java/org/apache/cassandra/thrift/Mutation.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/Mutation.java rename to interface/gen-java/org/apache/cassandra/thrift/Mutation.java index 697ce7df96..b9089cd708 100644 --- a/interface/gen-java/org/apache/cassandra/service/Mutation.java +++ b/interface/gen-java/org/apache/cassandra/thrift/Mutation.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/NotFoundException.java b/interface/gen-java/org/apache/cassandra/thrift/NotFoundException.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/NotFoundException.java rename to interface/gen-java/org/apache/cassandra/thrift/NotFoundException.java index 125ae67ca2..4a7ffcf05c 100644 --- a/interface/gen-java/org/apache/cassandra/service/NotFoundException.java +++ b/interface/gen-java/org/apache/cassandra/thrift/NotFoundException.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java b/interface/gen-java/org/apache/cassandra/thrift/SlicePredicate.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/SlicePredicate.java rename to interface/gen-java/org/apache/cassandra/thrift/SlicePredicate.java index de51c1a077..b192e1caf7 100644 --- a/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java +++ b/interface/gen-java/org/apache/cassandra/thrift/SlicePredicate.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/SliceRange.java b/interface/gen-java/org/apache/cassandra/thrift/SliceRange.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/SliceRange.java rename to interface/gen-java/org/apache/cassandra/thrift/SliceRange.java index e085e35ce3..aceeddddc6 100644 --- a/interface/gen-java/org/apache/cassandra/service/SliceRange.java +++ b/interface/gen-java/org/apache/cassandra/thrift/SliceRange.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/SuperColumn.java b/interface/gen-java/org/apache/cassandra/thrift/SuperColumn.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/SuperColumn.java rename to interface/gen-java/org/apache/cassandra/thrift/SuperColumn.java index 3cee884003..609550572e 100644 --- a/interface/gen-java/org/apache/cassandra/service/SuperColumn.java +++ b/interface/gen-java/org/apache/cassandra/thrift/SuperColumn.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/TimedOutException.java b/interface/gen-java/org/apache/cassandra/thrift/TimedOutException.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/TimedOutException.java rename to interface/gen-java/org/apache/cassandra/thrift/TimedOutException.java index 00b17c0532..867e61b1aa 100644 --- a/interface/gen-java/org/apache/cassandra/service/TimedOutException.java +++ b/interface/gen-java/org/apache/cassandra/thrift/TimedOutException.java @@ -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; diff --git a/interface/gen-java/org/apache/cassandra/service/UnavailableException.java b/interface/gen-java/org/apache/cassandra/thrift/UnavailableException.java similarity index 99% rename from interface/gen-java/org/apache/cassandra/service/UnavailableException.java rename to interface/gen-java/org/apache/cassandra/thrift/UnavailableException.java index 0e25bbc957..17dd14c119 100644 --- a/interface/gen-java/org/apache/cassandra/service/UnavailableException.java +++ b/interface/gen-java/org/apache/cassandra/thrift/UnavailableException.java @@ -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; diff --git a/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java b/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java index cc3c09b1fb..a2c6053d46 100644 --- a/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java +++ b/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java @@ -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 { diff --git a/src/java/org/apache/cassandra/auth/IAuthenticator.java b/src/java/org/apache/cassandra/auth/IAuthenticator.java index 05ddea119f..62d51dff3f 100644 --- a/src/java/org/apache/cassandra/auth/IAuthenticator.java +++ b/src/java/org/apache/cassandra/auth/IAuthenticator.java @@ -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 { diff --git a/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java b/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java index 869f20f46d..0c7a483b57 100644 --- a/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java +++ b/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java @@ -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 { diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java index 1c7fbf1d37..146c3066f4 100644 --- a/src/java/org/apache/cassandra/cli/CliClient.java +++ b/src/java/org/apache/cassandra/cli/CliClient.java @@ -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; diff --git a/src/java/org/apache/cassandra/cli/CliMain.java b/src/java/org/apache/cassandra/cli/CliMain.java index e510182361..ffa167f7d0 100644 --- a/src/java/org/apache/cassandra/cli/CliMain.java +++ b/src/java/org/apache/cassandra/cli/CliMain.java @@ -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; // diff --git a/src/java/org/apache/cassandra/client/RingCache.java b/src/java/org/apache/cassandra/client/RingCache.java index facb352e1f..ff28a2002c 100644 --- a/src/java/org/apache/cassandra/client/RingCache.java +++ b/src/java/org/apache/cassandra/client/RingCache.java @@ -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; diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java b/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java index 9349ab9f69..626dc24c44 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java @@ -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 { diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 8254bbb1c6..482cf4b0de 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -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; diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java index dc0f94bc57..d814a7f33d 100644 --- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java +++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java @@ -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; diff --git a/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java b/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java index 969d4f43de..fe6d91b33f 100644 --- a/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java +++ b/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java @@ -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 { diff --git a/src/java/org/apache/cassandra/db/RangeSliceCommand.java b/src/java/org/apache/cassandra/db/RangeSliceCommand.java index 81857832a5..2160884ec1 100644 --- a/src/java/org/apache/cassandra/db/RangeSliceCommand.java +++ b/src/java/org/apache/cassandra/db/RangeSliceCommand.java @@ -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; diff --git a/src/java/org/apache/cassandra/db/RowMutation.java b/src/java/org/apache/cassandra/db/RowMutation.java index bda5a4d63f..3fe40ee46c 100644 --- a/src/java/org/apache/cassandra/db/RowMutation.java +++ b/src/java/org/apache/cassandra/db/RowMutation.java @@ -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); } diff --git a/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java b/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java index fdd8402881..18554dcc65 100644 --- a/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java +++ b/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java @@ -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; diff --git a/src/java/org/apache/cassandra/db/SliceFromReadCommand.java b/src/java/org/apache/cassandra/db/SliceFromReadCommand.java index 8a65af7466..1c5a8dc44a 100644 --- a/src/java/org/apache/cassandra/db/SliceFromReadCommand.java +++ b/src/java/org/apache/cassandra/db/SliceFromReadCommand.java @@ -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 { diff --git a/src/java/org/apache/cassandra/db/filter/QueryPath.java b/src/java/org/apache/cassandra/db/filter/QueryPath.java index 62a3e829ed..b17858031a 100644 --- a/src/java/org/apache/cassandra/db/filter/QueryPath.java +++ b/src/java/org/apache/cassandra/db/filter/QueryPath.java @@ -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 diff --git a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java index fb584e4efa..19bd501cb1 100644 --- a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java +++ b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java @@ -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; /** diff --git a/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java b/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java index 830492cbc1..b648be3514 100644 --- a/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java +++ b/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java @@ -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 diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 6f6b5bf0c1..d02277d3a8 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -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> getRangeSlice(RangeSliceCommand command, ConsistencyLevel consistency_level) throws IOException, UnavailableException, TimeoutException + public static List> getRangeSlice(RangeSliceCommand command, ConsistencyLevel consistency_level) + throws IOException, UnavailableException, TimeoutException { long startTime = System.currentTimeMillis(); TokenMetadata tokenMetadata = StorageService.instance.getTokenMetadata(); diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index f4448e5816..1e244290f1 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -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 getStringEndpointMap() + public Map getStringEndpointMap() { HashMap map = new HashMap(); for (Token t : tokenMetadata_.sortedTokens()) diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/thrift/CassandraDaemon.java similarity index 97% rename from src/java/org/apache/cassandra/service/CassandraDaemon.java rename to src/java/org/apache/cassandra/thrift/CassandraDaemon.java index 5394d1946a..496eed04c5 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/thrift/CassandraDaemon.java @@ -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; diff --git a/src/java/org/apache/cassandra/service/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java similarity index 99% rename from src/java/org/apache/cassandra/service/CassandraServer.java rename to src/java/org/apache/cassandra/thrift/CassandraServer.java index 9a8dcb2099..7d7e28a6e8 100644 --- a/src/java/org/apache/cassandra/service/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -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; diff --git a/src/java/org/apache/cassandra/service/ThriftGlue.java b/src/java/org/apache/cassandra/thrift/ThriftGlue.java similarity index 97% rename from src/java/org/apache/cassandra/service/ThriftGlue.java rename to src/java/org/apache/cassandra/thrift/ThriftGlue.java index 581264e653..2c545e11e2 100644 --- a/src/java/org/apache/cassandra/service/ThriftGlue.java +++ b/src/java/org/apache/cassandra/thrift/ThriftGlue.java @@ -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) diff --git a/src/java/org/apache/cassandra/service/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java similarity index 99% rename from src/java/org/apache/cassandra/service/ThriftValidation.java rename to src/java/org/apache/cassandra/thrift/ThriftValidation.java index 58c78d0660..52bf15e048 100644 --- a/src/java/org/apache/cassandra/service/ThriftValidation.java +++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java @@ -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; diff --git a/test/unit/org/apache/cassandra/client/TestRingCache.java b/test/unit/org/apache/cassandra/client/TestRingCache.java index 7c9eb2a518..4cf51c16a2 100644 --- a/test/unit/org/apache/cassandra/client/TestRingCache.java +++ b/test/unit/org/apache/cassandra/client/TestRingCache.java @@ -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;