You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ee...@apache.org on 2010/01/29 17:23:43 UTC
svn commit: r904540 - in /incubator/cassandra/trunk: bin/
contrib/client_only/ interface/
interface/gen-java/org/apache/cassandra/service/
interface/gen-java/org/apache/cassandra/thrift/
src/java/org/apache/cassandra/auth/ src/java/org/apache/cassandra...
Author: eevans
Date: Fri Jan 29 16:23:39 2010
New Revision: 904540
URL: http://svn.apache.org/viewvc?rev=904540&view=rev
Log:
refactor thrift-specific code ...server -> ...thrift
This was mostly an IDE-driven effort.
Patch by eevans
Added:
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthenticationException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthenticationRequest.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthorizationException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Cassandra.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Column.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnParent.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnPath.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Constants.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Constants.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Deletion.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Deletion.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/KeySlice.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/KeySlice.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Mutation.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Mutation.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/NotFoundException.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SliceRange.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SuperColumn.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/TimedOutException.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/TimedOutException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/UnavailableException.java
- copied, changed from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
- copied, changed from r904536, incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
- copied, changed from r904536, incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftGlue.java
- copied, changed from r904536, incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftGlue.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java
- copied, changed from r904536, incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java
Removed:
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthenticationException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthenticationRequest.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthorizationException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Constants.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Deletion.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/KeySlice.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Mutation.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/TimedOutException.java
incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftGlue.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java
Modified:
incubator/cassandra/trunk/bin/cassandra
incubator/cassandra/trunk/contrib/client_only/ClientOnlyExample.java
incubator/cassandra/trunk/interface/cassandra.thrift
incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/IAuthenticator.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliMain.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryPath.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java
Modified: incubator/cassandra/trunk/bin/cassandra
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/bin/cassandra?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/bin/cassandra (original)
+++ incubator/cassandra/trunk/bin/cassandra Fri Jan 29 16:23:39 2010
@@ -114,11 +114,11 @@
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
Modified: incubator/cassandra/trunk/contrib/client_only/ClientOnlyExample.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/contrib/client_only/ClientOnlyExample.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/contrib/client_only/ClientOnlyExample.java (original)
+++ incubator/cassandra/trunk/contrib/client_only/ClientOnlyExample.java Fri Jan 29 16:23:39 2010
@@ -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;
Modified: incubator/cassandra/trunk/interface/cassandra.thrift
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/cassandra.thrift?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/cassandra.thrift (original)
+++ incubator/cassandra/trunk/interface/cassandra.thrift Fri Jan 29 16:23:39 2010
@@ -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
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthenticationException.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthenticationException.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthenticationException.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthenticationException.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthenticationException.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthenticationException.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthenticationException.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthenticationRequest.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthenticationRequest.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthenticationRequest.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthorizationException.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthorizationException.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthorizationException.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthorizationException.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthorizationException.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/AuthorizationException.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/AuthorizationException.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Cassandra.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Cassandra.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Cassandra.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Cassandra.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Column.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Column.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Column.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Column.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnOrSuperColumn.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnParent.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnParent.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnParent.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnParent.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnParent.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnPath.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnPath.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnPath.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ColumnPath.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ColumnPath.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/ConsistencyLevel.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Constants.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Constants.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Constants.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Constants.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Constants.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Constants.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Constants.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Deletion.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Deletion.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Deletion.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Deletion.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Deletion.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Deletion.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Deletion.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/KeySlice.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/KeySlice.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/KeySlice.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/KeySlice.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/KeySlice.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/KeySlice.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/KeySlice.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Mutation.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Mutation.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Mutation.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Mutation.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Mutation.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Mutation.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/Mutation.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/NotFoundException.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/NotFoundException.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/NotFoundException.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/NotFoundException.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SlicePredicate.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SlicePredicate.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SlicePredicate.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SlicePredicate.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SliceRange.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SliceRange.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SliceRange.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SliceRange.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SuperColumn.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SuperColumn.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SuperColumn.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/SuperColumn.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/TimedOutException.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/TimedOutException.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/TimedOutException.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/TimedOutException.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/TimedOutException.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/TimedOutException.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/TimedOutException.java Fri Jan 29 16:23:39 2010
@@ -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;
Copied: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/UnavailableException.java (from r904536, incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/UnavailableException.java?p2=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/UnavailableException.java&p1=incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java (original)
+++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/thrift/UnavailableException.java Fri Jan 29 16:23:39 2010
@@ -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;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java Fri Jan 29 16:23:39 2010
@@ -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
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/IAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/IAuthenticator.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/IAuthenticator.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/IAuthenticator.java Fri Jan 29 16:23:39 2010
@@ -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
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/auth/SimpleAuthenticator.java Fri Jan 29 16:23:39 2010
@@ -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
{
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=904540&r1=904539&r2=904540&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 Fri Jan 29 16:23:39 2010
@@ -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;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliMain.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliMain.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliMain.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliMain.java Fri Jan 29 16:23:39 2010
@@ -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;
//
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java Fri Jan 29 16:23:39 2010
@@ -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;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyNotDefinedException.java Fri Jan 29 16:23:39 2010
@@ -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
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Fri Jan 29 16:23:39 2010
@@ -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;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java Fri Jan 29 16:23:39 2010
@@ -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;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java Fri Jan 29 16:23:39 2010
@@ -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
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java Fri Jan 29 16:23:39 2010
@@ -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;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java Fri Jan 29 16:23:39 2010
@@ -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 @@
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 @@
{
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);
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java Fri Jan 29 16:23:39 2010
@@ -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;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java Fri Jan 29 16:23:39 2010
@@ -23,7 +23,7 @@
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
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryPath.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryPath.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryPath.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryPath.java Fri Jan 29 16:23:39 2010
@@ -27,8 +27,8 @@
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
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java Fri Jan 29 16:23:39 2010
@@ -28,10 +28,10 @@
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;
/**
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/DatacenterShardStategy.java Fri Jan 29 16:23:39 2010
@@ -31,6 +31,7 @@
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
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Fri Jan 29 16:23:39 2010
@@ -37,6 +37,9 @@
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 @@
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();
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=904540&r1=904539&r2=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Fri Jan 29 16:23:39 2010
@@ -37,6 +37,8 @@
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 @@
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())
Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraDaemon.java (from r904536, incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraDaemon.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraDaemon.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraDaemon.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraDaemon.java Fri Jan 29 16:23:39 2010
@@ -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.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;
Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java (from r904536, incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java Fri Jan 29 16:23:39 2010
@@ -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.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;
Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftGlue.java (from r904536, incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftGlue.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftGlue.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftGlue.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftGlue.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftGlue.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftGlue.java Fri Jan 29 16:23:39 2010
@@ -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)
Copied: incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java (from r904536, incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java)
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java&r1=904536&r2=904540&rev=904540&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ThriftValidation.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java Fri Jan 29 16:23:39 2010
@@ -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.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;
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=904540&r1=904539&r2=904540&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 Fri Jan 29 16:23:39 2010
@@ -20,11 +20,13 @@
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;