Remove dead multiple_filesystems member from THdfsTable This member was added long ago with a TODO to remove it. The member has not been in use for quite some time, so this patch removes the member as well as its assignment.
Change-Id: I33197a52e05d0c9647f5ce64a77c59950d9a1b94 Reviewed-on: http://gerrit.cloudera.org:8080/10935 Reviewed-by: Vuk Ercegovac <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/impala/repo Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/558fa145 Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/558fa145 Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/558fa145 Branch: refs/heads/master Commit: 558fa145a10c3a333b6113363b7e6d8777400520 Parents: 0411974 Author: Todd Lipcon <[email protected]> Authored: Thu Jul 12 16:17:07 2018 -0700 Committer: Todd Lipcon <[email protected]> Committed: Tue Jul 17 16:11:54 2018 +0000 ---------------------------------------------------------------------- common/thrift/CatalogObjects.thrift | 4 +--- fe/src/main/java/org/apache/impala/catalog/HdfsTable.java | 7 ------- .../java/org/apache/impala/catalog/local/LocalFsTable.java | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/impala/blob/558fa145/common/thrift/CatalogObjects.thrift ---------------------------------------------------------------------- diff --git a/common/thrift/CatalogObjects.thrift b/common/thrift/CatalogObjects.thrift index bc068d6..d463300 100644 --- a/common/thrift/CatalogObjects.thrift +++ b/common/thrift/CatalogObjects.thrift @@ -314,9 +314,7 @@ struct THdfsTable { // than duplicate the list of network address, which helps reduce memory usage. 7: optional list<Types.TNetworkAddress> network_addresses - // Indicates that this table's partitions reside on more than one filesystem. - // TODO: remove once INSERT across filesystems is supported. - 8: optional bool multiple_filesystems + // REMOVED: 8: optional bool multiple_filesystems // The prefixes of locations of partitions in this table. See THdfsPartitionLocation for // the description of how a prefix is computed. http://git-wip-us.apache.org/repos/asf/impala/blob/558fa145/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 69ecb6c..de9e3d8 100644 --- a/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java +++ b/fe/src/main/java/org/apache/impala/catalog/HdfsTable.java @@ -206,9 +206,6 @@ public class HdfsTable extends Table implements FeFsTable { // True iff this table has incremental stats in any of its partitions. private boolean hasIncrementalStats_ = false; - // True iff the table's partitions are located on more than one filesystem. - private boolean multipleFileSystems_ = false; - private HdfsPartitionLocationCompressor partitionLocationCompressor_; // Base Hdfs directory where files of this table are stored. @@ -1078,8 +1075,6 @@ public class HdfsTable extends Table implements FeFsTable { Path partDirPath = new Path(storageDescriptor.getLocation()); try { FileSystem fs = partDirPath.getFileSystem(CONF); - multipleFileSystems_ = multipleFileSystems_ || - !FileSystemUtil.isPathOnFileSystem(new Path(getLocation()), fs); if (msPartition != null) { HdfsCachingUtil.validateCacheParams(msPartition.getParameters()); } @@ -1668,7 +1663,6 @@ public class HdfsTable extends Table implements FeFsTable { hdfsBaseDir_ = hdfsTable.getHdfsBaseDir(); nullColumnValue_ = hdfsTable.nullColumnValue; nullPartitionKeyValue_ = hdfsTable.nullPartitionKeyValue; - multipleFileSystems_ = hdfsTable.multiple_filesystems; hostIndex_.populate(hdfsTable.getNetwork_addresses()); resetPartitions(); try { @@ -1765,7 +1759,6 @@ public class HdfsTable extends Table implements FeFsTable { THdfsTable hdfsTable = new THdfsTable(hdfsBaseDir_, getColumnNames(), nullPartitionKeyValue_, nullColumnValue_, idToPartition, prototypePartition); hdfsTable.setAvroSchema(avroSchema_); - hdfsTable.setMultiple_filesystems(multipleFileSystems_); if (includeFileDesc) { // Network addresses are used only by THdfsFileBlocks which are inside // THdfsFileDesc, so include network addreses only when including THdfsFileDesc. http://git-wip-us.apache.org/repos/asf/impala/blob/558fa145/fe/src/main/java/org/apache/impala/catalog/local/LocalFsTable.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/catalog/local/LocalFsTable.java b/fe/src/main/java/org/apache/impala/catalog/local/LocalFsTable.java index 8a6c0f6..b652e0d 100644 --- a/fe/src/main/java/org/apache/impala/catalog/local/LocalFsTable.java +++ b/fe/src/main/java/org/apache/impala/catalog/local/LocalFsTable.java @@ -187,7 +187,6 @@ public class LocalFsTable extends LocalTable implements FeFsTable { /*includeIncrementalStats=*/false); // TODO(todd): implement avro schema support - // TODO(todd): set multiple_filesystems member? THdfsTable hdfsTable = new THdfsTable(getHdfsBaseDir(), getColumnNames(), getNullPartitionKeyValue(), schemaInfo_.getNullColumnValue(), idToPartition, tPrototypePartition);
