Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fc2bd39 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fc2bd39 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fc2bd39 Branch: refs/heads/cassandra-1.1 Commit: 2fc2bd39364b65b9641a04dd257e06d60a68748b Parents: 32f5d06 470873f Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Feb 29 14:42:10 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Feb 29 14:42:10 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + examples/pig/test/populate-cli.txt | 20 +++++++++ examples/pig/test/test_storage.pig | 21 ++++++++++ .../db/marshal/AbstractCompositeType.java | 32 +++++++++++++++ .../cassandra/hadoop/pig/CassandraStorage.java | 31 ++++++++++++++- 5 files changed, 105 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc2bd39/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c0f4b17,76bb8cb..4eb42f4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -31,9 -26,10 +31,11 @@@ Merged from 1.0 * delete hints from dropped ColumnFamilies on handoff instead of erroring out (CASSANDRA-3975) * add CompositeType ref to the CLI doc for create/update column family (CASSANDRA-3980) + * Pig: support Counter ColumnFamilies (CASSANDRA-3973) + * Pig: Composite column support (CASSANDRA-384) + 1.1-beta1 * add nodetool rebuild_index (CASSANDRA-3583) * add nodetool rangekeysample (CASSANDRA-2917) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc2bd39/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fc2bd39/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index e5ec34e,f10dde5..bcc0c79 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@@ -171,8 -190,17 +190,15 @@@ public class CassandraStorage extends L private Tuple columnToTuple(IColumn col, CfDef cfDef, AbstractType comparator) throws IOException { Tuple pair = TupleFactory.getInstance().newTuple(2); - List<AbstractType> marshallers = getDefaultMarshallers(cfDef); - Map<ByteBuffer,AbstractType> validators = getValidatorMap(cfDef); - setTupleValue(pair, 0, comparator.compose(col.name())); + if( comparator instanceof AbstractCompositeType ) + { + setTupleValue(pair, 0, composeComposite((AbstractCompositeType)comparator,col.name())); + } + else + { + setTupleValue(pair, 0, comparator.compose(col.name())); + } if (col instanceof Column) { // standard