Change merged row counts from int to long
Merge branch 'cassandra-1.2' into trunk
only fetch comparator if needed