Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d78b6226 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d78b6226 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d78b6226 Branch: refs/heads/trunk Commit: d78b622646e47e158e73d37e5a87af5fddb38bea Parents: b3101a1 6d7404b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed May 29 12:54:38 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed May 29 12:54:38 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + examples/pig/README.txt | 4 +++ .../cassandra/hadoop/pig/CassandraStorage.java | 21 +++++++++++++++ 3 files changed, 26 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d78b6226/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d78b6226/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index b5c596e,6490d05..b5f20e7 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@@ -106,9 -106,10 +107,10 @@@ public class CassandraStorage extends L private int limit; private boolean widerows = false; private boolean usePartitionFilter = false; + private int splitSize = 64 * 1024; // wide row hacks private ByteBuffer lastKey; - private Map<ByteBuffer,IColumn> lastRow; + private Map<ByteBuffer,Column> lastRow; private boolean hasNext = true; public CassandraStorage()
