luoyuxia commented on code in PR #1372:
URL: https://github.com/apache/fluss/pull/1372#discussion_r2234797010
##########
fluss-lake/fluss-lake-iceberg/pom.xml:
##########
@@ -32,13 +32,16 @@
<packaging>jar</packaging>
+ <properties>
+ <iceberg.version>1.4.3</iceberg.version>
Review Comment:
We don't need it since we already have it in parent pom
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
+ configuration.toMap().entrySet().stream()
+ .filter(e ->
e.getKey().startsWith(ICEBERG_CATALOG_PREFIX))
+ .collect(
+ Collectors.toMap(
+ e ->
e.getKey().substring(ICEBERG_CATALOG_PREFIX.length()),
+ Map.Entry::getValue));
+
+ String catalogType = icebergProps.get("type");
+ if (catalogType == null) {
+ throw new IllegalArgumentException(
+ "Missing required Iceberg catalog type. Set
'iceberg.catalog.type' in your configuration (e.g., 'hive', 'hadoop', or
'rest').");
+ }
+ String catalogName = icebergProps.getOrDefault("name",
"fluss-iceberg-catalog");
+
+ this.icebergCatalog =
+ org.apache.iceberg.CatalogUtil.loadCatalog(
+ catalogType,
+ catalogName,
+ icebergProps,
+ null // Optional: pass Hadoop configuration if
available
+ );
+ }
+
+ @Override
+ public void createTable(TablePath tablePath, TableDescriptor
tableDescriptor)
+ throws TableAlreadyExistException {
+ if (!tableDescriptor.hasPrimaryKey()) {
+ throw new UnsupportedOperationException(
+ "Only primary key tables are supported currently.");
+ }
+
+ TableIdentifier icebergId = toIcebergIdentifier(tablePath);
+ Schema icebergSchema = toIcebergSchema(tableDescriptor);
+ PartitionSpec partitionSpec = createPartitionSpec(tableDescriptor,
icebergSchema);
+
+ Map<String, String> icebergProperties = new HashMap<>();
+
+ // MOR table properties
+ icebergProperties.put("write.delete.mode", "merge-on-read");
+ icebergProperties.put("write.update.mode", "merge-on-read");
+ icebergProperties.put("write.merge.mode", "merge-on-read");
+
+ tableDescriptor
+ .getProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+ tableDescriptor
+ .getCustomProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+
+ createDatabase(tablePath.getDatabaseName());
+
+ try {
+ createTable(icebergId, icebergSchema, partitionSpec,
icebergProperties);
+ } catch (org.apache.iceberg.exceptions.AlreadyExistsException e) {
Review Comment:
nit: simplify to `AlreadyExistsException`. import
`org.apache.iceberg.exceptions.AlreadyExistsException` in header.
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
+ configuration.toMap().entrySet().stream()
+ .filter(e ->
e.getKey().startsWith(ICEBERG_CATALOG_PREFIX))
+ .collect(
+ Collectors.toMap(
+ e ->
e.getKey().substring(ICEBERG_CATALOG_PREFIX.length()),
+ Map.Entry::getValue));
+
+ String catalogType = icebergProps.get("type");
+ if (catalogType == null) {
+ throw new IllegalArgumentException(
+ "Missing required Iceberg catalog type. Set
'iceberg.catalog.type' in your configuration (e.g., 'hive', 'hadoop', or
'rest').");
+ }
+ String catalogName = icebergProps.getOrDefault("name",
"fluss-iceberg-catalog");
+
+ this.icebergCatalog =
+ org.apache.iceberg.CatalogUtil.loadCatalog(
+ catalogType,
+ catalogName,
+ icebergProps,
+ null // Optional: pass Hadoop configuration if
available
+ );
+ }
+
+ @Override
+ public void createTable(TablePath tablePath, TableDescriptor
tableDescriptor)
+ throws TableAlreadyExistException {
+ if (!tableDescriptor.hasPrimaryKey()) {
+ throw new UnsupportedOperationException(
+ "Only primary key tables are supported currently.");
+ }
+
+ TableIdentifier icebergId = toIcebergIdentifier(tablePath);
+ Schema icebergSchema = toIcebergSchema(tableDescriptor);
+ PartitionSpec partitionSpec = createPartitionSpec(tableDescriptor,
icebergSchema);
+
+ Map<String, String> icebergProperties = new HashMap<>();
+
+ // MOR table properties
+ icebergProperties.put("write.delete.mode", "merge-on-read");
+ icebergProperties.put("write.update.mode", "merge-on-read");
+ icebergProperties.put("write.merge.mode", "merge-on-read");
+
+ tableDescriptor
+ .getProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+ tableDescriptor
+ .getCustomProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+
+ createDatabase(tablePath.getDatabaseName());
+
+ try {
+ createTable(icebergId, icebergSchema, partitionSpec,
icebergProperties);
+ } catch (org.apache.iceberg.exceptions.AlreadyExistsException e) {
+ throw new TableAlreadyExistException("Table " + tablePath + "
already exists.");
+ }
+ }
+
+ private void createTable(
+ TableIdentifier icebergId,
+ Schema icebergSchema,
+ PartitionSpec partitionSpec,
+ Map<String, String> icebergTableProperties)
+ throws org.apache.iceberg.exceptions.NoSuchNamespaceException,
+ org.apache.iceberg.exceptions.AlreadyExistsException {
+
+ icebergCatalog.createTable(icebergId, icebergSchema, partitionSpec,
icebergTableProperties);
+ }
+
+ private TableIdentifier toIcebergIdentifier(TablePath tablePath) {
+ return TableIdentifier.of(tablePath.getDatabaseName(),
tablePath.getTableName());
+ }
+
+ private Schema toIcebergSchema(TableDescriptor tableDescriptor) {
+ List<Types.NestedField> fields = new ArrayList<>();
+ int fieldId = 1;
+
+ for (com.alibaba.fluss.metadata.Schema.Column column :
+ tableDescriptor.getSchema().getColumns()) {
+ String colName = column.getName();
+ if (SYSTEM_COLUMNS.containsKey(colName)) {
+ throw new IllegalArgumentException(
+ "Column '" + colName + "' conflicts with a reserved
system column name.");
+ }
+ fields.add(
+ Types.NestedField.optional(
+ fieldId++, colName,
convertFlussToIcebergType(column.getDataType())));
+ }
+
+ fields.add(
+ Types.NestedField.optional(fieldId, BUCKET_COLUMN_NAME,
Types.IntegerType.get()));
+ fields.add(
+ Types.NestedField.optional(fieldId + 1, OFFSET_COLUMN_NAME,
Types.LongType.get()));
+ fields.add(
+ Types.NestedField.optional(
+ fieldId + 2, TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone()));
+
+ return new Schema(fields);
+ }
+
+ private Type convertFlussToIcebergType(DataType dataType) {
+ String typeRoot = dataType.getTypeRoot().name();
+
+ switch (typeRoot) {
+ case "INT":
+ return Types.IntegerType.get();
+ case "BIGINT":
+ return Types.LongType.get();
+ case "STRING":
+ return Types.StringType.get();
+ case "BOOLEAN":
+ return Types.BooleanType.get();
+ case "DOUBLE":
+ return Types.DoubleType.get();
+ case "FLOAT":
+ return Types.FloatType.get();
+ case "DATE":
+ return Types.DateType.get();
+ case "TIMESTAMP_WITH_LOCAL_TIME_ZONE":
+ return Types.TimestampType.withZone();
+ case "TIMESTAMP_WITHOUT_TIME_ZONE":
+ return Types.TimestampType.withoutZone();
+ case "UUID":
+ throw new UnsupportedOperationException("Fluss does not
support UUID yet.");
+ case "TIMESTAMP_NANO":
Review Comment:
dito
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
+ configuration.toMap().entrySet().stream()
+ .filter(e ->
e.getKey().startsWith(ICEBERG_CATALOG_PREFIX))
+ .collect(
+ Collectors.toMap(
+ e ->
e.getKey().substring(ICEBERG_CATALOG_PREFIX.length()),
+ Map.Entry::getValue));
+
+ String catalogType = icebergProps.get("type");
+ if (catalogType == null) {
+ throw new IllegalArgumentException(
+ "Missing required Iceberg catalog type. Set
'iceberg.catalog.type' in your configuration (e.g., 'hive', 'hadoop', or
'rest').");
+ }
+ String catalogName = icebergProps.getOrDefault("name",
"fluss-iceberg-catalog");
+
+ this.icebergCatalog =
+ org.apache.iceberg.CatalogUtil.loadCatalog(
+ catalogType,
+ catalogName,
+ icebergProps,
+ null // Optional: pass Hadoop configuration if
available
+ );
+ }
+
+ @Override
+ public void createTable(TablePath tablePath, TableDescriptor
tableDescriptor)
+ throws TableAlreadyExistException {
+ if (!tableDescriptor.hasPrimaryKey()) {
+ throw new UnsupportedOperationException(
+ "Only primary key tables are supported currently.");
+ }
+
+ TableIdentifier icebergId = toIcebergIdentifier(tablePath);
+ Schema icebergSchema = toIcebergSchema(tableDescriptor);
+ PartitionSpec partitionSpec = createPartitionSpec(tableDescriptor,
icebergSchema);
+
+ Map<String, String> icebergProperties = new HashMap<>();
+
+ // MOR table properties
+ icebergProperties.put("write.delete.mode", "merge-on-read");
+ icebergProperties.put("write.update.mode", "merge-on-read");
+ icebergProperties.put("write.merge.mode", "merge-on-read");
+
+ tableDescriptor
+ .getProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+ tableDescriptor
+ .getCustomProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+
+ createDatabase(tablePath.getDatabaseName());
+
+ try {
+ createTable(icebergId, icebergSchema, partitionSpec,
icebergProperties);
+ } catch (org.apache.iceberg.exceptions.AlreadyExistsException e) {
+ throw new TableAlreadyExistException("Table " + tablePath + "
already exists.");
+ }
+ }
+
+ private void createTable(
+ TableIdentifier icebergId,
+ Schema icebergSchema,
+ PartitionSpec partitionSpec,
+ Map<String, String> icebergTableProperties)
+ throws org.apache.iceberg.exceptions.NoSuchNamespaceException,
+ org.apache.iceberg.exceptions.AlreadyExistsException {
+
+ icebergCatalog.createTable(icebergId, icebergSchema, partitionSpec,
icebergTableProperties);
+ }
+
+ private TableIdentifier toIcebergIdentifier(TablePath tablePath) {
+ return TableIdentifier.of(tablePath.getDatabaseName(),
tablePath.getTableName());
+ }
+
+ private Schema toIcebergSchema(TableDescriptor tableDescriptor) {
+ List<Types.NestedField> fields = new ArrayList<>();
+ int fieldId = 1;
+
+ for (com.alibaba.fluss.metadata.Schema.Column column :
+ tableDescriptor.getSchema().getColumns()) {
+ String colName = column.getName();
+ if (SYSTEM_COLUMNS.containsKey(colName)) {
+ throw new IllegalArgumentException(
+ "Column '" + colName + "' conflicts with a reserved
system column name.");
+ }
+ fields.add(
+ Types.NestedField.optional(
+ fieldId++, colName,
convertFlussToIcebergType(column.getDataType())));
+ }
+
+ fields.add(
+ Types.NestedField.optional(fieldId, BUCKET_COLUMN_NAME,
Types.IntegerType.get()));
+ fields.add(
+ Types.NestedField.optional(fieldId + 1, OFFSET_COLUMN_NAME,
Types.LongType.get()));
+ fields.add(
+ Types.NestedField.optional(
+ fieldId + 2, TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone()));
+
+ return new Schema(fields);
+ }
+
+ private Type convertFlussToIcebergType(DataType dataType) {
+ String typeRoot = dataType.getTypeRoot().name();
+
+ switch (typeRoot) {
+ case "INT":
+ return Types.IntegerType.get();
+ case "BIGINT":
+ return Types.LongType.get();
+ case "STRING":
+ return Types.StringType.get();
+ case "BOOLEAN":
+ return Types.BooleanType.get();
+ case "DOUBLE":
+ return Types.DoubleType.get();
+ case "FLOAT":
+ return Types.FloatType.get();
+ case "DATE":
+ return Types.DateType.get();
+ case "TIMESTAMP_WITH_LOCAL_TIME_ZONE":
+ return Types.TimestampType.withZone();
+ case "TIMESTAMP_WITHOUT_TIME_ZONE":
+ return Types.TimestampType.withoutZone();
+ case "UUID":
+ throw new UnsupportedOperationException("Fluss does not
support UUID yet.");
+ case "TIMESTAMP_NANO":
+ throw new UnsupportedOperationException(
+ "Iceberg does not support nanosecond precision
timestamps in 1.4.3");
+ default:
+ throw new UnsupportedOperationException("Unsupported Fluss
data type: " + typeRoot);
+ }
+ }
+
+ private PartitionSpec createPartitionSpec(
+ TableDescriptor tableDescriptor, Schema icebergSchema) {
+ // Only PK tables supported for now
+ List<String> bucketKeys = tableDescriptor.getBucketKeys();
+ int bucketCount =
+ tableDescriptor
+ .getTableDistribution()
+ .flatMap(td -> td.getBucketCount())
+ .orElseThrow(
+ () ->
+ new IllegalArgumentException(
+ "Bucket count (bucket.num)
must be set"));
+
+ if (bucketKeys.isEmpty()) {
+ throw new IllegalArgumentException(
+ "Bucket key must be set for primary key Iceberg tables");
+ }
+ if (bucketKeys.size() > 1) {
+ throw new UnsupportedOperationException(
+ "Only one bucket key is supported for Iceberg at the
moment");
+ }
+
+ PartitionSpec.Builder builder =
PartitionSpec.builderFor(icebergSchema);
Review Comment:
we need to consider Fluss partitioned table, as the FIP said, It'll be
consider as Iceberg identity partition transform
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
+ configuration.toMap().entrySet().stream()
+ .filter(e ->
e.getKey().startsWith(ICEBERG_CATALOG_PREFIX))
+ .collect(
+ Collectors.toMap(
+ e ->
e.getKey().substring(ICEBERG_CATALOG_PREFIX.length()),
+ Map.Entry::getValue));
+
+ String catalogType = icebergProps.get("type");
+ if (catalogType == null) {
+ throw new IllegalArgumentException(
+ "Missing required Iceberg catalog type. Set
'iceberg.catalog.type' in your configuration (e.g., 'hive', 'hadoop', or
'rest').");
+ }
+ String catalogName = icebergProps.getOrDefault("name",
"fluss-iceberg-catalog");
+
+ this.icebergCatalog =
+ org.apache.iceberg.CatalogUtil.loadCatalog(
+ catalogType,
+ catalogName,
+ icebergProps,
+ null // Optional: pass Hadoop configuration if
available
+ );
+ }
+
+ @Override
+ public void createTable(TablePath tablePath, TableDescriptor
tableDescriptor)
+ throws TableAlreadyExistException {
+ if (!tableDescriptor.hasPrimaryKey()) {
+ throw new UnsupportedOperationException(
+ "Only primary key tables are supported currently.");
+ }
+
+ TableIdentifier icebergId = toIcebergIdentifier(tablePath);
+ Schema icebergSchema = toIcebergSchema(tableDescriptor);
+ PartitionSpec partitionSpec = createPartitionSpec(tableDescriptor,
icebergSchema);
+
+ Map<String, String> icebergProperties = new HashMap<>();
+
+ // MOR table properties
+ icebergProperties.put("write.delete.mode", "merge-on-read");
+ icebergProperties.put("write.update.mode", "merge-on-read");
+ icebergProperties.put("write.merge.mode", "merge-on-read");
+
+ tableDescriptor
+ .getProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+ tableDescriptor
+ .getCustomProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+
+ createDatabase(tablePath.getDatabaseName());
Review Comment:
not always call method create database. Only when database not exist
exception is thrown when call `createTable`, do we need to create database.
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
Review Comment:
Remove the extract code since the framework have done it before create
`IcebergLakeCatalog`. See
https://github.com/apache/fluss/blob/b2f9c2f6769a28fe0b0a626770208cc877d3b743/fluss-server/src/main/java/com/alibaba/fluss/server/coordinator/CoordinatorServer.java#L258
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
+ configuration.toMap().entrySet().stream()
+ .filter(e ->
e.getKey().startsWith(ICEBERG_CATALOG_PREFIX))
+ .collect(
+ Collectors.toMap(
+ e ->
e.getKey().substring(ICEBERG_CATALOG_PREFIX.length()),
+ Map.Entry::getValue));
+
+ String catalogType = icebergProps.get("type");
+ if (catalogType == null) {
+ throw new IllegalArgumentException(
+ "Missing required Iceberg catalog type. Set
'iceberg.catalog.type' in your configuration (e.g., 'hive', 'hadoop', or
'rest').");
+ }
+ String catalogName = icebergProps.getOrDefault("name",
"fluss-iceberg-catalog");
+
+ this.icebergCatalog =
+ org.apache.iceberg.CatalogUtil.loadCatalog(
+ catalogType,
+ catalogName,
+ icebergProps,
+ null // Optional: pass Hadoop configuration if
available
+ );
+ }
+
+ @Override
+ public void createTable(TablePath tablePath, TableDescriptor
tableDescriptor)
+ throws TableAlreadyExistException {
+ if (!tableDescriptor.hasPrimaryKey()) {
+ throw new UnsupportedOperationException(
+ "Only primary key tables are supported currently.");
+ }
+
+ TableIdentifier icebergId = toIcebergIdentifier(tablePath);
+ Schema icebergSchema = toIcebergSchema(tableDescriptor);
+ PartitionSpec partitionSpec = createPartitionSpec(tableDescriptor,
icebergSchema);
+
+ Map<String, String> icebergProperties = new HashMap<>();
+
+ // MOR table properties
+ icebergProperties.put("write.delete.mode", "merge-on-read");
+ icebergProperties.put("write.update.mode", "merge-on-read");
+ icebergProperties.put("write.merge.mode", "merge-on-read");
+
+ tableDescriptor
+ .getProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+ tableDescriptor
+ .getCustomProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+
+ createDatabase(tablePath.getDatabaseName());
+
+ try {
+ createTable(icebergId, icebergSchema, partitionSpec,
icebergProperties);
+ } catch (org.apache.iceberg.exceptions.AlreadyExistsException e) {
+ throw new TableAlreadyExistException("Table " + tablePath + "
already exists.");
+ }
+ }
+
+ private void createTable(
+ TableIdentifier icebergId,
+ Schema icebergSchema,
+ PartitionSpec partitionSpec,
+ Map<String, String> icebergTableProperties)
+ throws org.apache.iceberg.exceptions.NoSuchNamespaceException,
+ org.apache.iceberg.exceptions.AlreadyExistsException {
+
+ icebergCatalog.createTable(icebergId, icebergSchema, partitionSpec,
icebergTableProperties);
+ }
+
+ private TableIdentifier toIcebergIdentifier(TablePath tablePath) {
+ return TableIdentifier.of(tablePath.getDatabaseName(),
tablePath.getTableName());
+ }
+
+ private Schema toIcebergSchema(TableDescriptor tableDescriptor) {
+ List<Types.NestedField> fields = new ArrayList<>();
+ int fieldId = 1;
+
+ for (com.alibaba.fluss.metadata.Schema.Column column :
+ tableDescriptor.getSchema().getColumns()) {
+ String colName = column.getName();
+ if (SYSTEM_COLUMNS.containsKey(colName)) {
+ throw new IllegalArgumentException(
+ "Column '" + colName + "' conflicts with a reserved
system column name.");
+ }
+ fields.add(
+ Types.NestedField.optional(
+ fieldId++, colName,
convertFlussToIcebergType(column.getDataType())));
+ }
+
+ fields.add(
Review Comment:
simplify to
```
for (Map.Entry<String, Type> systemColumn : SYSTEM_COLUMNS.entrySet()) {
fields.add(
Types.NestedField.optional(
fieldId++, systemColumn.getKey(),
systemColumn.getValue()));
}
```
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
+ configuration.toMap().entrySet().stream()
+ .filter(e ->
e.getKey().startsWith(ICEBERG_CATALOG_PREFIX))
+ .collect(
+ Collectors.toMap(
+ e ->
e.getKey().substring(ICEBERG_CATALOG_PREFIX.length()),
+ Map.Entry::getValue));
+
+ String catalogType = icebergProps.get("type");
+ if (catalogType == null) {
+ throw new IllegalArgumentException(
+ "Missing required Iceberg catalog type. Set
'iceberg.catalog.type' in your configuration (e.g., 'hive', 'hadoop', or
'rest').");
+ }
+ String catalogName = icebergProps.getOrDefault("name",
"fluss-iceberg-catalog");
+
+ this.icebergCatalog =
+ org.apache.iceberg.CatalogUtil.loadCatalog(
+ catalogType,
+ catalogName,
+ icebergProps,
+ null // Optional: pass Hadoop configuration if
available
+ );
+ }
+
+ @Override
+ public void createTable(TablePath tablePath, TableDescriptor
tableDescriptor)
+ throws TableAlreadyExistException {
+ if (!tableDescriptor.hasPrimaryKey()) {
+ throw new UnsupportedOperationException(
+ "Only primary key tables are supported currently.");
+ }
+
+ TableIdentifier icebergId = toIcebergIdentifier(tablePath);
+ Schema icebergSchema = toIcebergSchema(tableDescriptor);
+ PartitionSpec partitionSpec = createPartitionSpec(tableDescriptor,
icebergSchema);
+
+ Map<String, String> icebergProperties = new HashMap<>();
+
+ // MOR table properties
+ icebergProperties.put("write.delete.mode", "merge-on-read");
+ icebergProperties.put("write.update.mode", "merge-on-read");
+ icebergProperties.put("write.merge.mode", "merge-on-read");
+
+ tableDescriptor
+ .getProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+ tableDescriptor
+ .getCustomProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+
+ createDatabase(tablePath.getDatabaseName());
+
+ try {
+ createTable(icebergId, icebergSchema, partitionSpec,
icebergProperties);
+ } catch (org.apache.iceberg.exceptions.AlreadyExistsException e) {
+ throw new TableAlreadyExistException("Table " + tablePath + "
already exists.");
+ }
+ }
+
+ private void createTable(
+ TableIdentifier icebergId,
+ Schema icebergSchema,
+ PartitionSpec partitionSpec,
+ Map<String, String> icebergTableProperties)
+ throws org.apache.iceberg.exceptions.NoSuchNamespaceException,
+ org.apache.iceberg.exceptions.AlreadyExistsException {
+
+ icebergCatalog.createTable(icebergId, icebergSchema, partitionSpec,
icebergTableProperties);
+ }
+
+ private TableIdentifier toIcebergIdentifier(TablePath tablePath) {
+ return TableIdentifier.of(tablePath.getDatabaseName(),
tablePath.getTableName());
+ }
+
+ private Schema toIcebergSchema(TableDescriptor tableDescriptor) {
+ List<Types.NestedField> fields = new ArrayList<>();
+ int fieldId = 1;
+
+ for (com.alibaba.fluss.metadata.Schema.Column column :
+ tableDescriptor.getSchema().getColumns()) {
+ String colName = column.getName();
+ if (SYSTEM_COLUMNS.containsKey(colName)) {
+ throw new IllegalArgumentException(
+ "Column '" + colName + "' conflicts with a reserved
system column name.");
+ }
+ fields.add(
+ Types.NestedField.optional(
+ fieldId++, colName,
convertFlussToIcebergType(column.getDataType())));
+ }
+
+ fields.add(
+ Types.NestedField.optional(fieldId, BUCKET_COLUMN_NAME,
Types.IntegerType.get()));
+ fields.add(
+ Types.NestedField.optional(fieldId + 1, OFFSET_COLUMN_NAME,
Types.LongType.get()));
+ fields.add(
+ Types.NestedField.optional(
+ fieldId + 2, TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone()));
+
+ return new Schema(fields);
+ }
+
+ private Type convertFlussToIcebergType(DataType dataType) {
+ String typeRoot = dataType.getTypeRoot().name();
+
+ switch (typeRoot) {
Review Comment:
please not to use string, it's error-prone. You can use that:
```
switch (dataType.getTypeRoot()) {
case INTEGER:
return Types.IntegerType.get();
case xxx:
}
```
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
+ configuration.toMap().entrySet().stream()
+ .filter(e ->
e.getKey().startsWith(ICEBERG_CATALOG_PREFIX))
+ .collect(
+ Collectors.toMap(
+ e ->
e.getKey().substring(ICEBERG_CATALOG_PREFIX.length()),
+ Map.Entry::getValue));
+
+ String catalogType = icebergProps.get("type");
+ if (catalogType == null) {
+ throw new IllegalArgumentException(
+ "Missing required Iceberg catalog type. Set
'iceberg.catalog.type' in your configuration (e.g., 'hive', 'hadoop', or
'rest').");
+ }
+ String catalogName = icebergProps.getOrDefault("name",
"fluss-iceberg-catalog");
+
+ this.icebergCatalog =
+ org.apache.iceberg.CatalogUtil.loadCatalog(
+ catalogType,
+ catalogName,
+ icebergProps,
+ null // Optional: pass Hadoop configuration if
available
+ );
+ }
+
+ @Override
+ public void createTable(TablePath tablePath, TableDescriptor
tableDescriptor)
+ throws TableAlreadyExistException {
+ if (!tableDescriptor.hasPrimaryKey()) {
+ throw new UnsupportedOperationException(
+ "Only primary key tables are supported currently.");
+ }
+
+ TableIdentifier icebergId = toIcebergIdentifier(tablePath);
+ Schema icebergSchema = toIcebergSchema(tableDescriptor);
+ PartitionSpec partitionSpec = createPartitionSpec(tableDescriptor,
icebergSchema);
+
+ Map<String, String> icebergProperties = new HashMap<>();
+
+ // MOR table properties
+ icebergProperties.put("write.delete.mode", "merge-on-read");
+ icebergProperties.put("write.update.mode", "merge-on-read");
+ icebergProperties.put("write.merge.mode", "merge-on-read");
+
+ tableDescriptor
+ .getProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+ tableDescriptor
+ .getCustomProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+
+ createDatabase(tablePath.getDatabaseName());
+
+ try {
+ createTable(icebergId, icebergSchema, partitionSpec,
icebergProperties);
+ } catch (org.apache.iceberg.exceptions.AlreadyExistsException e) {
+ throw new TableAlreadyExistException("Table " + tablePath + "
already exists.");
+ }
+ }
+
+ private void createTable(
+ TableIdentifier icebergId,
+ Schema icebergSchema,
+ PartitionSpec partitionSpec,
+ Map<String, String> icebergTableProperties)
+ throws org.apache.iceberg.exceptions.NoSuchNamespaceException,
+ org.apache.iceberg.exceptions.AlreadyExistsException {
+
+ icebergCatalog.createTable(icebergId, icebergSchema, partitionSpec,
icebergTableProperties);
+ }
+
+ private TableIdentifier toIcebergIdentifier(TablePath tablePath) {
+ return TableIdentifier.of(tablePath.getDatabaseName(),
tablePath.getTableName());
+ }
+
+ private Schema toIcebergSchema(TableDescriptor tableDescriptor) {
+ List<Types.NestedField> fields = new ArrayList<>();
+ int fieldId = 1;
+
+ for (com.alibaba.fluss.metadata.Schema.Column column :
+ tableDescriptor.getSchema().getColumns()) {
+ String colName = column.getName();
+ if (SYSTEM_COLUMNS.containsKey(colName)) {
+ throw new IllegalArgumentException(
+ "Column '" + colName + "' conflicts with a reserved
system column name.");
+ }
+ fields.add(
+ Types.NestedField.optional(
+ fieldId++, colName,
convertFlussToIcebergType(column.getDataType())));
+ }
+
+ fields.add(
+ Types.NestedField.optional(fieldId, BUCKET_COLUMN_NAME,
Types.IntegerType.get()));
+ fields.add(
+ Types.NestedField.optional(fieldId + 1, OFFSET_COLUMN_NAME,
Types.LongType.get()));
+ fields.add(
+ Types.NestedField.optional(
+ fieldId + 2, TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone()));
+
+ return new Schema(fields);
+ }
+
+ private Type convertFlussToIcebergType(DataType dataType) {
+ String typeRoot = dataType.getTypeRoot().name();
+
+ switch (typeRoot) {
+ case "INT":
+ return Types.IntegerType.get();
+ case "BIGINT":
+ return Types.LongType.get();
+ case "STRING":
+ return Types.StringType.get();
+ case "BOOLEAN":
+ return Types.BooleanType.get();
+ case "DOUBLE":
+ return Types.DoubleType.get();
+ case "FLOAT":
+ return Types.FloatType.get();
+ case "DATE":
+ return Types.DateType.get();
+ case "TIMESTAMP_WITH_LOCAL_TIME_ZONE":
+ return Types.TimestampType.withZone();
+ case "TIMESTAMP_WITHOUT_TIME_ZONE":
+ return Types.TimestampType.withoutZone();
+ case "UUID":
Review Comment:
`UUID` is not fluss type, we don't need to consider it.
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
+ configuration.toMap().entrySet().stream()
+ .filter(e ->
e.getKey().startsWith(ICEBERG_CATALOG_PREFIX))
+ .collect(
+ Collectors.toMap(
+ e ->
e.getKey().substring(ICEBERG_CATALOG_PREFIX.length()),
+ Map.Entry::getValue));
+
+ String catalogType = icebergProps.get("type");
+ if (catalogType == null) {
+ throw new IllegalArgumentException(
+ "Missing required Iceberg catalog type. Set
'iceberg.catalog.type' in your configuration (e.g., 'hive', 'hadoop', or
'rest').");
+ }
+ String catalogName = icebergProps.getOrDefault("name",
"fluss-iceberg-catalog");
+
+ this.icebergCatalog =
+ org.apache.iceberg.CatalogUtil.loadCatalog(
+ catalogType,
+ catalogName,
+ icebergProps,
+ null // Optional: pass Hadoop configuration if
available
+ );
+ }
+
+ @Override
+ public void createTable(TablePath tablePath, TableDescriptor
tableDescriptor)
+ throws TableAlreadyExistException {
+ if (!tableDescriptor.hasPrimaryKey()) {
+ throw new UnsupportedOperationException(
+ "Only primary key tables are supported currently.");
+ }
+
+ TableIdentifier icebergId = toIcebergIdentifier(tablePath);
+ Schema icebergSchema = toIcebergSchema(tableDescriptor);
+ PartitionSpec partitionSpec = createPartitionSpec(tableDescriptor,
icebergSchema);
+
+ Map<String, String> icebergProperties = new HashMap<>();
+
+ // MOR table properties
+ icebergProperties.put("write.delete.mode", "merge-on-read");
+ icebergProperties.put("write.update.mode", "merge-on-read");
+ icebergProperties.put("write.merge.mode", "merge-on-read");
+
+ tableDescriptor
+ .getProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+ tableDescriptor
+ .getCustomProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+
+ createDatabase(tablePath.getDatabaseName());
+
+ try {
+ createTable(icebergId, icebergSchema, partitionSpec,
icebergProperties);
+ } catch (org.apache.iceberg.exceptions.AlreadyExistsException e) {
+ throw new TableAlreadyExistException("Table " + tablePath + "
already exists.");
+ }
+ }
+
+ private void createTable(
+ TableIdentifier icebergId,
+ Schema icebergSchema,
+ PartitionSpec partitionSpec,
+ Map<String, String> icebergTableProperties)
+ throws org.apache.iceberg.exceptions.NoSuchNamespaceException,
Review Comment:
nit: simplify to
`NoSuchNamespaceException`
`AlreadyExistsException`
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
+ configuration.toMap().entrySet().stream()
+ .filter(e ->
e.getKey().startsWith(ICEBERG_CATALOG_PREFIX))
+ .collect(
+ Collectors.toMap(
+ e ->
e.getKey().substring(ICEBERG_CATALOG_PREFIX.length()),
+ Map.Entry::getValue));
+
+ String catalogType = icebergProps.get("type");
+ if (catalogType == null) {
+ throw new IllegalArgumentException(
+ "Missing required Iceberg catalog type. Set
'iceberg.catalog.type' in your configuration (e.g., 'hive', 'hadoop', or
'rest').");
+ }
+ String catalogName = icebergProps.getOrDefault("name",
"fluss-iceberg-catalog");
+
+ this.icebergCatalog =
+ org.apache.iceberg.CatalogUtil.loadCatalog(
+ catalogType,
+ catalogName,
+ icebergProps,
+ null // Optional: pass Hadoop configuration if
available
+ );
+ }
+
+ @Override
+ public void createTable(TablePath tablePath, TableDescriptor
tableDescriptor)
+ throws TableAlreadyExistException {
+ if (!tableDescriptor.hasPrimaryKey()) {
+ throw new UnsupportedOperationException(
+ "Only primary key tables are supported currently.");
+ }
+
+ TableIdentifier icebergId = toIcebergIdentifier(tablePath);
+ Schema icebergSchema = toIcebergSchema(tableDescriptor);
+ PartitionSpec partitionSpec = createPartitionSpec(tableDescriptor,
icebergSchema);
+
+ Map<String, String> icebergProperties = new HashMap<>();
+
+ // MOR table properties
+ icebergProperties.put("write.delete.mode", "merge-on-read");
+ icebergProperties.put("write.update.mode", "merge-on-read");
+ icebergProperties.put("write.merge.mode", "merge-on-read");
+
+ tableDescriptor
+ .getProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+ tableDescriptor
+ .getCustomProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+
+ createDatabase(tablePath.getDatabaseName());
+
+ try {
+ createTable(icebergId, icebergSchema, partitionSpec,
icebergProperties);
+ } catch (org.apache.iceberg.exceptions.AlreadyExistsException e) {
+ throw new TableAlreadyExistException("Table " + tablePath + "
already exists.");
+ }
+ }
+
+ private void createTable(
+ TableIdentifier icebergId,
+ Schema icebergSchema,
+ PartitionSpec partitionSpec,
+ Map<String, String> icebergTableProperties)
+ throws org.apache.iceberg.exceptions.NoSuchNamespaceException,
+ org.apache.iceberg.exceptions.AlreadyExistsException {
+
+ icebergCatalog.createTable(icebergId, icebergSchema, partitionSpec,
icebergTableProperties);
+ }
+
+ private TableIdentifier toIcebergIdentifier(TablePath tablePath) {
+ return TableIdentifier.of(tablePath.getDatabaseName(),
tablePath.getTableName());
+ }
+
+ private Schema toIcebergSchema(TableDescriptor tableDescriptor) {
+ List<Types.NestedField> fields = new ArrayList<>();
+ int fieldId = 1;
+
+ for (com.alibaba.fluss.metadata.Schema.Column column :
+ tableDescriptor.getSchema().getColumns()) {
+ String colName = column.getName();
+ if (SYSTEM_COLUMNS.containsKey(colName)) {
+ throw new IllegalArgumentException(
+ "Column '" + colName + "' conflicts with a reserved
system column name.");
+ }
+ fields.add(
+ Types.NestedField.optional(
+ fieldId++, colName,
convertFlussToIcebergType(column.getDataType())));
+ }
+
+ fields.add(
+ Types.NestedField.optional(fieldId, BUCKET_COLUMN_NAME,
Types.IntegerType.get()));
+ fields.add(
+ Types.NestedField.optional(fieldId + 1, OFFSET_COLUMN_NAME,
Types.LongType.get()));
+ fields.add(
+ Types.NestedField.optional(
+ fieldId + 2, TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone()));
+
+ return new Schema(fields);
+ }
+
+ private Type convertFlussToIcebergType(DataType dataType) {
+ String typeRoot = dataType.getTypeRoot().name();
+
+ switch (typeRoot) {
+ case "INT":
+ return Types.IntegerType.get();
+ case "BIGINT":
+ return Types.LongType.get();
+ case "STRING":
+ return Types.StringType.get();
+ case "BOOLEAN":
+ return Types.BooleanType.get();
+ case "DOUBLE":
+ return Types.DoubleType.get();
+ case "FLOAT":
+ return Types.FloatType.get();
+ case "DATE":
+ return Types.DateType.get();
+ case "TIMESTAMP_WITH_LOCAL_TIME_ZONE":
+ return Types.TimestampType.withZone();
+ case "TIMESTAMP_WITHOUT_TIME_ZONE":
+ return Types.TimestampType.withoutZone();
+ case "UUID":
+ throw new UnsupportedOperationException("Fluss does not
support UUID yet.");
+ case "TIMESTAMP_NANO":
+ throw new UnsupportedOperationException(
+ "Iceberg does not support nanosecond precision
timestamps in 1.4.3");
+ default:
+ throw new UnsupportedOperationException("Unsupported Fluss
data type: " + typeRoot);
+ }
+ }
+
+ private PartitionSpec createPartitionSpec(
+ TableDescriptor tableDescriptor, Schema icebergSchema) {
+ // Only PK tables supported for now
+ List<String> bucketKeys = tableDescriptor.getBucketKeys();
+ int bucketCount =
+ tableDescriptor
+ .getTableDistribution()
+ .flatMap(td -> td.getBucketCount())
Review Comment:
nit:
```suggestion
.flatMap(TableDescriptor.TableDistribution::getBucketCount)
```
##########
fluss-lake/fluss-lake-iceberg/src/main/java/com/alibaba/fluss/lake/iceberg/IcebergLakeCatalog.java:
##########
@@ -0,0 +1,259 @@
+/*
+ * 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 com.alibaba.fluss.lake.iceberg;
+
+import com.alibaba.fluss.config.Configuration;
+import com.alibaba.fluss.exception.TableAlreadyExistException;
+import com.alibaba.fluss.lake.lakestorage.LakeCatalog;
+import com.alibaba.fluss.metadata.TableDescriptor;
+import com.alibaba.fluss.metadata.TablePath;
+import com.alibaba.fluss.types.DataType;
+import com.alibaba.fluss.utils.IOUtils;
+
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.alibaba.fluss.metadata.TableDescriptor.BUCKET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME;
+import static com.alibaba.fluss.metadata.TableDescriptor.TIMESTAMP_COLUMN_NAME;
+
+/** A Iceberg implementation of {@link LakeCatalog}. */
+public class IcebergLakeCatalog implements LakeCatalog {
+
+ private static final LinkedHashMap<String, Type> SYSTEM_COLUMNS = new
LinkedHashMap<>();
+
+ static {
+ // We need __bucket system column to filter out the given bucket
+ // for iceberg bucket append only table & primary key table.
+ SYSTEM_COLUMNS.put(BUCKET_COLUMN_NAME, Types.IntegerType.get());
+ SYSTEM_COLUMNS.put(OFFSET_COLUMN_NAME, Types.LongType.get());
+ SYSTEM_COLUMNS.put(TIMESTAMP_COLUMN_NAME,
Types.TimestampType.withZone());
+ }
+
+ private final Catalog icebergCatalog;
+
+ // for fluss config
+ private static final String FLUSS_CONF_PREFIX = "fluss.";
+ // for iceberg config
+ private static final String ICEBERG_CONF_PREFIX = "iceberg.";
+ private static final String ICEBERG_CATALOG_PREFIX = "iceberg.catalog.";
+
+ public IcebergLakeCatalog(Configuration configuration) {
+ // Extract Iceberg catalog properties from Fluss configuration
+ Map<String, String> icebergProps =
+ configuration.toMap().entrySet().stream()
+ .filter(e ->
e.getKey().startsWith(ICEBERG_CATALOG_PREFIX))
+ .collect(
+ Collectors.toMap(
+ e ->
e.getKey().substring(ICEBERG_CATALOG_PREFIX.length()),
+ Map.Entry::getValue));
+
+ String catalogType = icebergProps.get("type");
+ if (catalogType == null) {
+ throw new IllegalArgumentException(
+ "Missing required Iceberg catalog type. Set
'iceberg.catalog.type' in your configuration (e.g., 'hive', 'hadoop', or
'rest').");
+ }
+ String catalogName = icebergProps.getOrDefault("name",
"fluss-iceberg-catalog");
+
+ this.icebergCatalog =
+ org.apache.iceberg.CatalogUtil.loadCatalog(
+ catalogType,
+ catalogName,
+ icebergProps,
+ null // Optional: pass Hadoop configuration if
available
+ );
+ }
+
+ @Override
+ public void createTable(TablePath tablePath, TableDescriptor
tableDescriptor)
+ throws TableAlreadyExistException {
+ if (!tableDescriptor.hasPrimaryKey()) {
+ throw new UnsupportedOperationException(
+ "Only primary key tables are supported currently.");
+ }
+
+ TableIdentifier icebergId = toIcebergIdentifier(tablePath);
+ Schema icebergSchema = toIcebergSchema(tableDescriptor);
+ PartitionSpec partitionSpec = createPartitionSpec(tableDescriptor,
icebergSchema);
+
+ Map<String, String> icebergProperties = new HashMap<>();
+
+ // MOR table properties
+ icebergProperties.put("write.delete.mode", "merge-on-read");
+ icebergProperties.put("write.update.mode", "merge-on-read");
+ icebergProperties.put("write.merge.mode", "merge-on-read");
+
+ tableDescriptor
+ .getProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+ tableDescriptor
+ .getCustomProperties()
+ .forEach((k, v) -> setFlussPropertyToIceberg(k, v,
icebergProperties));
+
+ createDatabase(tablePath.getDatabaseName());
+
+ try {
+ createTable(icebergId, icebergSchema, partitionSpec,
icebergProperties);
+ } catch (org.apache.iceberg.exceptions.AlreadyExistsException e) {
+ throw new TableAlreadyExistException("Table " + tablePath + "
already exists.");
+ }
+ }
+
+ private void createTable(
+ TableIdentifier icebergId,
+ Schema icebergSchema,
+ PartitionSpec partitionSpec,
+ Map<String, String> icebergTableProperties)
+ throws org.apache.iceberg.exceptions.NoSuchNamespaceException,
+ org.apache.iceberg.exceptions.AlreadyExistsException {
+
+ icebergCatalog.createTable(icebergId, icebergSchema, partitionSpec,
icebergTableProperties);
Review Comment:
As the FIP said, it should sort by the system column `__offset`. So we
should use that:
```
Catalog.TableBuilder tableBuilder =
icebergCatalog.buildTable(icebergId, icebergSchema);
tableBuilder.withProperties(icebergTableProperties);
tableBuilder.withPartitionSpec(partitionSpec);
tableBuilder.withSortOrder(xxxx)
```
--
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]
