Skip to content

[lake/paimon] Support custom Paimon path #3523

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.

Sign up for GitHub

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

Open
wzx140 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[lake/paimon] Support custom Paimon path #3523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/utils/PaimonConversions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public class PaimonConversions {
static {
PAIMON_UNSETTABLE_OPTIONS.add(CoreOptions.BUCKET.key());
PAIMON_UNSETTABLE_OPTIONS.add(CoreOptions.BUCKET_KEY.key());
PAIMON_UNSETTABLE_OPTIONS.add(CoreOptions.PATH.key());
PAIMON_UNSETTABLE_OPTIONS.add(PARTITION_GENERATE_LEGACY_NAME_OPTION_KEY);
}

Expand Down
64 changes: 64 additions & 0 deletions ...-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/LakeEnabledTableCreateITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.fluss.config.ConfigOptions;
import org.apache.fluss.config.Configuration;
import org.apache.fluss.exception.FlussRuntimeException;
import org.apache.fluss.exception.InvalidAlterTableException;
import org.apache.fluss.exception.InvalidConfigException;
import org.apache.fluss.exception.InvalidTableException;
import org.apache.fluss.exception.LakeTableAlreadyExistException;
Expand Down Expand Up @@ -390,6 +391,8 @@ void testCreateLakeEnabledTableWithAllTypes() throws Exception {

@Test
void testCreateLakeEnableTableWithUnsettablePaimonOptions() {
assertThat(PAIMON_UNSETTABLE_OPTIONS).doesNotContain(CoreOptions.PATH.key());

Map<String, String> customProperties = new HashMap<>();

for (String key : PAIMON_UNSETTABLE_OPTIONS) {
Expand Down Expand Up @@ -418,6 +421,67 @@ void testCreateLakeEnableTableWithUnsettablePaimonOptions() {
}
}

@Test
void testAlterPaimonPathOnlyWhenLakeDisabled() throws Exception {
TableDescriptor lakeDisabledTable =
TableDescriptor.builder()
.schema(
Schema.newBuilder()
.column("c1", DataTypes.INT())
.column("c2", DataTypes.STRING())
.build())
.property(ConfigOptions.TABLE_DATALAKE_ENABLED, false)
.distributedBy(BUCKET_NUM, "c1", "c2")
.build();
TablePath lakeDisabledTablePath = TablePath.of(DATABASE, "alter_paimon_path_disabled");
admin.createTable(lakeDisabledTablePath, lakeDisabledTable, false).get();

String customPaimonPath =
Files.createTempDirectory("alter-paimon-path-disabled").toUri().toString();
admin.alterTable(
lakeDisabledTablePath,
Collections.singletonList(TableChange.set("paimon.path", customPaimonPath)),
false)
.get();
assertThat(
admin.getTableInfo(lakeDisabledTablePath)
.get()
.toTableDescriptor()
.getCustomProperties())
.containsEntry("paimon.path", customPaimonPath);

TableDescriptor lakeEnabledTable =
TableDescriptor.builder()
.schema(
Schema.newBuilder()
.column("c1", DataTypes.INT())
.column("c2", DataTypes.STRING())
.build())
.property(ConfigOptions.TABLE_DATALAKE_ENABLED, true)
.distributedBy(BUCKET_NUM, "c1", "c2")
.build();
TablePath lakeEnabledTablePath = TablePath.of(DATABASE, "alter_paimon_path_enabled");
admin.createTable(lakeEnabledTablePath, lakeEnabledTable, false).get();

assertThatThrownBy(
() ->
admin.alterTable(
lakeEnabledTablePath,
Collections.singletonList(
TableChange.set(
"paimon.path",
Files.createTempDirectory(
"alter-paimon-path-enabled")
.toUri()
.toString())),
false)
.get())
.cause()
.isInstanceOf(InvalidAlterTableException.class)
.hasMessageContaining(
"'paimon.path' can only be altered when datalake is disabled");
}

@Test
void testCreateLakeEnableTableWithExistLakeTable() throws Exception {
Map<String, String> customProperties = new HashMap<>();
Expand Down
5 changes: 4 additions & 1 deletion fluss-server/src/main/java/org/apache/fluss/server/coordinator/MetadataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,10 @@ public void alterTableProperties(
TableInfo tableInfo = tableReg.toTableInfo(tablePath, schemaInfo);

// validate the changes
validateAlterTableProperties(tableInfo, tablePropertyChanges.tableKeysToChange());
validateAlterTableProperties(
tableInfo,
tablePropertyChanges.tableKeysToChange(),
tablePropertyChanges.customKeysToChange());

TableDescriptor tableDescriptor = tableInfo.toTableDescriptor();
TableDescriptor newDescriptor =
Expand Down
14 changes: 14 additions & 0 deletions fluss-server/src/main/java/org/apache/fluss/server/utils/TableDescriptorValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
/** Validator of {@link TableDescriptor}. */
public class TableDescriptorValidation {

private static final String PAIMON_PATH_KEY = "paimon.path";

private static final Set<String> SYSTEM_COLUMNS =
Collections.unmodifiableSet(
new LinkedHashSet<>(
Expand Down Expand Up @@ -155,6 +157,11 @@ private static void checkTableLakeFormatMatchesCluster(

public static void validateAlterTableProperties(
TableInfo currentTable, Set<String> tableKeysToChange) {
validateAlterTableProperties(currentTable, tableKeysToChange, Collections.emptySet());
}

public static void validateAlterTableProperties(
TableInfo currentTable, Set<String> tableKeysToChange, Set<String> customKeysToChange) {
TableConfig currentConfig = currentTable.getTableConfig();

List<String> unsupportedKeys =
Expand All @@ -179,6 +186,13 @@ public static void validateAlterTableProperties(
ConfigOptions.TABLE_KV_STANDBY_REPLICA_ENABLED.key()));
}

if (customKeysToChange.contains(PAIMON_PATH_KEY) && currentConfig.isDataLakeEnabled()) {
throw new InvalidAlterTableException(
String.format(
"'%s' can only be altered when datalake is disabled.",
PAIMON_PATH_KEY));
}

if (!currentConfig.getDataLakeFormat().isPresent()) {
List<String> datalakeKeys =
tableKeysToChange.stream()
Expand Down