Skip to content

[core] Do not use Collections.unmodifiableMap to avoid stack overflow #4883

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

Merged
JingsongLi merged 1 commit into from
Jan 12, 2025
Merged

[core] Do not use Collections.unmodifiableMap to avoid stack overflow #4883

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
5 changes: 2 additions & 3 deletions paimon-core/src/main/java/org/apache/paimon/metrics/MetricGroupImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

Expand Down Expand Up @@ -51,7 +50,7 @@ public String getGroupName() {

@Override
public Map<String, String> getAllVariables() {
return Collections.unmodifiableMap(variables);
return variables;
}

@Override
Expand Down Expand Up @@ -117,7 +116,7 @@ private Metric addMetric(String metricName, Metric metric) {

@Override
public Map<String, Metric> getMetrics() {
return Collections.unmodifiableMap(metrics);
return metrics;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion paimon-core/src/main/java/org/apache/paimon/schema/TableSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public TableSchema(
this.highestFieldId = highestFieldId;
this.partitionKeys = partitionKeys;
this.primaryKeys = primaryKeys;
this.options = Collections.unmodifiableMap(options);
this.options = options;
this.comment = comment;
this.timeMillis = timeMillis;

Expand Down
36 changes: 27 additions & 9 deletions paimon-core/src/test/java/org/apache/paimon/schema/TableSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import java.util.List;
import java.util.Map;

import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static org.apache.paimon.CoreOptions.AGG_FUNCTION;
import static org.apache.paimon.CoreOptions.BUCKET;
import static org.apache.paimon.CoreOptions.FIELDS_PREFIX;
Expand All @@ -43,15 +45,32 @@
/** Test for {@link TableSchema}. */
public class TableSchemaTest {

@Test
public void testTableSchemaCopy() {
Map<String, String> options = new HashMap<>();
options.put("my-key", "my-value");
TableSchema schema =
new TableSchema(
1,
singletonList(new DataField(0, "f0", DataTypes.INT())),
10,
emptyList(),
emptyList(),
options,
"");
schema = schema.copy(schema.options());
assertThat(schema.options()).isSameAs(options);
}

@Test
public void testCrossPartition() {
List<DataField> fields =
Arrays.asList(
new DataField(0, "f0", DataTypes.INT()),
new DataField(1, "f1", DataTypes.INT()),
new DataField(2, "f2", DataTypes.INT()));
List<String> partitionKeys = Collections.singletonList("f0");
List<String> primaryKeys = Collections.singletonList("f1");
List<String> partitionKeys = singletonList("f0");
List<String> primaryKeys = singletonList("f1");
Map<String, String> options = new HashMap<>();

TableSchema schema =
Expand Down Expand Up @@ -130,8 +149,8 @@ public void testSequenceField() {
new DataField(1, "f1", DataTypes.INT()),
new DataField(2, "f2", DataTypes.INT()),
new DataField(3, "f3", DataTypes.INT()));
List<String> partitionKeys = Collections.singletonList("f0");
List<String> primaryKeys = Collections.singletonList("f1");
List<String> partitionKeys = singletonList("f0");
List<String> primaryKeys = singletonList("f1");
Map<String, String> options = new HashMap<>();

TableSchema schema =
Expand Down Expand Up @@ -168,7 +187,7 @@ public void testFieldsPrefix() {
new DataField(0, "f0", DataTypes.INT()),
new DataField(1, "f1", DataTypes.INT()),
new DataField(2, "f2", DataTypes.INT()));
List<String> primaryKeys = Collections.singletonList("f0");
List<String> primaryKeys = singletonList("f0");
Map<String, String> options = new HashMap<>();
options.put(MERGE_ENGINE.key(), CoreOptions.MergeEngine.AGGREGATE.toString());
options.put(FIELDS_PREFIX + ".f1." + AGG_FUNCTION, "max");
Expand All @@ -186,8 +205,8 @@ public void testBucket() {
new DataField(0, "f0", DataTypes.INT()),
new DataField(1, "f1", DataTypes.INT()),
new DataField(2, "f2", DataTypes.INT()));
List<String> partitionKeys = Collections.singletonList("f0");
List<String> primaryKeys = Collections.singletonList("f1");
List<String> partitionKeys = singletonList("f0");
List<String> primaryKeys = singletonList("f1");
Map<String, String> options = new HashMap<>();

TableSchema schema =
Expand All @@ -200,7 +219,6 @@ public void testBucket() {

static RowType newRowType(boolean isNullable, int fieldId) {
return new RowType(
isNullable,
Collections.singletonList(new DataField(fieldId, "nestedField", DataTypes.INT())));
isNullable, singletonList(new DataField(fieldId, "nestedField", DataTypes.INT())));
}
}
3 changes: 1 addition & 2 deletions ...k/paimon-flink-common/src/main/java/org/apache/paimon/flink/metrics/FlinkMetricGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.apache.paimon.metrics.Metric;
import org.apache.paimon.metrics.MetricGroup;

import java.util.Collections;
import java.util.Map;

/**
Expand Down Expand Up @@ -75,7 +74,7 @@ public Histogram histogram(String name, int windowSize) {

@Override
public Map<String, String> getAllVariables() {
return Collections.unmodifiableMap(variables);
return variables;
}

@Override
Expand Down
11 changes: 4 additions & 7 deletions paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import org.apache.paimon.view.ViewImpl;

import org.apache.paimon.shade.guava30.com.google.common.collect.Lists;
import org.apache.paimon.shade.guava30.com.google.common.collect.Maps;

import org.apache.flink.table.hive.LegacyHiveClasses;
import org.apache.hadoop.conf.Configuration;
Expand Down Expand Up @@ -588,20 +587,18 @@ protected void dropDatabaseImpl(String name) {
protected void alterDatabaseImpl(String name, List<PropertyChange> changes) {
try {
Database database = clients.run(client -> client.getDatabase(name));
Map<String, String> parameter = Maps.newHashMap();
parameter.putAll(database.getParameters());
Map<String, String> parameter = new HashMap<>(database.getParameters());
Pair<Map<String, String>, Set<String>> setPropertiesToRemoveKeys =
PropertyChange.getSetPropertiesToRemoveKeys(changes);
Map<String, String> setProperties = setPropertiesToRemoveKeys.getLeft();
Set<String> removeKeys = setPropertiesToRemoveKeys.getRight();
if (setProperties.size() > 0) {
if (!setProperties.isEmpty()) {
parameter.putAll(setProperties);
}
if (removeKeys.size() > 0) {
if (!removeKeys.isEmpty()) {
parameter.keySet().removeAll(removeKeys);
}
Map<String, String> newProperties = Collections.unmodifiableMap(parameter);
Database alterDatabase = convertToHiveDatabase(name, newProperties);
Database alterDatabase = convertToHiveDatabase(name, parameter);
clients.execute(client -> client.alterDatabase(name, alterDatabase));
} catch (TException e) {
throw new RuntimeException("Failed to alter database " + name, e);
Expand Down
Loading