Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 acca4129b -> ace996372


PHOENIX-2674 PhoenixMapReduceUtil#setInput doesn't honor condition clause 
(addendum)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: ace996372077e7eb84410cb9ddc764a5bec6af2f
Parents: acca412
Author: Jesse Yates <jya...@apache.org>
Authored: Fri Feb 12 15:46:11 2016 -0800
Committer: Jesse Yates <jya...@apache.org>
Committed: Fri Feb 12 16:14:31 2016 -0800

----------------------------------------------------------------------
 .../org/apache/phoenix/mapreduce/util/PhoenixMapReduceUtil.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ace99637/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixMapReduceUtil.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixMapReduceUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixMapReduceUtil.java
index 125c6a8..98f0364 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixMapReduceUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixMapReduceUtil.java
@@ -58,8 +58,9 @@ public final class PhoenixMapReduceUtil {
      * @param inputQuery  Select query.
      */
     public static void setInput(final Job job, final Class<? extends 
DBWritable> inputClass, final String tableName, final String inputQuery) {
-          final Configuration configuration = setInput(job, inputClass, 
tableName);
-          PhoenixConfigurationUtil.setSchemaType(configuration, 
SchemaType.QUERY);
+        final Configuration configuration = setInput(job, inputClass, 
tableName);
+        PhoenixConfigurationUtil.setInputQuery(configuration, inputQuery);
+        PhoenixConfigurationUtil.setSchemaType(configuration, 
SchemaType.QUERY);
      }
 
     private static Configuration setInput(final Job job, final Class<? extends 
DBWritable> inputClass, final String tableName){

Reply via email to