the-other-tim-brown commented on code in PR #742: URL: https://github.com/apache/incubator-xtable/pull/742#discussion_r2330344552
########## xtable-core/src/main/java/org/apache/xtable/paimon/PaimonConversionSourceProvider.java: ########## @@ -0,0 +1,51 @@ +/* + * 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.xtable.paimon; + +import java.io.IOException; + +import org.apache.paimon.Snapshot; +import org.apache.paimon.catalog.CatalogContext; +import org.apache.paimon.fs.FileIO; +import org.apache.paimon.fs.Path; +import org.apache.paimon.options.Options; +import org.apache.paimon.table.FileStoreTable; +import org.apache.paimon.table.FileStoreTableFactory; + +import org.apache.xtable.conversion.ConversionSourceProvider; +import org.apache.xtable.conversion.SourceTable; +import org.apache.xtable.spi.extractor.ConversionSource; + +public class PaimonConversionSourceProvider extends ConversionSourceProvider<Snapshot> { + @Override + public ConversionSource<Snapshot> getConversionSourceInstance(SourceTable sourceTableConfig) { + try { + Options catalogOptions = new Options(); + CatalogContext context = CatalogContext.create(catalogOptions, hadoopConf); + + Path path = new Path(sourceTableConfig.getDataPath()); + FileIO fileIO = FileIO.get(path, context); + FileStoreTable paimonTable = FileStoreTableFactory.create(fileIO, path); + + return new PaimonConversionSource(paimonTable); + } catch (IOException e) { + throw new RuntimeException(e); Review Comment: We have some custom exception types like `ReadException` that may be better here to indicate there is an issue reading the initial state. ########## xtable-core/pom.xml: ########## @@ -206,6 +218,14 @@ <skip>false</skip> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>11</source> + <target>11</target> Review Comment: Is this a requirement for Paimon? We're only publishing to a java 8 target currently ########## xtable-core/src/test/java/org/apache/xtable/ITConversionController.java: ########## @@ -37,16 +35,7 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Base64; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.UUID; +import java.util.*; Review Comment: nitpick: generally we try to avoid `*` imports. ########## xtable-core/src/main/java/org/apache/xtable/paimon/PaimonSchemaExtractor.java: ########## @@ -0,0 +1,197 @@ +/* + * 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.xtable.paimon; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import org.apache.paimon.schema.TableSchema; +import org.apache.paimon.types.*; + +import org.apache.xtable.exception.NotSupportedException; +import org.apache.xtable.model.schema.InternalField; +import org.apache.xtable.model.schema.InternalSchema; +import org.apache.xtable.model.schema.InternalType; +import org.apache.xtable.schema.SchemaUtils; + +/** Converts Paimon RowType to XTable InternalSchema. */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class PaimonSchemaExtractor { Review Comment: Adding a note here likely related to the issues with Iceberg you are seeing in the ITs. The output of this does not include the meta fields `_KEY_id`, `_SEQUENCE_NUMBER`, `_VALUE_KIND`. This is likely messing up the type to offset mapping in Iceberg. Is there a way to extract the Paimon schema with these fields? ########## xtable-core/src/main/java/org/apache/xtable/paimon/PaimonSchemaExtractor.java: ########## @@ -0,0 +1,197 @@ +/* + * 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.xtable.paimon; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import org.apache.paimon.schema.TableSchema; +import org.apache.paimon.types.*; + +import org.apache.xtable.exception.NotSupportedException; +import org.apache.xtable.model.schema.InternalField; +import org.apache.xtable.model.schema.InternalSchema; +import org.apache.xtable.model.schema.InternalType; +import org.apache.xtable.schema.SchemaUtils; + +/** Converts Paimon RowType to XTable InternalSchema. */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class PaimonSchemaExtractor { + private static final PaimonSchemaExtractor INSTANCE = new PaimonSchemaExtractor(); + + public static PaimonSchemaExtractor getInstance() { + return INSTANCE; + } + + public InternalSchema toInternalSchema(TableSchema paimonSchema) { + RowType rowType = paimonSchema.logicalRowType(); + List<InternalField> fields = toInternalFields(rowType); + return InternalSchema.builder() + .name("record") + .dataType(InternalType.RECORD) + .fields(fields) + .recordKeyFields(primaryKeyFields(paimonSchema, fields)) + .build(); + } + + private List<InternalField> primaryKeyFields( + TableSchema paimonSchema, List<InternalField> internalFields) { + List<String> keys = paimonSchema.primaryKeys(); Review Comment: Is it possible for the primary key to be a nested field in Paimon? -- 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]
