-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
In a bootstrapped table, if there was an upsert in a file group, the records in the filegroups that were not upserted would have null values for their partition column. This patch fixes the issue.
- Loading branch information
Showing
12 changed files
with
515 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
...ent/hudi-spark-client/src/main/java/org/apache/hudi/client/utils/SparkPartitionUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * 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.client.utils; | ||
|
|
||
| import org.apache.hudi.AvroConversionUtils; | ||
| import org.apache.hudi.HoodieSparkUtils; | ||
| import org.apache.hudi.SparkAdapterSupport$; | ||
| import org.apache.hudi.common.util.Option; | ||
| import org.apache.hudi.hadoop.CachingPath; | ||
|
|
||
| import org.apache.avro.Schema; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.spark.sql.execution.datasources.SparkParsePartitionUtil; | ||
| import org.apache.spark.sql.internal.SQLConf; | ||
|
|
||
| public class SparkPartitionUtils { | ||
|
|
||
| public static Object[] getPartitionFieldVals(Option<String[]> partitionFields, | ||
| String partitionPath, | ||
| String basePath, | ||
| Schema writerSchema, | ||
| Configuration hadoopConf) { | ||
| if (!partitionFields.isPresent()) { | ||
| return new Object[0]; | ||
| } | ||
| SparkParsePartitionUtil sparkParsePartitionUtil = SparkAdapterSupport$.MODULE$.sparkAdapter().getSparkParsePartitionUtil(); | ||
| return HoodieSparkUtils.parsePartitionColumnValues( | ||
| partitionFields.get(), | ||
| partitionPath, | ||
| new CachingPath(basePath), | ||
| AvroConversionUtils.convertAvroSchemaToStructType(writerSchema), | ||
| hadoopConf.get("timeZone", SQLConf.get().sessionLocalTimeZone()), | ||
| sparkParsePartitionUtil, | ||
| hadoopConf.getBoolean("spark.sql.sources.validatePartitionColumns", true)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
hudi-common/src/main/java/org/apache/hudi/io/storage/HoodieBootstrapRecordIterator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * 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.io.storage; | ||
|
|
||
| import org.apache.hudi.common.model.HoodieRecord; | ||
| import org.apache.hudi.common.model.MetadataValues; | ||
| import org.apache.hudi.common.util.Option; | ||
| import org.apache.hudi.common.util.collection.ClosableIterator; | ||
|
|
||
| import org.apache.avro.Schema; | ||
|
|
||
| import static org.apache.hudi.common.util.ValidationUtils.checkState; | ||
|
|
||
| public abstract class HoodieBootstrapRecordIterator<T> implements ClosableIterator<HoodieRecord<T>> { | ||
|
|
||
| protected ClosableIterator<HoodieRecord<T>> skeletonIterator; | ||
| protected ClosableIterator<HoodieRecord<T>> dataFileIterator; | ||
| private final Option<String[]> partitionFields; | ||
| private final Object[] partitionValues; | ||
|
|
||
| protected Schema schema; | ||
|
|
||
| public HoodieBootstrapRecordIterator(ClosableIterator<HoodieRecord<T>> skeletonIterator, | ||
| ClosableIterator<HoodieRecord<T>> dataFileIterator, | ||
| Schema schema, | ||
| Option<String[]> partitionFields, | ||
| Object[] partitionValues) { | ||
| this.skeletonIterator = skeletonIterator; | ||
| this.dataFileIterator = dataFileIterator; | ||
| this.schema = schema; | ||
| this.partitionFields = partitionFields; | ||
| this.partitionValues = partitionValues; | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public boolean hasNext() { | ||
| checkState(skeletonIterator.hasNext() == dataFileIterator.hasNext()); | ||
| return skeletonIterator.hasNext(); | ||
| } | ||
|
|
||
| @Override | ||
| public HoodieRecord<T> next() { | ||
| HoodieRecord<T> dataRecord = dataFileIterator.next(); | ||
| HoodieRecord<T> skeletonRecord = skeletonIterator.next(); | ||
| HoodieRecord<T> ret = dataRecord.prependMetaFields(schema, schema, | ||
| new MetadataValues().setCommitTime(skeletonRecord.getRecordKey(schema, HoodieRecord.COMMIT_TIME_METADATA_FIELD)) | ||
| .setCommitSeqno(skeletonRecord.getRecordKey(schema, HoodieRecord.COMMIT_SEQNO_METADATA_FIELD)) | ||
| .setRecordKey(skeletonRecord.getRecordKey(schema, HoodieRecord.RECORD_KEY_METADATA_FIELD)) | ||
| .setPartitionPath(skeletonRecord.getRecordKey(schema, HoodieRecord.PARTITION_PATH_METADATA_FIELD)) | ||
| .setFileName(skeletonRecord.getRecordKey(schema, HoodieRecord.FILENAME_METADATA_FIELD)), null); | ||
| if (partitionFields.isPresent()) { | ||
| for (int i = 0; i < partitionValues.length; i++) { | ||
| int position = schema.getField(partitionFields.get()[i]).pos(); | ||
| setPartitionPathField(position, partitionValues[i], ret.getData()); | ||
| } | ||
| } | ||
| return ret; | ||
| } | ||
|
|
||
| protected abstract void setPartitionPathField(int position, Object fieldValue, T row); | ||
| } |
Oops, something went wrong.