You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/01/26 18:33:34 UTC
[1/3] git commit: refactor to not require breaking slicepredicate
encapsulation
Updated Branches:
refs/heads/trunk e10eb19e8 -> 93fa8d8ad
refactor to not require breaking slicepredicate encapsulation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93fa8d8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93fa8d8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93fa8d8a
Branch: refs/heads/trunk
Commit: 93fa8d8ad6f721cb107e9bb0a618f4ec39bb9f94
Parents: 96ecaff
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jan 26 11:33:19 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jan 26 11:33:19 2012 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/hadoop/ConfigHelper.java | 8 ++------
.../cassandra/hadoop/pig/CassandraStorage.java | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93fa8d8a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
index c83fbc5..bafb195 100644
--- a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
@@ -189,14 +189,10 @@ public class ConfigHelper
public static SlicePredicate getInputSlicePredicate(Configuration conf)
{
- return predicateFromString(conf.get(INPUT_PREDICATE_CONFIG));
+ String s = conf.get(INPUT_PREDICATE_CONFIG);
+ return s == null ? null : predicateFromString(s);
}
- public static String getRawInputSlicePredicate(Configuration conf)
- {
- return conf.get(INPUT_PREDICATE_CONFIG);
- }
-
private static String thriftToString(TBase object)
{
assert object != null;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93fa8d8a/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 faf1679..77e58ec 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@ -325,7 +325,7 @@ public class CassandraStorage extends LoadFunc implements StoreFuncInterface, Lo
{
conf = job.getConfiguration();
setLocationFromUri(location);
- if (ConfigHelper.getRawInputSlicePredicate(conf) == null)
+ if (ConfigHelper.getInputSlicePredicate(conf) == null)
{
SliceRange range = new SliceRange(slice_start, slice_end, slice_reverse, limit);
SlicePredicate predicate = new SlicePredicate().setSlice_range(range);