xiarixiaoyao commented on a change in pull request #4910:
URL: https://github.com/apache/hudi/pull/4910#discussion_r840410773
##########
File path:
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/config/HoodieWriteConfig.java
##########
@@ -167,6 +167,22 @@
+ "implementations of HoodieRecordPayload to convert incoming
records to avro. This is also used as the write schema "
+ "evolving records during an update.");
+ public static final ConfigProperty<String> INTERNAL_SCHEMA_STRING =
ConfigProperty
+ .key("hoodie.internal.schema")
+ .noDefaultValue()
+ .withDocumentation("Schema string representing the latest schema of the
table. Hudi passes this to "
+ + "implementations of evolution of schema");
+
+ public static final ConfigProperty<Boolean> SCHEMA_EVOLUTION_ENABLE =
ConfigProperty
Review comment:
fixed
##########
File path:
hudi-common/src/main/java/org/apache/hudi/common/table/log/AbstractHoodieLogRecordReader.java
##########
@@ -109,6 +114,9 @@
private final FileSystem fs;
// Total log files read - for metrics
private AtomicLong totalLogFiles = new AtomicLong(0);
+ // Internal schema
+ private InternalSchema internalSchema;
+ private final String path;
Review comment:
fixed
##########
File path:
hudi-common/src/main/java/org/apache/hudi/common/util/InternalSchemaCache.java
##########
@@ -0,0 +1,207 @@
+/*
+ * 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.hudi.common.util;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hudi.common.fs.FSUtils;
+import org.apache.hudi.common.model.HoodieCommitMetadata;
+import org.apache.hudi.common.table.HoodieTableMetaClient;
+import org.apache.hudi.common.table.timeline.HoodieInstant;
+import org.apache.hudi.common.table.timeline.HoodieTimeline;
+import org.apache.hudi.common.util.collection.Pair;
+import org.apache.hudi.exception.HoodieException;
+import org.apache.hudi.internal.schema.InternalSchema;
+import
org.apache.hudi.internal.schema.io.FileBasedInternalSchemaStorageManager;
+import org.apache.hudi.internal.schema.utils.InternalSchemaUtils;
+import org.apache.hudi.internal.schema.utils.SerDeHelper;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+public class InternalSchemaCache {
+ // Use segment lock to reduce competition.
+ // the lock size should be powers of 2 for better hash.
+ private static Object[] lockList = new Object[16];
+
+ static {
+ for (int i = 0; i < lockList.length; i++) {
+ lockList[i] = new Object();
+ }
+ }
+
+ // historySchemas cache maintain a map about (tablePath, HistorySchemas).
+ // this is a Global cache, all threads in one container/executor share the
same cache.
+ private static final Cache<String, TreeMap<Long, InternalSchema>>
+ HISTORICAL_SCHEMA_CACHE =
Caffeine.newBuilder().maximumSize(1000).weakValues().build();
+
+ /**
+ * Search internalSchema based on versionID.
+ * first step: try to get internalSchema from hoodie commit files, we no
need to add lock.
+ * if we cannot get internalSchema by first step, then we try to get
internalSchema from cache.
+ *
+ * @param versionID schema version_id need to search
+ * @param metaClient current hoodie metaClient
+ * @return internalSchema
+ */
+ public static InternalSchema searchSchemaAndCache(long versionID,
HoodieTableMetaClient metaClient, boolean cacheEnable) {
+ Option<InternalSchema> candidateSchema =
getSchemaByReadingCommitFile(versionID, metaClient);
+ if (candidateSchema.isPresent()) {
+ return candidateSchema.get();
+ }
+ if (!cacheEnable) {
+ // parse history schema and return directly
+ return InternalSchemaUtils.searchSchema(versionID,
getHistoricalSchemas(metaClient));
+ }
+ String tablePath = metaClient.getBasePath();
+ // use segment lock to reduce competition.
+ synchronized (lockList[tablePath.hashCode() & (lockList.length - 1)]) {
+ TreeMap<Long, InternalSchema> historicalSchemas =
HISTORICAL_SCHEMA_CACHE.getIfPresent(tablePath);
+ if (historicalSchemas == null ||
InternalSchemaUtils.searchSchema(versionID, historicalSchemas) == null) {
+ historicalSchemas = getHistoricalSchemas(metaClient);
+ HISTORICAL_SCHEMA_CACHE.put(tablePath, historicalSchemas);
+ } else {
+ long maxVersionId =
historicalSchemas.keySet().stream().max(Long::compareTo).get();
+ if (versionID > maxVersionId) {
+ historicalSchemas = getHistoricalSchemas(metaClient);
+ HISTORICAL_SCHEMA_CACHE.put(tablePath, historicalSchemas);
+ }
+ }
+ return InternalSchemaUtils.searchSchema(versionID, historicalSchemas);
+ }
+ }
+
+ private static TreeMap<Long, InternalSchema>
getHistoricalSchemas(HoodieTableMetaClient metaClient) {
+ TreeMap<Long, InternalSchema> result = new TreeMap<>();
+ FileBasedInternalSchemaStorageManager schemasManager = new
FileBasedInternalSchemaStorageManager(metaClient);
+ String historySchemaStr = schemasManager.getHistorySchemaStr();
+ if (!StringUtils.isNullOrEmpty(historySchemaStr)) {
+ result = SerDeHelper.parseSchemas(historySchemaStr);
+ }
+ return result;
+ }
+
+ private static Option<InternalSchema> getSchemaByReadingCommitFile(long
versionID, HoodieTableMetaClient metaClient) {
+ try {
+ HoodieTimeline timeline =
metaClient.getActiveTimeline().getCommitsTimeline().filterCompletedInstants();
+ List<HoodieInstant> instants = timeline.getInstants().filter(f ->
f.getTimestamp().equals(String.valueOf(versionID))).collect(Collectors.toList());
+ if (instants.isEmpty()) {
+ return Option.empty();
+ }
+ byte[] data = timeline.getInstantDetails(instants.get(0)).get();
+ HoodieCommitMetadata metadata = HoodieCommitMetadata.fromBytes(data,
HoodieCommitMetadata.class);
+ String latestInternalSchemaStr =
metadata.getMetadata(SerDeHelper.LATEST_SCHEMA);
+ return SerDeHelper.fromJson(latestInternalSchemaStr);
+ } catch (Exception e) {
+ throw new HoodieException("Failed to read schema from commit metadata",
e);
+ }
+ }
+
+ /**
+ * Get internalSchema and avroSchema for compaction/cluster operation.
+ *
+ * @param metaClient current hoodie metaClient
+ * @param compactionAndClusteringInstant first instant before current
compaction/cluster instant
+ * @return (internalSchemaStrOpt, avroSchemaStrOpt) a pair of
InternalSchema/avroSchema
+ */
+ public static Pair<Option<String>, Option<String>>
getInternalSchemaAndAvroSchemaForClusteringAndCompaction(HoodieTableMetaClient
metaClient, String compactionAndClusteringInstant) {
+ // try to load internalSchema to support Schema Evolution
+ HoodieTimeline timelineBeforeCurrentCompaction =
metaClient.getCommitsAndCompactionTimeline().findInstantsBefore(compactionAndClusteringInstant).filterCompletedInstants();
+ Option<HoodieInstant> lastInstantBeforeCurrentCompaction =
timelineBeforeCurrentCompaction.lastInstant();
+ if (lastInstantBeforeCurrentCompaction.isPresent()) {
+ // try to find internalSchema
+ byte[] data =
timelineBeforeCurrentCompaction.getInstantDetails(lastInstantBeforeCurrentCompaction.get()).get();
+ HoodieCommitMetadata metadata;
+ try {
+ metadata = HoodieCommitMetadata.fromBytes(data,
HoodieCommitMetadata.class);
+ } catch (Exception e) {
+ throw new HoodieException(String.format("cannot read metadata from
commit: %s", lastInstantBeforeCurrentCompaction.get()), e);
+ }
+ String internalSchemaStr =
metadata.getMetadata(SerDeHelper.LATEST_SCHEMA);
+ if (internalSchemaStr != null) {
+ String existingSchemaStr =
metadata.getMetadata(HoodieCommitMetadata.SCHEMA_KEY);
+ return Pair.of(Option.of(internalSchemaStr),
Option.of(existingSchemaStr));
+ }
+ }
+ return Pair.of(Option.empty(), Option.empty());
+ }
+
+ /**
+ * Give a schema versionId return its internalSchema.
+ * This method will be called by spark tasks, we should minimize time cost.
+ * We try our best to not use metaClient， since the initialization of
metaClient is time cost
+ * step1：
+ * try to parser internalSchema from HoodieInstant directly
+ * step2：
+ * if we cannot parser internalSchema in step1，
+ * try to find internalSchema in historySchema.
+ *
+ * @param versionId the internalSchema version to be search.
+ * @param tablePath table path
+ * @param hadoopConf conf
+ * @param validCommits current validate commits, use to make up the commit
file path/verify the validity of the history schema files
+ * @return a internalSchema.
+ */
+ public static InternalSchema getInternalSchemaByVersionId(long versionId,
String tablePath, Configuration hadoopConf, String validCommits) {
+ Set<String> commitSet =
Arrays.stream(validCommits.split(",")).collect(Collectors.toSet());
+ List<String> validateCommitList = commitSet.stream().map(fileName -> {
+ String fileExtension = HoodieInstant.getTimelineFileExtension(fileName);
+ return fileName.replace(fileExtension, "");
+ }).collect(Collectors.toList());
+
+ FileSystem fs = FSUtils.getFs(tablePath, hadoopConf);
+ Path hoodieMetaPath = new Path(tablePath,
HoodieTableMetaClient.METAFOLDER_NAME);
+ //step1:
+ Path candidateCommitFile = commitSet.stream().filter(fileName -> {
+ String fileExtension = HoodieInstant.getTimelineFileExtension(fileName);
+ return fileName.replace(fileExtension, "").equals(versionId + "");
+ }).findFirst().map(f -> new Path(hoodieMetaPath, f)).orElse(null);
+ if (candidateCommitFile != null) {
+ try {
+ byte[] data;
+ try (FSDataInputStream is = fs.open(candidateCommitFile)) {
+ data = FileIOUtils.readAsByteArray(is);
+ } catch (IOException e) {
+ throw e;
+ }
+ HoodieCommitMetadata metadata = HoodieCommitMetadata.fromBytes(data,
HoodieCommitMetadata.class);
+ String latestInternalSchemaStr =
metadata.getMetadata(SerDeHelper.LATEST_SCHEMA);
+ if (latestInternalSchemaStr != null) {
+ return SerDeHelper.fromJson(latestInternalSchemaStr).orElse(null);
+ }
+ } catch (Exception e1) {
+ // swallow this exception.
Review comment:
fixed
##########
File path:
hudi-common/src/main/java/org/apache/hudi/metadata/HoodieMetadataMergedLogRecordReader.java
##########
@@ -65,7 +65,7 @@ private HoodieMetadataMergedLogRecordReader(FileSystem fs,
String basePath, Stri
Option<InstantRange>
instantRange, boolean enableFullScan) {
super(fs, basePath, logFilePaths, readerSchema, latestInstantTime,
maxMemorySizeInBytes, false, false, bufferSize,
spillableMapBasePath, instantRange, false, diskMapType,
isBitCaskDiskMapCompressionEnabled, false,
- enableFullScan, Option.of(partitionName));
+ enableFullScan, Option.of(partitionName), null);
Review comment:
fixed
##########
File path:
hudi-common/src/main/java/org/apache/hudi/common/table/timeline/HoodieActiveTimeline.java
##########
@@ -73,7 +73,8 @@
INFLIGHT_COMPACTION_EXTENSION, REQUESTED_COMPACTION_EXTENSION,
REQUESTED_RESTORE_EXTENSION, INFLIGHT_RESTORE_EXTENSION,
RESTORE_EXTENSION,
ROLLBACK_EXTENSION, REQUESTED_ROLLBACK_EXTENSION,
INFLIGHT_ROLLBACK_EXTENSION,
- REQUESTED_REPLACE_COMMIT_EXTENSION, INFLIGHT_REPLACE_COMMIT_EXTENSION,
REPLACE_COMMIT_EXTENSION));
+ REQUESTED_REPLACE_COMMIT_EXTENSION, INFLIGHT_REPLACE_COMMIT_EXTENSION,
REPLACE_COMMIT_EXTENSION,
+ REQUESTED_SAVE_SCHEMA_ACTION_EXTENSION,
INFLIGHT_SAVE_SCHEMA_ACTION_EXTENSION, SAVE_SCHEMA_ACTION_EXTENSION));
Review comment:
agree
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
