Repository: incubator-impala Updated Branches: refs/heads/hadoop-next e758285d3 -> fe33f181e
IMPALA-4676: remove vestigial references to getBlockStorageLocations() API * the BlockStorageLocation import is unused * The config keys only influence behaviour of getBlockStorageLocations(), which we no longer used and are removed in Hadoop 3 Change-Id: Ic12337a9f5b7d910282aaf7d8508a4176cf89cbc Reviewed-on: http://gerrit.cloudera.org:8080/5529 Reviewed-by: Tim Armstrong <[email protected]> Tested-by: Tim Armstrong <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/fe33f181 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/fe33f181 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/fe33f181 Branch: refs/heads/hadoop-next Commit: fe33f181e665729dac9fe7923378d9e1a47d1237 Parents: e758285 Author: Tim Armstrong <[email protected]> Authored: Thu Dec 15 14:22:02 2016 -0800 Committer: Tim Armstrong <[email protected]> Committed: Thu Dec 15 23:03:08 2016 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/impala/catalog/HdfsTable.java | 1 - .../main/java/org/apache/impala/service/JniFrontend.java | 11 ----------- 2 files changed, 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/fe33f181/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java b/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java index 60bfaf1..c7d2097 100644 --- a/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java +++ b/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java @@ -33,7 +33,6 @@ import java.util.TreeMap; import org.apache.avro.Schema; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.BlockLocation; -import org.apache.hadoop.fs.BlockStorageLocation; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocatedFileStatus; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/fe33f181/fe/src/main/java/org/apache/impala/service/JniFrontend.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/service/JniFrontend.java b/fe/src/main/java/org/apache/impala/service/JniFrontend.java index bff5342..e4b30a5 100644 --- a/fe/src/main/java/org/apache/impala/service/JniFrontend.java +++ b/fe/src/main/java/org/apache/impala/service/JniFrontend.java @@ -731,17 +731,6 @@ public class JniFrontend { errorCause.append(" is not enabled.\n"); } - // dfs.client.file-block-storage-locations.timeout.millis should be >= 10 seconds - int dfsClientFileBlockStorageLocationsTimeoutMs = conf.getInt( - DFSConfigKeys.DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS, - DFSConfigKeys.DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS_DEFAULT); - if (dfsClientFileBlockStorageLocationsTimeoutMs < - MIN_DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS) { - errorCause.append(prefix); - errorCause.append(DFSConfigKeys.DFS_CLIENT_FILE_BLOCK_STORAGE_LOCATIONS_TIMEOUT_MS); - errorCause.append(" is too low. It should be at least 10 seconds.\n"); - } - if (errorCause.length() > 0) { output.append(errorMessage); output.append(errorCause);
