pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r1604514 - in /pig/branches/branch-0.13: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
Date Sun, 22 Jun 2014 03:08:37 GMT
Author: daijy
Date: Sun Jun 22 03:08:36 2014
New Revision: 1604514

URL: http://svn.apache.org/r1604514
Log:
PIG-4021: Fix TestHBaseStorage failure after auto local mode change (PIG-3463)

Modified:
    pig/branches/branch-0.13/CHANGES.txt
    pig/branches/branch-0.13/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java

Modified: pig/branches/branch-0.13/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/CHANGES.txt?rev=1604514&r1=1604513&r2=1604514&view=diff
==============================================================================
--- pig/branches/branch-0.13/CHANGES.txt (original)
+++ pig/branches/branch-0.13/CHANGES.txt Sun Jun 22 03:08:36 2014
@@ -153,6 +153,8 @@ PIG-3882: Multiquery off mode execution 
  
 BUG FIXES
 
+PIG-4021: Fix TestHBaseStorage failure after auto local mode change (PIG-3463) (daijy)
+
 PIG-4029: TestMRCompiler is broken after PIG-3874 (daijy)
 
 PIG-4030: TestGrunt, TestPigRunner fail after PIG-3892 (daijy)

Modified: pig/branches/branch-0.13/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.13/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java?rev=1604514&r1=1604513&r2=1604514&view=diff
==============================================================================
--- pig/branches/branch-0.13/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
(original)
+++ pig/branches/branch-0.13/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
Sun Jun 22 03:08:36 2014
@@ -110,14 +110,6 @@ public abstract class HExecutionEngine i
     public JobConf getLocalConf(Properties properties) {
         JobConf jc = new JobConf(false);
 
-        // If we are running in local mode we dont read the hadoop conf file
-        if (properties.getProperty(MAPREDUCE_FRAMEWORK_NAME) == null) {
-            jc.set(MAPREDUCE_FRAMEWORK_NAME, LOCAL);
-        }
-        jc.set(JOB_TRACKER_LOCATION, LOCAL);
-        jc.set(FILE_SYSTEM_LOCATION, "file:///");
-        jc.set(ALTERNATIVE_FILE_SYSTEM_LOCATION, "file:///");
-
         jc.addResource(MAPRED_DEFAULT_SITE);
         jc.addResource(YARN_DEFAULT_SITE);
         jc.addResource(CORE_DEFAULT_SITE);
@@ -182,6 +174,14 @@ public abstract class HExecutionEngine i
             // add hdfs-default.xml into configuration
             new DistributedFileSystem();
         } else {
+            // If we are running in local mode we dont read the hadoop conf file
+            if (properties.getProperty(MAPREDUCE_FRAMEWORK_NAME) == null) {
+                properties.setProperty(MAPREDUCE_FRAMEWORK_NAME, LOCAL);
+            }
+            properties.setProperty(JOB_TRACKER_LOCATION, LOCAL);
+            properties.setProperty(FILE_SYSTEM_LOCATION, "file:///");
+            properties.setProperty(ALTERNATIVE_FILE_SYSTEM_LOCATION, "file:///");
+
             jc = getLocalConf(properties);
         }
 



Mime
View raw message