You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/04/11 06:59:27 UTC

git commit: TAJO-745: failure of INSERT INTO may remove the target table. (hyunsik)

Repository: tajo
Updated Branches:
  refs/heads/master 24805e209 -> 38f5316af


TAJO-745: failure of INSERT INTO may remove the target table. (hyunsik)


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

Branch: refs/heads/master
Commit: 38f5316af784aee4f427ee0cc500a7ad2fc35710
Parents: 24805e2
Author: Hyunsik Choi <hy...@apache.org>
Authored: Fri Apr 11 13:52:00 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Fri Apr 11 13:52:00 2014 +0900

----------------------------------------------------------------------
 CHANGES.txt                                                     | 3 +++
 .../org/apache/tajo/engine/planner/PreLogicalPlanVerifier.java  | 4 ++++
 .../org/apache/tajo/master/querymaster/QueryMasterTask.java     | 5 -----
 3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/38f5316a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e4687ba..9cdcb5e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -918,6 +918,9 @@ Release 0.2.0 - released
 
   BUG FIXES
 
+    TAJO-754: failure of INSERT INTO may remove the target table.
+    (hyunsik)
+
     TAJO-682: RangePartitionAlgorithm should be improved to handle empty
     texts. (hyunsik)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/38f5316a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/PreLogicalPlanVerifier.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/PreLogicalPlanVerifier.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/PreLogicalPlanVerifier.java
index cadeff4..1ee0878 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/PreLogicalPlanVerifier.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/engine/planner/PreLogicalPlanVerifier.java
@@ -247,6 +247,10 @@ public class PreLogicalPlanVerifier extends BaseAlgebraVisitor <PreLogicalPlanVe
   public Expr visitInsert(Context context, Stack<Expr> stack, Insert expr) throws PlanningException {
     Expr child = super.visitInsert(context, stack, expr);
 
+    if (!expr.isOverwrite()) {
+      context.state.addVerification("INSERT INTO statement is not supported yet.");
+    }
+
     if (expr.hasTableName()) {
       assertRelationExistence(context, expr.getTableName());
     }

http://git-wip-us.apache.org/repos/asf/tajo/blob/38f5316a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java
index 8b3403f..1402c9f 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/QueryMasterTask.java
@@ -419,11 +419,6 @@ public class QueryMasterTask extends CompositeService {
         LOG.info("The staging directory '" + stagingDir + "' is deleted");
       }
 
-      if (outputDir != null && defaultFS.exists(outputDir)) {
-        defaultFS.delete(outputDir, true);
-        LOG.info("The output directory '" + outputDir + "' is deleted");
-      }
-
       throw ioe;
     }
   }