Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[HUDI-4966] Add a partition extractor to handle partition values with slashes #6851

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -0,0 +1,40 @@
/*
* 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.hive;

import org.apache.hudi.sync.common.model.PartitionValueExtractor;

import java.util.Collections;
import java.util.List;

/**
* Extractor for a partition path from a single column.
* <p>
* This implementation extracts the partition value from the partition path as a single part
* even if the relative partition path contains slashes, e.g., the `TimestampBasedKeyGenerator`
* transforms the timestamp column into the partition path in the format of "yyyyMM/dd/HH".
* The slash (`/`) is replaced with dash (`-`), e.g., `202210/01/20` -> `202210-01-20`.
*/
public class SinglePartPartitionValueExtractor implements PartitionValueExtractor {
@Override
public List<String> extractPartitionValuesInPath(String partitionPath) {
return Collections.singletonList(partitionPath.replace('/', '-'));
}
}
Expand Up @@ -18,8 +18,12 @@

package org.apache.hudi.hive;

import org.apache.hudi.sync.common.model.PartitionValueExtractor;

import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand All @@ -46,4 +50,12 @@ public void testHiveStylePartition() {
IllegalArgumentException.class,
() -> hiveStylePartition.extractPartitionValuesInPath("2021/04/02"));
}

@Test
public void testSinglePartPartition() {
PartitionValueExtractor extractor = new SinglePartPartitionValueExtractor();
assertEquals(
Collections.singletonList("202210-01-20"),
extractor.extractPartitionValuesInPath("202210/01/20"));
}
}
Expand Up @@ -104,10 +104,13 @@ public class HoodieSyncConfig extends HoodieConfig {
String partitionFields = partitionFieldsOpt.get();
if (StringUtils.nonEmpty(partitionFields)) {
int numOfPartFields = partitionFields.split(",").length;
if (numOfPartFields == 1
&& cfg.contains(HIVE_STYLE_PARTITIONING_ENABLE)
&& cfg.getString(HIVE_STYLE_PARTITIONING_ENABLE).equals("true")) {
return Option.of("org.apache.hudi.hive.HiveStylePartitionValueExtractor");
if (numOfPartFields == 1) {
if (cfg.contains(HIVE_STYLE_PARTITIONING_ENABLE)
&& cfg.getString(HIVE_STYLE_PARTITIONING_ENABLE).equals("true")) {
return Option.of("org.apache.hudi.hive.HiveStylePartitionValueExtractor");
} else {
return Option.of("org.apache.hudi.hive.SinglePartPartitionValueExtractor");
}
} else {
return Option.of("org.apache.hudi.hive.MultiPartKeysValueExtractor");
}
Expand Down
Expand Up @@ -104,7 +104,7 @@ void testInferPartitionFields() {
}

@Test
void testInferPartitonExtractorClass() {
void testInferPartitionExtractorClass() {
Properties props0 = new Properties();
HoodieSyncConfig config0 = new HoodieSyncConfig(props0, new Configuration());
assertEquals("org.apache.hudi.hive.MultiPartKeysValueExtractor",
Expand Down Expand Up @@ -140,6 +140,13 @@ void testInferPartitonExtractorClass() {
HoodieSyncConfig config4 = new HoodieSyncConfig(props4, new Configuration());
assertEquals("org.apache.hudi.hive.HiveStylePartitionValueExtractor",
config4.getStringOrDefault(META_SYNC_PARTITION_EXTRACTOR_CLASS));

Properties props5 = new Properties();
props5.setProperty(HoodieTableConfig.PARTITION_FIELDS.key(), "foo");
props5.setProperty(HoodieTableConfig.HIVE_STYLE_PARTITIONING_ENABLE.key(), "false");
HoodieSyncConfig config5 = new HoodieSyncConfig(props5, new Configuration());
assertEquals("org.apache.hudi.hive.SinglePartPartitionValueExtractor",
config5.getStringOrDefault(META_SYNC_PARTITION_EXTRACTOR_CLASS));
}

@Test
Expand Down