This is an automated email from the ASF dual-hosted git repository. volodymyr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 1522dd0e016459a03436ade38134bd98e59f7e57 Author: Volodymyr Vysotskyi <[email protected]> AuthorDate: Fri Jul 5 13:26:42 2019 +0300 DRILL-7316: Move classes from org.apache.drill.metastore into org.apache.drill.exec.metastore package in java-exec module --- .../org/apache/drill/exec/store/mapr/db/MapRDBFormatPlugin.java | 2 +- .../drill/exec/store/mapr/db/binary/BinaryTableGroupScan.java | 4 ++-- .../apache/drill/exec/store/mapr/db/json/JsonTableGroupScan.java | 4 ++-- .../drill/exec/store/mapr/db/json/RestrictedJsonTableGroupScan.java | 2 +- .../sql/logical/ConvertHiveMapRDBJsonScanToDrillMapRDBJsonScan.java | 2 +- .../{ => exec}/metastore/FileSystemMetadataProviderManager.java | 2 +- .../apache/drill/{ => exec}/metastore/MetadataProviderManager.java | 2 +- .../apache/drill/{ => exec}/metastore/ParquetMetadataProvider.java | 2 +- .../drill/{ => exec}/metastore/ParquetTableMetadataProvider.java | 2 +- .../drill/{ => exec}/metastore/SimpleFileTableMetadataProvider.java | 2 +- .../main/java/org/apache/drill/exec/planner/logical/DrillTable.java | 4 ++-- .../org/apache/drill/exec/planner/logical/DynamicDrillTable.java | 2 +- .../main/java/org/apache/drill/exec/planner/sql/SqlConverter.java | 2 +- .../java/org/apache/drill/exec/store/AbstractStoragePlugin.java | 2 +- .../src/main/java/org/apache/drill/exec/store/StoragePlugin.java | 2 +- .../main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java | 2 +- .../src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java | 2 +- .../org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java | 4 ++-- .../java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java | 2 +- .../java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java | 4 ++-- .../exec/store/dfs/easy/SimpleFileTableMetadataProviderBuilder.java | 2 +- .../org/apache/drill/exec/store/easy/text/TextFormatPlugin.java | 2 +- .../apache/drill/exec/store/parquet/AbstractParquetGroupScan.java | 2 +- .../drill/exec/store/parquet/BaseParquetMetadataProvider.java | 2 +- .../exec/store/parquet/ParquetFileTableMetadataProviderBuilder.java | 2 +- .../org/apache/drill/exec/store/parquet/ParquetFormatPlugin.java | 2 +- .../java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java | 6 +++--- .../drill/exec/store/parquet/ParquetTableMetadataProviderImpl.java | 6 +++--- 28 files changed, 37 insertions(+), 37 deletions(-) diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBFormatPlugin.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBFormatPlugin.java index a401094..ec91456 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBFormatPlugin.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBFormatPlugin.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.store.mapr.TableFormatPlugin; import org.apache.drill.exec.store.mapr.db.binary.BinaryTableGroupScan; import org.apache.drill.exec.store.mapr.db.json.JsonScanSpec; import org.apache.drill.exec.store.mapr.db.json.JsonTableGroupScan; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/BinaryTableGroupScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/BinaryTableGroupScan.java index b2873a4..ec496e9 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/BinaryTableGroupScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/binary/BinaryTableGroupScan.java @@ -47,8 +47,8 @@ import org.apache.drill.exec.store.mapr.db.MapRDBSubScan; import org.apache.drill.exec.store.mapr.db.MapRDBSubScanSpec; import org.apache.drill.exec.store.mapr.db.MapRDBTableStats; import org.apache.drill.exec.store.mapr.db.TabletFragmentInfo; -import org.apache.drill.metastore.FileSystemMetadataProviderManager; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.FileSystemMetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.metastore.metadata.TableMetadataProvider; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HRegionInfo; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableGroupScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableGroupScan.java index 0047d29..fd910a7 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableGroupScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonTableGroupScan.java @@ -65,8 +65,8 @@ import org.apache.drill.exec.store.mapr.db.MapRDBSubScanSpec; import org.apache.drill.exec.store.mapr.db.MapRDBTableStats; import org.apache.drill.exec.store.mapr.db.TabletFragmentInfo; import org.apache.drill.exec.util.Utilities; -import org.apache.drill.metastore.FileSystemMetadataProviderManager; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.FileSystemMetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.metastore.metadata.TableMetadataProvider; import org.codehaus.jackson.annotate.JsonCreator; import org.ojai.store.QueryCondition; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonTableGroupScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonTableGroupScan.java index 398fcc1..a05010a 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonTableGroupScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/RestrictedJsonTableGroupScan.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.metastore.FileSystemMetadataProviderManager; +import org.apache.drill.exec.metastore.FileSystemMetadataProviderManager; import org.apache.drill.shaded.guava.com.google.common.base.Preconditions; import org.apache.drill.shaded.guava.com.google.common.collect.Lists; diff --git a/contrib/storage-hive/core/scrMapr/main/java/org/apache/drill/exec/planner/sql/logical/ConvertHiveMapRDBJsonScanToDrillMapRDBJsonScan.java b/contrib/storage-hive/core/scrMapr/main/java/org/apache/drill/exec/planner/sql/logical/ConvertHiveMapRDBJsonScanToDrillMapRDBJsonScan.java index 8b18347..f263e31 100644 --- a/contrib/storage-hive/core/scrMapr/main/java/org/apache/drill/exec/planner/sql/logical/ConvertHiveMapRDBJsonScanToDrillMapRDBJsonScan.java +++ b/contrib/storage-hive/core/scrMapr/main/java/org/apache/drill/exec/planner/sql/logical/ConvertHiveMapRDBJsonScanToDrillMapRDBJsonScan.java @@ -40,7 +40,7 @@ import org.apache.drill.exec.store.mapr.db.MapRDBFormatPlugin; import org.apache.drill.exec.store.mapr.db.MapRDBFormatPluginConfig; import org.apache.drill.exec.store.mapr.db.json.JsonScanSpec; import org.apache.drill.exec.store.mapr.db.json.JsonTableGroupScan; -import org.apache.drill.metastore.FileSystemMetadataProviderManager; +import org.apache.drill.exec.metastore.FileSystemMetadataProviderManager; import org.apache.hadoop.hive.maprdb.json.input.HiveMapRDBJsonInputFormat; import org.ojai.DocumentConstants; diff --git a/exec/java-exec/src/main/java/org/apache/drill/metastore/FileSystemMetadataProviderManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/FileSystemMetadataProviderManager.java similarity index 99% rename from exec/java-exec/src/main/java/org/apache/drill/metastore/FileSystemMetadataProviderManager.java rename to exec/java-exec/src/main/java/org/apache/drill/exec/metastore/FileSystemMetadataProviderManager.java index ca5dfd9..6226ea9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/metastore/FileSystemMetadataProviderManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/FileSystemMetadataProviderManager.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.drill.metastore; +package org.apache.drill.exec.metastore; import org.apache.drill.exec.planner.common.DrillStatsTable; import org.apache.drill.exec.record.metadata.TupleMetadata; diff --git a/exec/java-exec/src/main/java/org/apache/drill/metastore/MetadataProviderManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/MetadataProviderManager.java similarity index 98% rename from exec/java-exec/src/main/java/org/apache/drill/metastore/MetadataProviderManager.java rename to exec/java-exec/src/main/java/org/apache/drill/exec/metastore/MetadataProviderManager.java index af81683..f56b042 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/metastore/MetadataProviderManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/MetadataProviderManager.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.drill.metastore; +package org.apache.drill.exec.metastore; import org.apache.drill.exec.planner.common.DrillStatsTable; import org.apache.drill.exec.record.metadata.schema.SchemaProvider; diff --git a/exec/java-exec/src/main/java/org/apache/drill/metastore/ParquetMetadataProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/ParquetMetadataProvider.java similarity index 98% rename from exec/java-exec/src/main/java/org/apache/drill/metastore/ParquetMetadataProvider.java rename to exec/java-exec/src/main/java/org/apache/drill/exec/metastore/ParquetMetadataProvider.java index 8830a4c..dac3251 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/metastore/ParquetMetadataProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/ParquetMetadataProvider.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.drill.metastore; +package org.apache.drill.exec.metastore; import org.apache.drill.exec.store.dfs.ReadEntryWithPath; import org.apache.drill.metastore.metadata.RowGroupMetadata; diff --git a/exec/java-exec/src/main/java/org/apache/drill/metastore/ParquetTableMetadataProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/ParquetTableMetadataProvider.java similarity index 97% rename from exec/java-exec/src/main/java/org/apache/drill/metastore/ParquetTableMetadataProvider.java rename to exec/java-exec/src/main/java/org/apache/drill/exec/metastore/ParquetTableMetadataProvider.java index fe9450f..916fd29 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/metastore/ParquetTableMetadataProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/ParquetTableMetadataProvider.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.drill.metastore; +package org.apache.drill.exec.metastore; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/metastore/SimpleFileTableMetadataProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/SimpleFileTableMetadataProvider.java similarity index 99% rename from exec/java-exec/src/main/java/org/apache/drill/metastore/SimpleFileTableMetadataProvider.java rename to exec/java-exec/src/main/java/org/apache/drill/exec/metastore/SimpleFileTableMetadataProvider.java index fc5eb83..b73404f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/metastore/SimpleFileTableMetadataProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metastore/SimpleFileTableMetadataProvider.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.drill.metastore; +package org.apache.drill.exec.metastore; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.planner.common.DrillStatsTable; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillTable.java index 14e7bac..b4e1952 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillTable.java @@ -30,8 +30,8 @@ import org.apache.calcite.sql.SqlCall; import org.apache.calcite.sql.SqlNode; import org.apache.drill.common.JSONOptions; import org.apache.drill.common.logical.StoragePluginConfig; -import org.apache.drill.metastore.FileSystemMetadataProviderManager; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.FileSystemMetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.metastore.metadata.TableMetadataProvider; import org.apache.drill.exec.physical.base.SchemalessScan; import org.apache.drill.exec.physical.base.GroupScan; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DynamicDrillTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DynamicDrillTable.java index 843fc9a..8059a30 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DynamicDrillTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DynamicDrillTable.java @@ -18,7 +18,7 @@ package org.apache.drill.exec.planner.logical; import org.apache.calcite.schema.Schema; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.planner.types.RelDataTypeDrillImpl; import org.apache.drill.exec.planner.types.RelDataTypeHolder; import org.apache.drill.exec.store.StoragePlugin; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlConverter.java index dbf97a4..3078253 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlConverter.java @@ -34,7 +34,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.drill.exec.planner.sql.parser.DrillParserUtil; import org.apache.drill.exec.planner.sql.parser.impl.DrillSqlParseException; import org.apache.drill.common.expression.SchemaPath; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.metastore.metadata.TableMetadataProvider; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.logical.LogicalProject; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractStoragePlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractStoragePlugin.java index c283c71..0e97c53 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractStoragePlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractStoragePlugin.java @@ -27,7 +27,7 @@ import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.logical.FormatPluginConfig; import org.apache.drill.exec.ops.OptimizerRulesContext; import org.apache.drill.exec.physical.base.AbstractGroupScan; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.planner.PlannerPhase; import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePlugin.java index aa3bc53..1613537 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePlugin.java @@ -28,7 +28,7 @@ import org.apache.drill.common.logical.FormatPluginConfig; import org.apache.drill.common.logical.StoragePluginConfig; import org.apache.drill.exec.ops.OptimizerRulesContext; import org.apache.drill.exec.physical.base.AbstractGroupScan; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.server.options.SessionOptionManager; import org.apache.drill.exec.store.dfs.FormatPlugin; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java index 02cc576..cf1333d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemPlugin.java @@ -35,7 +35,7 @@ import org.apache.drill.common.logical.FormatPluginConfig; import org.apache.drill.common.logical.StoragePluginConfig; import org.apache.drill.exec.ops.OptimizerRulesContext; import org.apache.drill.exec.physical.base.AbstractGroupScan; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.server.options.SessionOptionManager; import org.apache.drill.exec.store.AbstractStoragePlugin; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java index a839c1f..404a5d0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java @@ -26,7 +26,7 @@ import org.apache.drill.common.logical.FormatPluginConfig; import org.apache.drill.common.logical.StoragePluginConfig; import org.apache.drill.exec.physical.base.AbstractGroupScan; import org.apache.drill.exec.physical.base.AbstractWriter; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.planner.common.DrillStatsTable.TableStatistics; import org.apache.drill.exec.server.DrillbitContext; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java index 5588eda..098ebdb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java @@ -51,8 +51,8 @@ import org.apache.drill.exec.dotdrill.DotDrillFile; import org.apache.drill.exec.dotdrill.DotDrillType; import org.apache.drill.exec.dotdrill.DotDrillUtil; import org.apache.drill.exec.dotdrill.View; -import org.apache.drill.metastore.FileSystemMetadataProviderManager; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.FileSystemMetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.planner.common.DrillStatsTable; import org.apache.drill.exec.planner.logical.CreateTableEntry; import org.apache.drill.exec.planner.logical.DrillTable; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java index 302f61a..ba47f40 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyFormatPlugin.java @@ -63,7 +63,7 @@ import org.apache.drill.exec.store.dfs.FileSelection; import org.apache.drill.exec.store.dfs.FormatMatcher; import org.apache.drill.exec.store.dfs.FormatPlugin; import org.apache.drill.exec.store.schedule.CompleteFileWork; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.shaded.guava.com.google.common.base.Functions; import org.apache.drill.shaded.guava.com.google.common.collect.ImmutableSet; import org.apache.drill.shaded.guava.com.google.common.collect.Lists; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java index 197b5a3..652a42b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java @@ -26,10 +26,10 @@ import org.apache.drill.common.logical.FormatPluginConfig; import org.apache.drill.common.logical.StoragePluginConfig; import org.apache.drill.exec.physical.EndpointAffinity; import org.apache.drill.exec.physical.base.AbstractFileGroupScan; -import org.apache.drill.metastore.FileSystemMetadataProviderManager; +import org.apache.drill.exec.metastore.FileSystemMetadataProviderManager; import org.apache.drill.exec.physical.base.FileGroupScan; import org.apache.drill.exec.physical.base.GroupScan; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.physical.base.ScanStats; import org.apache.drill.metastore.metadata.TableMetadataProvider; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/SimpleFileTableMetadataProviderBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/SimpleFileTableMetadataProviderBuilder.java index a6432e1..aeed93f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/SimpleFileTableMetadataProviderBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/SimpleFileTableMetadataProviderBuilder.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.dfs.easy; -import org.apache.drill.metastore.SimpleFileTableMetadataProvider; +import org.apache.drill.exec.metastore.SimpleFileTableMetadataProvider; import org.apache.drill.metastore.metadata.TableMetadataProviderBuilder; import org.apache.hadoop.fs.Path; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatPlugin.java index e0ec1c1..400ea19 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatPlugin.java @@ -33,7 +33,7 @@ import org.apache.drill.common.types.Types; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.base.AbstractGroupScan; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.physical.base.ScanStats; import org.apache.drill.exec.physical.base.ScanStats.GroupScanProperty; import org.apache.drill.exec.physical.impl.scan.columns.ColumnsScanFramework.ColumnsScanBuilder; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetGroupScan.java index 9b253f5..2e802b2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/AbstractParquetGroupScan.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.physical.base.AbstractGroupScanWithMetadata; import org.apache.drill.metastore.metadata.SegmentMetadata; import org.apache.drill.metastore.statistics.TableStatisticsKind; import org.apache.drill.metastore.metadata.MetadataType; -import org.apache.drill.metastore.ParquetMetadataProvider; +import org.apache.drill.exec.metastore.ParquetMetadataProvider; import org.apache.drill.metastore.statistics.Statistic; import org.apache.drill.metastore.metadata.BaseMetadata; import org.apache.drill.metastore.metadata.LocationProvider; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/BaseParquetMetadataProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/BaseParquetMetadataProvider.java index cc5119a..92d582e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/BaseParquetMetadataProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/BaseParquetMetadataProvider.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet; -import org.apache.drill.metastore.ParquetMetadataProvider; +import org.apache.drill.exec.metastore.ParquetMetadataProvider; import org.apache.drill.metastore.metadata.LocationProvider; import org.apache.drill.metastore.metadata.MetadataInfo; import org.apache.drill.metastore.metadata.MetadataType; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFileTableMetadataProviderBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFileTableMetadataProviderBuilder.java index ab809bc..8c5e0a4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFileTableMetadataProviderBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFileTableMetadataProviderBuilder.java @@ -17,7 +17,7 @@ */ package org.apache.drill.exec.store.parquet; -import org.apache.drill.metastore.ParquetTableMetadataProvider; +import org.apache.drill.exec.metastore.ParquetTableMetadataProvider; import org.apache.drill.metastore.metadata.TableMetadataProviderBuilder; import org.apache.drill.exec.store.dfs.DrillFileSystem; import org.apache.drill.exec.store.dfs.FileSelection; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFormatPlugin.java index e0726f1..985fb20 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFormatPlugin.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.exception.OutOfMemoryException; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.base.AbstractFileGroupScan; import org.apache.drill.exec.physical.base.AbstractWriter; -import org.apache.drill.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.physical.base.SchemalessScan; import org.apache.drill.exec.physical.impl.WriterRecordBatch; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java index 54d3af3..7ae9c4b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java @@ -23,9 +23,9 @@ import java.util.Collection; import java.util.List; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.metastore.FileSystemMetadataProviderManager; -import org.apache.drill.metastore.MetadataProviderManager; -import org.apache.drill.metastore.ParquetTableMetadataProvider; +import org.apache.drill.exec.metastore.FileSystemMetadataProviderManager; +import org.apache.drill.exec.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.ParquetTableMetadataProvider; import org.apache.drill.exec.store.dfs.DrillFileSystem; import org.apache.drill.metastore.metadata.LocationProvider; import org.apache.drill.common.exceptions.ExecutionSetupException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetTableMetadataProviderImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetTableMetadataProviderImpl.java index 7fc3230..db6e0eb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetTableMetadataProviderImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetTableMetadataProviderImpl.java @@ -17,9 +17,9 @@ */ package org.apache.drill.exec.store.parquet; -import org.apache.drill.metastore.MetadataProviderManager; -import org.apache.drill.metastore.ParquetMetadataProvider; -import org.apache.drill.metastore.ParquetTableMetadataProvider; +import org.apache.drill.exec.metastore.MetadataProviderManager; +import org.apache.drill.exec.metastore.ParquetMetadataProvider; +import org.apache.drill.exec.metastore.ParquetTableMetadataProvider; import org.apache.drill.exec.planner.common.DrillStatsTable; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.record.metadata.schema.SchemaProvider;
