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
yuanhui-yang · Jan 29, 2010 · 542bd79 · 542bd79
1 parent 3bf9c81
commit 542bd79
Show file tree

Hide file tree

Showing 47 changed files with 98 additions and 60 deletions.
diff --git 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
@@ -20,7 +20,11 @@
 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
@@ -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/...ndra/service/AuthenticationException.java → ...andra/thrift/AuthenticationException.java b/...ndra/service/AuthenticationException.java → ...andra/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/...sandra/service/AuthenticationRequest.java → ...ssandra/thrift/AuthenticationRequest.java b/...sandra/service/AuthenticationRequest.java → ...ssandra/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/...andra/service/AuthorizationException.java → ...sandra/thrift/AuthorizationException.java b/...andra/service/AuthorizationException.java → ...sandra/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/...g/apache/cassandra/service/Cassandra.java → ...rg/apache/cassandra/thrift/Cassandra.java b/...g/apache/cassandra/service/Cassandra.java → ...rg/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/.../org/apache/cassandra/service/Column.java → ...a/org/apache/cassandra/thrift/Column.java b/.../org/apache/cassandra/service/Column.java → ...a/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/...assandra/service/ColumnOrSuperColumn.java → ...cassandra/thrift/ColumnOrSuperColumn.java b/...assandra/service/ColumnOrSuperColumn.java → ...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/...pache/cassandra/service/ColumnParent.java → ...apache/cassandra/thrift/ColumnParent.java b/...pache/cassandra/service/ColumnParent.java → ...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/.../apache/cassandra/service/ColumnPath.java → ...g/apache/cassandra/thrift/ColumnPath.java b/.../apache/cassandra/service/ColumnPath.java → ...g/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/...e/cassandra/service/ConsistencyLevel.java → ...he/cassandra/thrift/ConsistencyLevel.java b/...e/cassandra/service/ConsistencyLevel.java → ...he/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/...g/apache/cassandra/service/Constants.java → ...rg/apache/cassandra/thrift/Constants.java b/...g/apache/cassandra/service/Constants.java → ...rg/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/...rg/apache/cassandra/service/Deletion.java → ...org/apache/cassandra/thrift/Deletion.java b/...rg/apache/cassandra/service/Deletion.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/...ndra/service/InvalidRequestException.java → ...andra/thrift/InvalidRequestException.java b/...ndra/service/InvalidRequestException.java → ...andra/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/...rg/apache/cassandra/service/KeySlice.java → ...org/apache/cassandra/thrift/KeySlice.java b/...rg/apache/cassandra/service/KeySlice.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/...rg/apache/cassandra/service/Mutation.java → ...org/apache/cassandra/thrift/Mutation.java b/...rg/apache/cassandra/service/Mutation.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/.../cassandra/service/NotFoundException.java → ...e/cassandra/thrift/NotFoundException.java b/.../cassandra/service/NotFoundException.java → ...e/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/...che/cassandra/service/SlicePredicate.java → ...ache/cassandra/thrift/SlicePredicate.java b/...che/cassandra/service/SlicePredicate.java → ...ache/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/.../apache/cassandra/service/SliceRange.java → ...g/apache/cassandra/thrift/SliceRange.java b/.../apache/cassandra/service/SliceRange.java → ...g/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/...apache/cassandra/service/SuperColumn.java → .../apache/cassandra/thrift/SuperColumn.java b/...apache/cassandra/service/SuperColumn.java → .../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/.../cassandra/service/TimedOutException.java → ...e/cassandra/thrift/TimedOutException.java b/.../cassandra/service/TimedOutException.java → ...e/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/...ssandra/service/UnavailableException.java → ...assandra/thrift/UnavailableException.java b/...ssandra/service/UnavailableException.java → ...assandra/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
@@ -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
@@ -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
@@ -6,6 +6,9 @@
 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
@@ -23,9 +23,21 @@
 
 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
@@ -26,7 +26,8 @@
 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
@@ -27,9 +27,9 @@
 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
@@ -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
@@ -35,7 +35,6 @@
 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.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
@@ -40,6 +40,7 @@
 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
@@ -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
@@ -38,14 +38,14 @@
 
 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
@@ -37,6 +37,9 @@
 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 static RowMutation getRowMutation(String table, String key, Map<String, L
                 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 @@ private static void addColumnOrSuperColumnToRowMutation(RowMutation rm, String c
     {
         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
@@ -22,7 +22,7 @@
 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;