cmathiesen commented on a change in pull request #1103: URL: https://github.com/apache/iceberg/pull/1103#discussion_r438688881
########## File path: mr/src/main/java/org/apache/iceberg/mr/mapred/SystemTableUtil.java ########## @@ -0,0 +1,74 @@ +/* + * 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.iceberg.mr.mapred; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import org.apache.hadoop.conf.Configuration; +import org.apache.iceberg.Schema; +import org.apache.iceberg.data.GenericRecord; +import org.apache.iceberg.data.Record; +import org.apache.iceberg.types.Types; + +public class SystemTableUtil { + + static final String VIRTUAL_COLUMN_NAME = "iceberg.hive.snapshot.virtual.column.name"; + + private static final String DEFAULT_SNAPSHOT_ID_COLUMN_NAME = "snapshot__id"; + + private SystemTableUtil() {} + + protected static Schema schemaWithVirtualColumn(Schema schema, String columnName) { + List<Types.NestedField> columns = new ArrayList<>(schema.columns()); + columns.add(Types.NestedField.optional(Integer.MAX_VALUE, columnName, Types.LongType.get())); + return new Schema(columns); + } + + protected static Record recordWithVirtualColumn(Record record, long snapshotId, Schema oldSchema, + String columnName) { + Schema newSchema = schemaWithVirtualColumn(oldSchema, columnName); + Record newRecord = GenericRecord.create(newSchema); + for (Types.NestedField field : oldSchema.columns()) { + newRecord.setField(field.name(), record.getField(field.name())); + } + newRecord.setField(columnName, snapshotId); + return newRecord; + } + + protected static String getVirtualColumnName(Configuration conf) { + String virtualColumnName = conf.get(VIRTUAL_COLUMN_NAME); + if (virtualColumnName == null) { + return DEFAULT_SNAPSHOT_ID_COLUMN_NAME; + } else { + return virtualColumnName; + } + } + + protected static String getVirtualColumnName(Properties properties) { Review comment: Yeah we agree, we discovered this when adding the `SerDe` - the IF uses `Configuration` but the `SerDe` only uses `Properties` and we wanted to use the methods across both classes and it seemed simpler to overload a method rather than create new `Properties` from the `Configuration` in the IF ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
