svn commit: r831433 - in /incubator/cassandra/trunk: contrib/bmt_example/CassandraBulkLoader.java src/java/org/apache/cassandra/service/StorageService.java

[jb...@apache.org]

Author: jbellis
Date: Fri Oct 30 19:45:38 2009
New Revision: 831433

URL: http://svn.apache.org/viewvc?rev=831433&view=rev
Log:
add updateForeignTokenUnsafe for bulk loader.  patch by goffinet; reviewed by jbellis for CASSANDRA-523

Modified:
    incubator/cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java

Modified: incubator/cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java?rev=831433&r1=831432&r2=831433&view=diff
==============================================================================
--- incubator/cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java (original)
+++ incubator/cassandra/trunk/contrib/bmt_example/CassandraBulkLoader.java Fri Oct 30 19:45:38 2009
@@ -124,7 +124,7 @@
                 {
                     throw new RuntimeException(e);
                 }
-                StorageService.instance().updateTokenMetadataUnsafe(new BigIntegerToken(new BigInteger(values[0])), address);
+                StorageService.instance().updateForeignTokenUnsafe(new BigIntegerToken(new BigInteger(values[0])), address);
             }
         }
         public void close()

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=831433&r1=831432&r2=831433&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 Oct 30 19:45:38 2009
@@ -174,6 +174,15 @@
         SystemTable.updateToken(endpoint, token);
     }
 
+    /**
+     * for bulk loading clients to be able to use tokenmetadata/messagingservice
+     * without fully starting storageservice / systemtable.
+     */
+    public void updateForeignTokenUnsafe(Token token, InetAddress endpoint)
+    {
+        tokenMetadata_.update(token, endpoint);
+    }
+
     /** This method updates the local token on disk and starts broacasting it to others. */
     public void setToken(Token token)
     {