Merge remote-tracking branch 'origin/master' into bean-cleanup

hector-client · May 20, 2014 · 8def42c · 8def42c
2 parents c5614ff + da4187c
commit 8def42c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/core/src/main/java/me/prettyprint/cassandra/service/ColumnSliceIterator.java b/core/src/main/java/me/prettyprint/cassandra/service/ColumnSliceIterator.java
@@ -134,6 +134,14 @@ public void remove() {
 		iterator.remove();
 	}
 
+	public HColumn<N, V> peek() {
+		if(hasNext()){
+			return iterator.peek();
+		}
+
+		return null;
+	}
+
 	private void refresh() {
 		query.setRange(start, finish.function(), reversed, count);
 			columns = 0;

diff --git a/core/src/main/java/me/prettyprint/cassandra/service/template/ColumnFamilyUpdater.java b/core/src/main/java/me/prettyprint/cassandra/service/template/ColumnFamilyUpdater.java
@@ -146,9 +146,17 @@ public <V> void setComposite(N columnName, Composite composite) {
     addInsertion(columnName, composite, CompositeSerializer.get(), globalTtl);
   }
 
+  public <V> void setComposite(N columnName, Composite composite, int ttl) {
+    addInsertion(columnName, composite, CompositeSerializer.get(), ttl);
+  }
+
   public <V> void setDynamicComposite(N columnName, DynamicComposite composite) {
     addInsertion(columnName, composite, DynamicCompositeSerializer.get(), globalTtl);
   }
+
+  public <V> void setDynamicComposite(N columnName, DynamicComposite composite, int ttl) {
+    addInsertion(columnName, composite, DynamicCompositeSerializer.get(), ttl);
+  }
 
   public <V> void setValue(N columnName, V value, Serializer<V> serializer) {
     addInsertion(columnName, value, serializer, globalTtl);