Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c374aca1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c374aca1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c374aca1
Branch: refs/heads/cassandra-2.0
Commit: c374aca19ea39fbbc588a2309c669c422e0318cd
Parents: 8e8db1f 3633aea
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Mon Oct 7 14:02:39 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Mon Oct 7 14:02:39 2013 -0500
----------------------------------------------------------------------
.../hadoop/pig/AbstractCassandraStorage.java | 30 +++++++++++++++-----
.../cassandra/hadoop/pig/CassandraStorage.java | 2 +-
.../apache/cassandra/hadoop/pig/CqlStorage.java | 7 ++---
3 files changed, 26 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c374aca1/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
index 1e207b3,6ad4f9e..c881734
--- a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
@@@ -124,17 -124,31 +124,17 @@@ public abstract class AbstractCassandra
if(comparator instanceof AbstractCompositeType)
setTupleValue(pair, 0,
composeComposite((AbstractCompositeType)comparator,col.name()));
else
- setTupleValue(pair, 0, comparator.compose(col.name()));
+ setTupleValue(pair, 0, cassandraToObj(comparator, col.name()));
// value
- if (col instanceof Column)
+ Map<ByteBuffer,AbstractType> validators = getValidatorMap(cfDef);
+ if (validators.get(col.name()) == null)
{
- // standard
- Map<ByteBuffer,AbstractType> validators = getValidatorMap(cfDef);
- if (validators.get(col.name()) == null)
- {
- Map<MarshallerType, AbstractType> marshallers =
getDefaultMarshallers(cfDef);
- setTupleValue(pair, 1,
cassandraToObj(marshallers.get(MarshallerType.DEFAULT_VALIDATOR), col.value()));
- }
- else
- setTupleValue(pair, 1,
cassandraToObj(validators.get(col.name()), col.value()));
- return pair;
+ Map<MarshallerType, AbstractType> marshallers =
getDefaultMarshallers(cfDef);
- setTupleValue(pair, 1,
marshallers.get(MarshallerType.DEFAULT_VALIDATOR).compose(col.value()));
++ setTupleValue(pair, 1,
cassandraToObj(marshallers.get(MarshallerType.DEFAULT_VALIDATOR), col.value()));
}
else
- setTupleValue(pair, 1,
validators.get(col.name()).compose(col.value()));
- {
- // super
- ArrayList<Tuple> subcols = new ArrayList<Tuple>();
- for (IColumn subcol : col.getSubColumns())
- subcols.add(columnToTuple(subcol, cfDef,
parseType(cfDef.getSubcomparator_type())));
-
- pair.set(1, new DefaultDataBag(subcols));
- }
++ setTupleValue(pair, 1, cassandraToObj(validators.get(col.name()),
col.value()));
return pair;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c374aca1/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c374aca1/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------
