You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by sz...@apache.org on 2015/08/06 02:42:03 UTC
hive git commit: HIVE-11319 : CTAS with location qualifier overwrites
directories (Yongzhi Chen via Szehon)
Repository: hive
Updated Branches:
refs/heads/master b91bf072b -> a0fdf00fe
HIVE-11319 : CTAS with location qualifier overwrites directories (Yongzhi Chen via Szehon)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/a0fdf00f
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/a0fdf00f
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/a0fdf00f
Branch: refs/heads/master
Commit: a0fdf00fe9e384d1a88fd415cc9ebd972faebea6
Parents: b91bf07
Author: Szehon Ho <sz...@cloudera.com>
Authored: Wed Aug 5 17:34:10 2015 -0700
Committer: Szehon Ho <sz...@cloudera.com>
Committed: Wed Aug 5 17:34:10 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hive/ql/ErrorMsg.java | 1 +
.../hadoop/hive/ql/parse/SemanticAnalyzer.java | 26 ++++++++++++++++++++
.../queries/clientnegative/ctas_noemptyfolder.q | 10 ++++++++
.../clientnegative/ctas_noemptyfolder.q.out | 19 ++++++++++++++
4 files changed, 56 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/a0fdf00f/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java b/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
index 39b287a..fd746b7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java
@@ -431,6 +431,7 @@ public enum ErrorMsg {
DROP_NATIVE_FUNCTION(10301, "Cannot drop native function"),
UPDATE_CANNOT_UPDATE_BUCKET_VALUE(10302, "Updating values of bucketing columns is not supported. Column {0}.", true),
IMPORT_INTO_STRICT_REPL_TABLE(10303,"Non-repl import disallowed against table that is a destination of replication."),
+ CTAS_LOCATION_NONEMPTY(10304, "CREATE-TABLE-AS-SELECT cannot create table with location to a non-empty directory."),
//========================== 20000 range starts here ========================//
SCRIPT_INIT_ERROR(20000, "Unable to initialize custom script."),
http://git-wip-us.apache.org/repos/asf/hive/blob/a0fdf00f/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
index f05407d..0a780af 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.hive.ql.parse;
import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.HIVESTATSDBCLASS;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.Serializable;
import java.security.AccessControlException;
@@ -10960,6 +10961,31 @@ public class SemanticAnalyzer extends BaseSemanticAnalyzer {
throw new SemanticException(e);
}
+ if(location != null && location.length() != 0) {
+ Path locPath = new Path(location);
+ FileSystem curFs = null;
+ FileStatus locStats = null;
+ try {
+ curFs = locPath.getFileSystem(conf);
+ if(curFs != null) {
+ locStats = curFs.getFileStatus(locPath);
+ }
+ if(locStats != null && locStats.isDir()) {
+ FileStatus[] lStats = curFs.listStatus(locPath);
+ if(lStats != null && lStats.length != 0) {
+ throw new SemanticException(ErrorMsg.CTAS_LOCATION_NONEMPTY.getMsg(location));
+ }
+ }
+ } catch (FileNotFoundException nfe) {
+ //we will create the folder if it does not exist.
+ } catch (IOException ioE) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Exception when validate folder ",ioE);
+ }
+
+ }
+ }
+
tblProps = addDefaultProperties(tblProps);
tableDesc = new CreateTableDesc(qualifiedTabName[0], dbDotTab, isExt, isTemporary, cols,
http://git-wip-us.apache.org/repos/asf/hive/blob/a0fdf00f/ql/src/test/queries/clientnegative/ctas_noemptyfolder.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientnegative/ctas_noemptyfolder.q b/ql/src/test/queries/clientnegative/ctas_noemptyfolder.q
new file mode 100644
index 0000000..18c9086
--- /dev/null
+++ b/ql/src/test/queries/clientnegative/ctas_noemptyfolder.q
@@ -0,0 +1,10 @@
+create table ctas1
+location 'file:${system:test.tmp.dir}/ctastmpfolder'
+as
+select * from src limit 3;
+
+create table ctas2
+location 'file:${system:test.tmp.dir}/ctastmpfolder'
+as
+select * from src limit 2;
+
http://git-wip-us.apache.org/repos/asf/hive/blob/a0fdf00f/ql/src/test/results/clientnegative/ctas_noemptyfolder.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/ctas_noemptyfolder.q.out b/ql/src/test/results/clientnegative/ctas_noemptyfolder.q.out
new file mode 100644
index 0000000..76d7b86
--- /dev/null
+++ b/ql/src/test/results/clientnegative/ctas_noemptyfolder.q.out
@@ -0,0 +1,19 @@
+PREHOOK: query: create table ctas1
+#### A masked pattern was here ####
+as
+select * from src limit 3
+PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@src
+#### A masked pattern was here ####
+PREHOOK: Output: database:default
+PREHOOK: Output: default@ctas1
+POSTHOOK: query: create table ctas1
+#### A masked pattern was here ####
+as
+select * from src limit 3
+POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@src
+#### A masked pattern was here ####
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@ctas1
+#### A masked pattern was here ####