[
https://issues.apache.org/jira/browse/DRILL-7271?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16871458#comment-16871458
]
ASF GitHub Bot commented on DRILL-7271:
---------------------------------------
vvysotskyi commented on pull request #1810: DRILL-7271: Refactor Metadata
interfaces and classes to contain all needed information for the File based
Metastore
URL: https://github.com/apache/drill/pull/1810#discussion_r296756147
##########
File path:
metastore/metastore-api/src/main/java/org/apache/drill/metastore/metadata/BaseTableMetadata.java
##########
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.metastore.metadata;
+
+import org.apache.drill.common.expression.SchemaPath;
+import org.apache.drill.metastore.statistics.ColumnStatistics;
+import org.apache.drill.metastore.statistics.StatisticsHolder;
+import org.apache.hadoop.fs.Path;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Base implementation of {@link TableMetadata} interface.
+ */
+public class BaseTableMetadata extends BaseMetadata implements TableMetadata {
+
+ public static final long NON_DEFINED_LAST_MODIFIED_TIME = -1;
+
+ private final Path location;
+ private final long lastModifiedTime;
+ private final Map<String, String> partitionKeys;
+ private final List<SchemaPath> interestingColumns;
+
+ private BaseTableMetadata(BaseTableMetadataBuilder builder) {
+ super(builder);
+ this.location = builder.location;
+ this.partitionKeys = builder.partitionKeys;
+ this.interestingColumns = builder.interestingColumns;
+ this.lastModifiedTime = builder.lastModifiedTime;
+ }
+
+ public boolean isPartitionColumn(String fieldName) {
+ return partitionKeys.containsKey(fieldName);
+ }
+
+ boolean isPartitioned() {
+ return !partitionKeys.isEmpty();
+ }
+
+ @Override
+ public Path getLocation() {
+ return location;
+ }
+
+ @Override
+ public long getLastModifiedTime() {
+ return lastModifiedTime;
+ }
+
+ @Override
+ public List<SchemaPath> getInterestingColumns() {
+ return interestingColumns;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public BaseTableMetadata cloneWithStats(Map<SchemaPath, ColumnStatistics>
columnStatistics, List<StatisticsHolder> tableStatistics) {
+ Map<String, StatisticsHolder> mergedTableStatistics = new
HashMap<>(this.statistics);
+
+ // overrides statistics value for the case when new statistics is exact or
existing one was estimated
+ tableStatistics.stream()
+ .filter(statisticsHolder ->
statisticsHolder.getStatisticsKind().isExact()
+ ||
!this.statistics.get(statisticsHolder.getStatisticsKind().getName()).getStatisticsKind().isExact())
+ .forEach(statisticsHolder ->
mergedTableStatistics.put(statisticsHolder.getStatisticsKind().getName(),
statisticsHolder));
+
+ Map<SchemaPath, ColumnStatistics> newColumnsStatistics = new
HashMap<>(this.columnsStatistics);
+ this.columnsStatistics.forEach(
+ (columnName, value) -> newColumnsStatistics.put(columnName,
value.cloneWith(columnStatistics.get(columnName))));
+
+ return BaseTableMetadata.builder()
+ .withTableInfo(tableInfo)
+ .withMetadataInfo(metadataInfo)
+ .withLocation(location)
+ .withSchema(schema)
+ .withColumnsStatistics(newColumnsStatistics)
+ .withStatistics(mergedTableStatistics.values())
+ .withLastModifiedTime(lastModifiedTime)
+ .withPartitionKeys(partitionKeys)
+ .withInterestingColumns(interestingColumns)
+ .build();
+ }
+
+ public static BaseTableMetadataBuilder builder() {
+ return new BaseTableMetadataBuilder();
+ }
+
+ public static class BaseTableMetadataBuilder extends
BaseMetadataBuilder<BaseTableMetadataBuilder> {
+ private Path location;
+ private long lastModifiedTime = NON_DEFINED_LAST_MODIFIED_TIME;
+ private Map<String, String> partitionKeys;
+ private List<SchemaPath> interestingColumns;
+
+ public BaseTableMetadataBuilder withLocation(Path location) {
+ this.location = location;
+ return self();
+ }
+
+ public BaseTableMetadataBuilder withLastModifiedTime(long
lastModifiedTime) {
+ this.lastModifiedTime = lastModifiedTime;
+ return self();
+ }
+
+ public BaseTableMetadataBuilder withPartitionKeys(Map<String, String>
partitionKeys) {
+ this.partitionKeys = partitionKeys;
+ return self();
+ }
+
+ public BaseTableMetadataBuilder withInterestingColumns(List<SchemaPath>
interestingColumns) {
+ this.interestingColumns = interestingColumns;
+ return self();
+ }
+
+ @Override
+ public BaseTableMetadata build() {
+ checkSetValues();
Review comment:
Thanks, overrode `checkSetValues` method and added custom checks there. It
looks better.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Refactor Metadata interfaces and classes to contain all needed information
> for the File based Metastore
> -------------------------------------------------------------------------------------------------------
>
> Key: DRILL-7271
> URL: https://issues.apache.org/jira/browse/DRILL-7271
> Project: Apache Drill
> Issue Type: Sub-task
> Reporter: Arina Ielchiieva
> Assignee: Volodymyr Vysotskyi
> Priority: Major
> Fix For: 1.17.0
>
>
> 1. Merge info from metadataStatistics + statisticsKinds into one holder:
> Map<String, StatisticsHolder>.
> 2. Rename hasStatistics to hasDescriptiveStatistics
> 3. Remove drill-file-metastore-plugin
> 4. Move
> org.apache.drill.exec.physical.base.AbstractGroupScanWithMetadata.MetadataLevel
> to metadata module, rename to MetadataType and add new value: SEGMENT.
> 5. Add JSON ser/de for ColumnStatistics, StatisticsHolder.
> 6. Add new info classes:
> {noformat}
> class TableInfo {
> String storagePlugin;
> String workspace;
> String name;
> String type;
> String owner;
> }
> class MetadataInfo {
> public static final String GENERAL_INFO_KEY = "GENERAL_INFO";
> public static final String DEFAULT_SEGMENT_KEY = "DEFAULT_SEGMENT";
> MetadataType type (enum);
> String key;
> String identifier;
> }
> {noformat}
> 7. Modify existing metadata classes:
> org.apache.drill.metastore.FileTableMetadata
> {noformat}
> missing fields
> ------------------
> storagePlugin, workspace, tableType -> will be covered by TableInfo class
> metadataType, metadataKey -> will be covered by MetadataInfo class
> interestingColumns
> fields to modify
> ----------------
> private final Map<String, Object> tableStatistics;
> private final Map<String, StatisticsKind> statisticsKinds;
> private final Set<String> partitionKeys; -> Map<String, String>
> {noformat}
> org.apache.drill.metastore.PartitionMetadata
> {noformat}
> missing fields
> ------------------
> storagePlugin, workspace -> will be covered by TableInfo class
> metadataType, metadataKey, metadataIdentifier -> will be covered by
> MetadataInfo class
> partitionValues (List<String>)
> location (String) (for directory level metadata) - directory location
> fields to modify
> ----------------
> private final Map<String, Object> tableStatistics;
> private final Map<String, StatisticsKind> statisticsKinds;
> private final Set<Path> location; -> locations
> {noformat}
> org.apache.drill.metastore.FileMetadata
> {noformat}
> missing fields
> ------------------
> storagePlugin, workspace -> will be covered by TableInfo class
> metadataType, metadataKey, metadataIdentifier -> will be covered by
> MetadataInfo class
> path - path to file
> fields to modify
> ----------------
> private final Map<String, Object> tableStatistics;
> private final Map<String, StatisticsKind> statisticsKinds;
> private final Path location; - should contain directory to which file belongs
> {noformat}
> org.apache.drill.metastore.RowGroupMetadata
> {noformat}
> missing fields
> ------------------
> storagePlugin, workspace -> will be covered by TableInfo class
> metadataType, metadataKey, metadataIdentifier -> will be covered by
> MetadataInfo class
> path - path to file
> fields to modify
> ----------------
> private final Map<String, Object> tableStatistics;
> private final Map<String, StatisticsKind> statisticsKinds;
> private final Path location; - should contain directory to which file belongs
> {noformat}
> 8. Remove org.apache.drill.exec package from metastore module.
> 9. Rename ColumnStatisticsImpl class.
> 10. Separate existing classes in org.apache.drill.metastore package into
> sub-packages.
> 11. Rename FileTableMetadata -> BaseTableMetadata
> 12. TableMetadataProvider.getNonInterestingColumnsMeta() ->
> getNonInterestingColumnsMetadata
> 13. Introduce segment-level metadata class:
> {noformat}
> class SegmentMetadata {
> TableInfo tableInfo;
> MetadataInfo metadataInfo;
> SchemaPath column;
> TupleMetadata schema;
> String location;
> Map<SchemaPath, ColumnStatistics> columnsStatistics;
> Map<String, StatisticsHolder> statistics;
> List<String> partitionValues;
> List<String> locations;
> long lastModifiedTime;
> }
> {noformat}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
