Updated Branches: refs/heads/trunk 089eacf60 -> fb5e8801f
Reduce workload for converting supercolumns to tuples. Patch by Dave Brosius, reviewed by brandonwilliams for CASSANDRA-3836 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb5e8801 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb5e8801 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb5e8801 Branch: refs/heads/trunk Commit: fb5e8801f3cc147c20c8fe4484cfc84ab02cd3e6 Parents: 089eacf Author: Brandon Williams <[email protected]> Authored: Thu Feb 2 08:49:46 2012 -0600 Committer: Brandon Williams <[email protected]> Committed: Thu Feb 2 08:49:46 2012 -0600 ---------------------------------------------------------------------- .../cassandra/hadoop/pig/CassandraStorage.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb5e8801/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index eec516f..af1a11a 100644 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@ -142,13 +142,14 @@ public class CassandraStorage extends LoadFunc implements StoreFuncInterface, Lo 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 (col instanceof Column) { // standard + List<AbstractType> marshallers = getDefaultMarshallers(cfDef); + Map<ByteBuffer,AbstractType> validators = getValidatorMap(cfDef); + if (validators.get(col.name()) == null) setTupleValue(pair, 1, marshallers.get(1).compose(col.value())); else
