You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2017/08/23 20:04:52 UTC
[1/2] hive git commit: HIVE-17327 : ADDENDUM (revert a small part of
the patch to fix the test) (Sergey Shelukhin)
Repository: hive
Updated Branches:
refs/heads/branch-2 069b20afb -> 588148da1
refs/heads/master 0500f1c7f -> 985f33975
HIVE-17327 : ADDENDUM (revert a small part of the patch to fix the test) (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/985f3397
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/985f3397
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/985f3397
Branch: refs/heads/master
Commit: 985f33975cb029048b0279ebfb9bf62c07bed91e
Parents: 0500f1c
Author: sergey <se...@apache.org>
Authored: Wed Aug 23 13:04:20 2017 -0700
Committer: sergey <se...@apache.org>
Committed: Wed Aug 23 13:04:20 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java | 4 ++--
.../src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/985f3397/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
----------------------------------------------------------------------
diff --git a/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java b/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
index ff9dc88..e9445eb 100644
--- a/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
+++ b/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
@@ -1378,8 +1378,8 @@ public class Hadoop23Shims extends HadoopShimsSecure {
}
@Override
- public long getFileId(DistributedFileSystem fs, String path) throws IOException {
- return fs.getClient().getFileInfo(path).getFileId();
+ public long getFileId(FileSystem fs, String path) throws IOException {
+ return ensureDfs(fs).getClient().getFileInfo(path).getFileId();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/985f3397/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
----------------------------------------------------------------------
diff --git a/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java b/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
index 87892d5..0db54d1 100644
--- a/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
+++ b/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
@@ -17,8 +17,6 @@
*/
package org.apache.hadoop.hive.shims;
-import org.apache.hadoop.hdfs.DistributedFileSystem;
-
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
@@ -659,7 +657,7 @@ public interface HadoopShims {
* Gets file ID. Only supported on hadoop-2.
* @return inode ID of the file.
*/
- long getFileId(DistributedFileSystem fs, String path) throws IOException;
+ long getFileId(FileSystem fs, String path) throws IOException;
/** Clones the UGI and the Subject. */
UserGroupInformation cloneUgi(UserGroupInformation baseUgi) throws IOException;
[2/2] hive git commit: HIVE-17327 : ADDENDUM (revert a small part of
the patch to fix the test) (Sergey Shelukhin)
Posted by se...@apache.org.
HIVE-17327 : ADDENDUM (revert a small part of the patch to fix the test) (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/588148da
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/588148da
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/588148da
Branch: refs/heads/branch-2
Commit: 588148da18d5447ae112a5ea2a08f1cf107eff86
Parents: 069b20a
Author: sergey <se...@apache.org>
Authored: Wed Aug 23 13:04:20 2017 -0700
Committer: sergey <se...@apache.org>
Committed: Wed Aug 23 13:04:42 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java | 4 ++--
.../src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/588148da/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
----------------------------------------------------------------------
diff --git a/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java b/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
index 20664bb..985a5bd 100644
--- a/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
+++ b/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
@@ -1335,8 +1335,8 @@ public class Hadoop23Shims extends HadoopShimsSecure {
}
@Override
- public long getFileId(DistributedFileSystem fs, String path) throws IOException {
- return fs.getClient().getFileInfo(path).getFileId();
+ public long getFileId(FileSystem fs, String path) throws IOException {
+ return ensureDfs(fs).getClient().getFileInfo(path).getFileId();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/588148da/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
----------------------------------------------------------------------
diff --git a/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java b/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
index 9b49dd1..9c6901d 100644
--- a/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
+++ b/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
@@ -17,8 +17,6 @@
*/
package org.apache.hadoop.hive.shims;
-import org.apache.hadoop.hdfs.DistributedFileSystem;
-
import java.io.IOException;
import java.io.InputStream;
import java.net.InetSocketAddress;
@@ -648,7 +646,7 @@ public interface HadoopShims {
* Gets file ID. Only supported on hadoop-2.
* @return inode ID of the file.
*/
- long getFileId(DistributedFileSystem fs, String path) throws IOException;
+ long getFileId(FileSystem fs, String path) throws IOException;
/** Clones the UGI and the Subject. */
UserGroupInformation cloneUgi(UserGroupInformation baseUgi) throws IOException;