This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new cdfada59809 HIVE-25803: URL Mapping appends default Fs scheme even for
LOCAL DIRECTORY ops. (#4957). (Ayush Saxena, reviewed by Denys Kuzmenko)
cdfada59809 is described below
commit cdfada59809f5ee129b692bd9a63b4f5a7212a05
Author: Ayush Saxena <[email protected]>
AuthorDate: Fri Dec 22 01:08:19 2023 +0530
HIVE-25803: URL Mapping appends default Fs scheme even for LOCAL DIRECTORY
ops. (#4957). (Ayush Saxena, reviewed by Denys Kuzmenko)
---
ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java | 3 ++-
ql/src/test/results/clientpositive/llap/ppd_transform.q.out | 6 ++----
ql/src/test/results/clientpositive/llap/schemeAuthority.q.out | 2 --
ql/src/test/results/clientpositive/llap/schemeAuthority2.q.out | 2 --
4 files changed, 4 insertions(+), 9 deletions(-)
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 c1c04526bcf..769ab25e43e 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
@@ -8052,8 +8052,9 @@ public class SemanticAnalyzer extends
BaseSemanticAnalyzer {
loadFileDesc.setMoveTaskId(moveTaskId);
loadFileWork.add(loadFileDesc);
try {
+ FileSystem fs = isDfsDir ? destinationPath.getFileSystem(conf) :
FileSystem.getLocal(conf);
Path qualifiedPath =
conf.getBoolVar(ConfVars.HIVE_RANGER_USE_FULLY_QUALIFIED_URL) ?
-
destinationPath.getFileSystem(conf).makeQualified(destinationPath) :
destinationPath;
+ fs.makeQualified(destinationPath) : destinationPath;
if (!outputs.add(new WriteEntity(qualifiedPath, !isDfsDir,
isDestTempFile))) {
throw new
SemanticException(ErrorMsg.OUTPUT_SPECIFIED_MULTIPLE_TIMES
.getMsg(destinationPath.toUri().toString()));
diff --git a/ql/src/test/results/clientpositive/llap/ppd_transform.q.out
b/ql/src/test/results/clientpositive/llap/ppd_transform.q.out
index 9a0f487d0f6..1505011626c 100644
--- a/ql/src/test/results/clientpositive/llap/ppd_transform.q.out
+++ b/ql/src/test/results/clientpositive/llap/ppd_transform.q.out
@@ -384,8 +384,7 @@ FROM (
PREHOOK: type: QUERY
PREHOOK: Input: cat
PREHOOK: Input: default@src
-PREHOOK: Output: hdfs://### HDFS PATH ###
-PREHOOK: Output: hdfs://### HDFS PATH ###
+#### A masked pattern was here ####
POSTHOOK: query: EXPLAIN
FROM (
FROM ( SELECT * FROM src ) mapout REDUCE * USING 'cat' AS x,y
@@ -394,8 +393,7 @@ FROM (
POSTHOOK: type: QUERY
POSTHOOK: Input: cat
POSTHOOK: Input: default@src
-POSTHOOK: Output: hdfs://### HDFS PATH ###
-POSTHOOK: Output: hdfs://### HDFS PATH ###
+#### A masked pattern was here ####
STAGE DEPENDENCIES:
Stage-2 is a root stage
Stage-3 depends on stages: Stage-2
diff --git a/ql/src/test/results/clientpositive/llap/schemeAuthority.q.out
b/ql/src/test/results/clientpositive/llap/schemeAuthority.q.out
index 009424ba8d2..47d458fefb7 100644
--- a/ql/src/test/results/clientpositive/llap/schemeAuthority.q.out
+++ b/ql/src/test/results/clientpositive/llap/schemeAuthority.q.out
@@ -9,11 +9,9 @@ POSTHOOK: Output: default@dynPart
#### A masked pattern was here ####
PREHOOK: type: QUERY
PREHOOK: Input: default@src
-PREHOOK: Output: hdfs://### HDFS PATH ###
#### A masked pattern was here ####
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
-POSTHOOK: Output: hdfs://### HDFS PATH ###
#### A masked pattern was here ####
PREHOOK: type: QUERY
PREHOOK: Input: default@src
diff --git a/ql/src/test/results/clientpositive/llap/schemeAuthority2.q.out
b/ql/src/test/results/clientpositive/llap/schemeAuthority2.q.out
index d3731f70e67..9009cd29671 100644
--- a/ql/src/test/results/clientpositive/llap/schemeAuthority2.q.out
+++ b/ql/src/test/results/clientpositive/llap/schemeAuthority2.q.out
@@ -9,11 +9,9 @@ POSTHOOK: Output: default@dynPart_n0
#### A masked pattern was here ####
PREHOOK: type: QUERY
PREHOOK: Input: default@src
-PREHOOK: Output: hdfs://### HDFS PATH ###
#### A masked pattern was here ####
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
-POSTHOOK: Output: hdfs://### HDFS PATH ###
#### A masked pattern was here ####
PREHOOK: type: QUERY
PREHOOK: Input: default@src
