Ported counter interation methods to Java.

CassandraOrmGrailsPlugin.groovy

@@ -20,7 +20,7 @@ import com.reachlocal.grails.plugins.cassandra.uuid.UuidDynamicMethods
 class CassandraOrmGrailsPlugin
 {
 	// the plugin version
-	def version = "0.3.2"
+	def version = "0.3.3"
 
 	// the version or versions of Grails the plugin is designed for
 	def grailsVersion = "2.0.0 > *"

plugin.xml

@@ -1,4 +1,4 @@
-<plugin name='cassandra-orm' version='0.3.2' grailsVersion='2.0.0 &gt; *'>
+<plugin name='cassandra-orm' version='0.3.3' grailsVersion='2.0.0 &gt; *'>
   <author>Bob Florian</author>
   <authorEmail>bob.florian@reachlocal.com</authorEmail>
   <title>Cassandra Object Persistence Framework</title>

src/groovy/com/reachlocal/grails/plugins/cassandra/mapping/CounterUtils.groovy

@@ -231,7 +231,7 @@ class CounterUtils
 		def groupKeys = KeyHelper.makeGroupKeyList(groupBy, 'yyyy-MM')
 		def rowKey = KeyHelper.counterRowKey(findBy, groupKeys, filter)
 
-		columnsList(persistence.getColumnRange(
+		CounterHelper.columnsList(persistence.getColumnRange(
 				ks,
 				cf,
 				rowKey,
@@ -247,7 +247,7 @@ class CounterUtils
 		def groupKeys = KeyHelper.makeGroupKeyList(groupBy, 'yyyy-MM-dd')
 		def rowKey = KeyHelper.counterRowKey(findBy, groupKeys, filter)
 
-		columnsList(persistence.getColumnRange(
+		CounterHelper.columnsList(persistence.getColumnRange(
 				ks,
 				cf,
 				rowKey,
@@ -263,7 +263,7 @@ class CounterUtils
 		def groupKeys = groupBy //makeGroupKeyList(groupBy, "yyyy-MM-dd'T'HH")
 		def rowKey = KeyHelper.counterRowKey(findBy, groupKeys, filter)
 
-		columnsList(persistence.getColumnRange(
+		CounterHelper.columnsList(persistence.getColumnRange(
 				ks,
 				cf,
 				rowKey,
@@ -293,7 +293,7 @@ class CounterUtils
 			cal.add(Calendar.YEAR, 1)
 		}
 
-		columnsListFromRowList(persistence.getRowsColumnRange(
+		CounterHelper.columnsListFromRowList(persistence.getRowsColumnRange(
 				ks,
 				cf,
 				rowKeys,
@@ -322,7 +322,7 @@ class CounterUtils
 			cal.add(Calendar.MONTH, 1)
 		}
 
-		columnsListFromRowList(persistence.getRowsColumnRange(
+		CounterHelper.columnsListFromRowList(persistence.getRowsColumnRange(
 				ks,
 				cf,
 				rowKeys,
@@ -342,28 +342,6 @@ class CounterUtils
 		cols?.size() ? persistence.name(persistence.getColumnByIndex(cols, 0)) : null
 	}
 
-	static columnsList(columnsIterator)
-	{
-		// TODO - performance!
-		def cols = []
-		columnsIterator.each {
-			cols << it
-		}
-		cols
-	}
-
-	static columnsListFromRowList(rowList, persistence)
-	{
-		// TODO - performance!
-		def cols = []
-		rowList.each {row ->
-			persistence.getColumns(row).each {
-				cols << it
-			}
-		}
-		cols
-	}
-
 	static rollUpCounterDates(Map map, DateFormat fromFormat, grain, timeZone, toFormatArg)
 	{
 		def toFormat = CounterHelper.toDateFormat(grain, timeZone, toFormatArg)

src/java/com/reachlocal/grails/plugins/cassandra/mapping/PersistenceProvider.java

@@ -64,9 +64,9 @@ public interface PersistenceProvider
 	void execute(mutationBatch);
 
 	Object getRow(rows, key);
-
-	Object getColumns(row);
-
+    */
+	Iterable getColumns(Object row);
+	/*
 	Object getColumn(row, name);
 
 	Object getColumnByIndex(row, index);

src/java/com/reachlocal/grails/plugins/cassandra/utils/CounterHelper.java

@@ -676,4 +676,25 @@ static public List<String> mergeNonDateKeys(List<String> rowKeys, List<String> c
 			return columnKeys;
 		}
 	}
+
+	static public List columnsList(Iterable columnsIterator)
+	{
+		List<Object> cols = new ArrayList<Object>();
+		for (Object it: columnsIterator) {
+			cols.add(it);
+		}
+		return cols;
+	}
+
+	static public List columnsListFromRowList(Iterable rowList, PersistenceProvider persistence)
+	{
+		// TODO - performance!
+		List<Object> cols = new ArrayList<Object>();
+		for (Object row: rowList) {
+			for (Object it: persistence.getColumns(row)) {
+				cols.add(it);
+			}
+		}
+		return cols;
+	}
 }