tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hyun...@apache.org
Subject git commit: Fixed the wrong method names caused after conflicts resolution.
Date Wed, 01 Oct 2014 15:49:38 GMT
Repository: tajo
Updated Branches:
  refs/heads/block_iteration a5e27a293 -> 1aca24076


Fixed the wrong method names caused after conflicts resolution.


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

Branch: refs/heads/block_iteration
Commit: 1aca240762ab7d56702e68a6299ace965298d301
Parents: a5e27a2
Author: Hyunsik Choi <hyunsik@apache.org>
Authored: Wed Oct 1 08:48:57 2014 -0700
Committer: Hyunsik Choi <hyunsik@apache.org>
Committed: Wed Oct 1 08:48:57 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java   | 2 +-
 tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java   | 2 +-
 .../org/apache/tajo/engine/planner/TestPreLogicalPlanVerifier.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/1aca2407/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java
b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java
index e9b91d7..6c25b5f 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java
@@ -45,7 +45,7 @@ public class ExecutorPreCompiler extends BasicLogicalPlanVisitor<ExecutorPreComp
   public static void compile(CompilationContext context, LogicalNode node) throws PlanningException
{
     instance.visit(context, null, null, node, new Stack<LogicalNode>());
     context.compiledEvals = Collections.unmodifiableMap(context.compiledEvals);
-    context.compiledComparators = Collections.unmodifiableMap(context.compiledComparators);
+    context.comparators = Collections.unmodifiableMap(context.comparators);
   }
 
   public static Map<Pair<Schema, EvalNode>, EvalNode> compile(TajoClassLoader
classLoader, LogicalNode node)

http://git-wip-us.apache.org/repos/asf/tajo/blob/1aca2407/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
index 0a75023..6dcbfd2 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
@@ -117,7 +117,7 @@ public class GlobalEngine extends AbstractService {
   }
 
   @VisibleForTesting
-  public SQLAnalyzer getAnalyzer() {
+  public SQLAnalyzer getSQLAnalyzer() {
     return analyzer;
   }
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/1aca2407/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPreLogicalPlanVerifier.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPreLogicalPlanVerifier.java
b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPreLogicalPlanVerifier.java
index b009785..d57f809 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPreLogicalPlanVerifier.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPreLogicalPlanVerifier.java
@@ -37,7 +37,7 @@ public class TestPreLogicalPlanVerifier extends QueryTestCaseBase {
   @BeforeClass
   public static void setUp() {
     GlobalEngine engine = testingCluster.getMaster().getContext().getGlobalEngine();
-    analyzer = engine.getAnalyzer();
+    analyzer = engine.getSQLAnalyzer();
     verifier = engine.getPreLogicalPlanVerifier();
   }
 


Mime
View raw message