cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Wed, 25 Sep 2013 21:29:05 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83da4bdb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83da4bdb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83da4bdb

Branch: refs/heads/trunk
Commit: 83da4bdb6dbaa3df5d9c39cccfbe2f511dba0771
Parents: 8845ad6 ff76003
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Sep 25 16:27:39 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Sep 25 16:27:39 2013 -0500

----------------------------------------------------------------------
 .../hadoop/pig/AbstractCassandraStorage.java    | 30 ++++++++++----------
 .../cassandra/hadoop/pig/CassandraStorage.java  | 18 ++++++------
 .../apache/cassandra/hadoop/pig/CqlStorage.java |  8 +++---
 3 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/83da4bdb/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83da4bdb/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83da4bdb/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 1ef69b7,7780ca9..86fe338
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@@ -526,9 -525,11 +526,9 @@@ public class CqlStorage extends Abstrac
       * Return cql where clauses for the corresponding partition filter. Make sure the data
format matches 
       * Only support the following Pig data types: int, long, float, double, boolean and
chararray
       * */
-     private String partitionFilterToWhereClauseString(Expression expression)
+     private String partitionFilterToWhereClauseString(Expression expression) throws IOException
      {
          Expression.BinaryExpression be = (Expression.BinaryExpression) expression;
 -        String name = be.getLhs().toString();
 -        String value = be.getRhs().toString();
          OpType op = expression.getOpType();
          String opString = op.toString();
          switch (op)


Mime
View raw message