Merge branch 'master' of git@github.com:rantav/hector

mikedooley · May 7, 2010 · 611774b · 611774b
2 parents 021a426 + 093f0c7
commit 611774b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/main/java/me/prettyprint/cassandra/service/Keyspace.java b/src/main/java/me/prettyprint/cassandra/service/Keyspace.java
@@ -174,6 +174,12 @@ void batchMutate(BatchMutation batchMutation) throws InvalidRequestException,
    */
   void remove(String key, ColumnPath columnPath) throws InvalidRequestException,
       UnavailableException, TException, TimedOutException;
+
+  /**
+   * Same as two argument version, but the caller must specify their own timestamp
+   */
+  void remove(String key, ColumnPath columnPath, long timestamp) throws InvalidRequestException,
+      UnavailableException, TException, TimedOutException;
 
   /**
    * get a description of the specified keyspace

diff --git a/src/main/java/me/prettyprint/cassandra/service/KeyspaceImpl.java b/src/main/java/me/prettyprint/cassandra/service/KeyspaceImpl.java
@@ -454,16 +454,24 @@ public Map<String, List<SuperColumn>> execute(Cassandra.Client cassandra)
   @Override
   public void remove(final String key, final ColumnPath columnPath) throws InvalidRequestException,
       UnavailableException, TException, TimedOutException {
+    remove(key, columnPath, createTimestamp());
+  }
+
+
+
+  @Override
+  public void remove(final String key, final ColumnPath columnPath, final long timestamp)
+      throws InvalidRequestException, UnavailableException, TException,
+      TimedOutException {
     Operation<Void> op = new Operation<Void>(OperationType.WRITE) {
       @Override
       public Void execute(Cassandra.Client cassandra) throws InvalidRequestException, UnavailableException,
           TException, TimedOutException {
-        cassandra.remove(keyspaceName, key, columnPath, createTimestamp(), consistency);
+        cassandra.remove(keyspaceName, key, columnPath, timestamp, consistency);
         return null;
       }
     };
-    operateWithFailover(op);
-
+    operateWithFailover(op);    
   }
 
   @Override