cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [5/5] git commit: Merge branch 'cassandra-1.2' into trunk
Date Thu, 17 Jan 2013 00:32:18 GMT
Updated Branches:
  refs/heads/trunk ead7312cf -> 159293364


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/15929336
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15929336
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15929336

Branch: refs/heads/trunk
Commit: 159293364adf9df7d2ad1996bb917f4c4a48279b
Parents: ead7312 7dd87c1
Author: Dave Brosius <dbrosius@apache.org>
Authored: Wed Jan 16 19:30:50 2013 -0500
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Wed Jan 16 19:30:50 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    5 ++
 .../cassandra/hadoop/pig/CassandraStorage.java     |   39 ++++++++------
 .../locator/GossipingPropertyFileSnitch.java       |    2 +
 3 files changed, 29 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15929336/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15929336/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index a3ad3e6,dcac110..2b074f7
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@@ -324,14 -327,29 +326,17 @@@ public class CassandraStorage extends L
          {
              setTupleValue(pair, 0, comparator.compose(col.name()));
          }
 -        if (col instanceof Column)
 -        {
 -            // standard
 -            Map<ByteBuffer,AbstractType> validators = getValidatorMap(cfDef);
  
-         List<AbstractType> marshallers = getDefaultMarshallers(cfDef);
 -            if (validators.get(col.name()) == null)
 -            {
 -                Map<MarshallerType, AbstractType> marshallers = getDefaultMarshallers(cfDef);
 -                setTupleValue(pair, 1, marshallers.get(MarshallerType.DEFAULT_VALIDATOR).compose(col.value()));
 -            }
 -            else
 -                setTupleValue(pair, 1, validators.get(col.name()).compose(col.value()));
 -            return pair;
++        // standard
 +        Map<ByteBuffer,AbstractType> validators = getValidatorMap(cfDef);
- 
 +        if (validators.get(col.name()) == null)
-             setTupleValue(pair, 1, marshallers.get(1).compose(col.value()));
++        {
++            Map<MarshallerType, AbstractType> marshallers = getDefaultMarshallers(cfDef);
++            setTupleValue(pair, 1, marshallers.get(MarshallerType.DEFAULT_VALIDATOR).compose(col.value()));
+         }
          else
 -        {
 -            // super
 -            ArrayList<Tuple> subcols = new ArrayList<Tuple>();
 -            for (IColumn subcol : col.getSubColumns())
 -                subcols.add(columnToTuple(subcol, cfDef, parseType(cfDef.getSubcomparator_type())));
 +            setTupleValue(pair, 1, validators.get(col.name()).compose(col.value()));
+ 
 -            pair.set(1, new DefaultDataBag(subcols));
 -        }
          return pair;
      }
  


Mime
View raw message