You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/12/13 19:14:37 UTC
[2/6] git commit: Pig: don't assume all DataBags are DefaultDataBags
Patch by Mike Spertus, reviewed by brandonwilliams for CASSANDRA-6420
Pig: don't assume all DataBags are DefaultDataBags
Patch by Mike Spertus, reviewed by brandonwilliams for CASSANDRA-6420
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11455738
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11455738
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11455738
Branch: refs/heads/cassandra-2.0
Commit: 11455738fa61c6eb02895a5a8d3fbbe4d8cb24b4
Parents: f7c9144
Author: Brandon Williams <br...@apache.org>
Authored: Fri Dec 13 12:10:47 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Dec 13 12:10:47 2013 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/hadoop/pig/CassandraStorage.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/11455738/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 853a052..89ce7b4 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@ -517,7 +517,7 @@ public class CassandraStorage extends AbstractCassandraStorage
{
if (t.size() > 2)
throw new IOException("No arguments allowed after bag");
- writeColumnsFromBag(key, (DefaultDataBag) t.get(1));
+ writeColumnsFromBag(key, (DataBag) t.get(1));
}
else
throw new IOException("Second argument in output must be a tuple or bag");
@@ -530,7 +530,7 @@ public class CassandraStorage extends AbstractCassandraStorage
for (int i = offset; i < t.size(); i++)
{
if (t.getType(i) == DataType.BAG)
- writeColumnsFromBag(key, (DefaultDataBag) t.get(i));
+ writeColumnsFromBag(key, (DataBag) t.get(i));
else if (t.getType(i) == DataType.TUPLE)
{
Tuple inner = (Tuple) t.get(i);
@@ -576,7 +576,7 @@ public class CassandraStorage extends AbstractCassandraStorage
}
/** write bag data to Cassandra */
- private void writeColumnsFromBag(ByteBuffer key, DefaultDataBag bag) throws IOException
+ private void writeColumnsFromBag(ByteBuffer key, DataBag bag) throws IOException
{
List<Mutation> mutationList = new ArrayList<Mutation>();
for (Tuple pair : bag)
@@ -587,7 +587,7 @@ public class CassandraStorage extends AbstractCassandraStorage
SuperColumn sc = new SuperColumn();
sc.setName(objToBB(pair.get(0)));
List<org.apache.cassandra.thrift.Column> columns = new ArrayList<org.apache.cassandra.thrift.Column>();
- for (Tuple subcol : (DefaultDataBag) pair.get(1))
+ for (Tuple subcol : (DataBag) pair.get(1))
{
org.apache.cassandra.thrift.Column column = new org.apache.cassandra.thrift.Column();
column.setName(objToBB(subcol.get(0)));