Skip to content

Extract buildSchemaProperties method in Delta Lake #13096

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
ebyhr merged 1 commit into from
Jul 7, 2022
Merged

Extract buildSchemaProperties method in Delta Lake #13096

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
19 changes: 2 additions & 17 deletions plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakePageSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
import io.trino.plugin.hive.FileWriter;
import io.trino.plugin.hive.HdfsEnvironment;
import io.trino.plugin.hive.HivePartitionKey;
import io.trino.plugin.hive.HiveType;
import io.trino.plugin.hive.HiveTypeName;
import io.trino.plugin.hive.RecordFileWriter;
import io.trino.plugin.hive.parquet.ParquetFileWriter;
import io.trino.plugin.hive.util.HiveWriteUtils;
Expand All @@ -47,7 +45,6 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.common.FileUtils;
import org.apache.hadoop.hive.ql.io.IOConstants;
import org.apache.hadoop.mapred.JobConf;
import org.apache.parquet.hadoop.metadata.CompressionCodecName;
import org.joda.time.DateTimeZone;
Expand All @@ -67,6 +64,7 @@
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static io.airlift.slice.Slices.wrappedBuffer;
import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_BAD_WRITE;
import static io.trino.plugin.deltalake.DeltaLakeSchemaProperties.buildHiveSchema;
import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getCompressionCodec;
import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetWriterBlockSize;
import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetWriterPageSize;
Expand All @@ -80,7 +78,6 @@
import static java.util.Objects.requireNonNull;
import static java.util.UUID.randomUUID;
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toList;
import static org.apache.hadoop.hive.common.FileUtils.escapePathName;

Expand Down Expand Up @@ -508,7 +505,7 @@ private FileWriter createParquetFileWriter(Path path)

private FileWriter createRecordFileWriter(Path path)
{
Properties schema = buildSchemaProperties(dataColumnNames, dataColumnTypes);
Properties schema = buildHiveSchema(dataColumnNames, dataColumnTypes);
return new RecordFileWriter(
path,
dataColumnNames,
Expand All @@ -521,18 +518,6 @@ private FileWriter createRecordFileWriter(Path path)
session);
}

static Properties buildSchemaProperties(List<String> columnNames, List<Type> columnTypes)
{
Properties schema = new Properties();
schema.setProperty(IOConstants.COLUMNS, String.join(",", columnNames));
schema.setProperty(IOConstants.COLUMNS_TYPES, columnTypes.stream()
.map(DeltaHiveTypeTranslator::toHiveType)
.map(HiveType::getHiveTypeName)
.map(HiveTypeName::toString)
.collect(joining(":")));
return schema;
}

private Page getDataPage(Page page)
{
Block[] blocks = new Block[dataColumnInputIndex.length];
Expand Down
18 changes: 18 additions & 0 deletions ...n/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeSchemaProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,20 @@

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import io.trino.plugin.hive.HiveType;
import io.trino.plugin.hive.HiveTypeName;
import io.trino.plugin.hive.metastore.Database;
import io.trino.spi.session.PropertyMetadata;
import io.trino.spi.type.Type;
import org.apache.hadoop.hive.ql.io.IOConstants;

import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;

import static io.trino.spi.session.PropertyMetadata.stringProperty;
import static java.util.stream.Collectors.joining;

public class DeltaLakeSchemaProperties
{
Expand All @@ -49,4 +55,16 @@ public static Optional<String> getLocation(Map<String, Object> schemaProperties)
{
return Optional.ofNullable((String) schemaProperties.get(LOCATION_PROPERTY));
}

public static Properties buildHiveSchema(List<String> columnNames, List<Type> columnTypes)
{
Properties schema = new Properties();
schema.setProperty(IOConstants.COLUMNS, String.join(",", columnNames));
schema.setProperty(IOConstants.COLUMNS_TYPES, columnTypes.stream()
.map(DeltaHiveTypeTranslator::toHiveType)
.map(HiveType::getHiveTypeName)
.map(HiveTypeName::toString)
.collect(joining(":")));
return schema;
}
}
3 changes: 2 additions & 1 deletion ...rino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeUpdatablePageSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_BAD_DATA;
import static io.trino.plugin.deltalake.DeltaLakeErrorCode.DELTA_LAKE_BAD_WRITE;
import static io.trino.plugin.deltalake.DeltaLakePageSink.createPartitionValues;
import static io.trino.plugin.deltalake.DeltaLakeSchemaProperties.buildHiveSchema;
import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.getParquetMaxReadBlockSize;
import static io.trino.plugin.deltalake.DeltaLakeSessionProperties.isParquetUseColumnIndex;
import static io.trino.plugin.deltalake.transactionlog.DeltaLakeSchemaSupport.extractSchema;
Expand Down Expand Up @@ -577,7 +578,7 @@ private DeltaLakeWriter createWriter(Path targetFile, List<DeltaLakeColumnMetada
Configuration conf = hdfsEnvironment.getConfiguration(new HdfsEnvironment.HdfsContext(session), targetFile);
configureCompression(conf, SNAPPY);

Properties schema = DeltaLakePageSink.buildSchemaProperties(
Properties schema = buildHiveSchema(
dataColumns.stream().map(DeltaLakeColumnHandle::getName).collect(toImmutableList()),
dataColumns.stream().map(DeltaLakeColumnHandle::getType).collect(toImmutableList()));
RecordFileWriter recordFileWriter = new RecordFileWriter(
Expand Down
21 changes: 2 additions & 19 deletions ...e/src/main/java/io/trino/plugin/deltalake/transactionlog/checkpoint/CheckpointWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package io.trino.plugin.deltalake.transactionlog.checkpoint;

import com.google.common.collect.ImmutableList;
import io.trino.plugin.deltalake.DeltaHiveTypeTranslator;
import io.trino.plugin.deltalake.transactionlog.AddFileEntry;
import io.trino.plugin.deltalake.transactionlog.MetadataEntry;
import io.trino.plugin.deltalake.transactionlog.ProtocolEntry;
Expand All @@ -23,8 +22,6 @@
import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeJsonFileStatistics;
import io.trino.plugin.deltalake.transactionlog.statistics.DeltaLakeParquetFileStatistics;
import io.trino.plugin.hive.HdfsEnvironment;
import io.trino.plugin.hive.HiveType;
import io.trino.plugin.hive.HiveTypeName;
import io.trino.plugin.hive.RecordFileWriter;
import io.trino.spi.PageBuilder;
import io.trino.spi.block.Block;
Expand All @@ -39,7 +36,6 @@
import io.trino.spi.type.TypeManager;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.ql.io.IOConstants;
import org.apache.hadoop.mapred.JobConf;
import org.joda.time.DateTimeZone;

Expand All @@ -53,6 +49,7 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static io.airlift.slice.Slices.utf8Slice;
import static io.trino.plugin.deltalake.DeltaLakeSchemaProperties.buildHiveSchema;
import static io.trino.plugin.hive.HiveCompressionCodec.SNAPPY;
import static io.trino.plugin.hive.HiveStorageFormat.PARQUET;
import static io.trino.plugin.hive.metastore.StorageFormat.fromHiveStorageFormat;
Expand All @@ -62,7 +59,6 @@
import static io.trino.spi.type.TypeUtils.writeNativeValue;
import static java.lang.Math.multiplyExact;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toMap;

public class CheckpointWriter
Expand Down Expand Up @@ -108,7 +104,7 @@ public void write(ConnectorSession session, CheckpointEntries entries, Path targ
addEntryType,
removeEntryType);

Properties schema = buildSchemaProperties(columnNames, columnTypes);
Properties schema = buildHiveSchema(columnNames, columnTypes);

Configuration conf = hdfsEnvironment.getConfiguration(new HdfsEnvironment.HdfsContext(session), targetPath);
configureCompression(conf, SNAPPY);
Expand Down Expand Up @@ -144,19 +140,6 @@ public void write(ConnectorSession session, CheckpointEntries entries, Path targ
writer.commit();
}

private static Properties buildSchemaProperties(List<String> columnNames, List<Type> columnTypes)
{
// TODO copied out from DeltaLakePageSink. Extrat to utility class (https://github.com/trinodb/trino/issues/12030)
Properties schema = new Properties();
schema.setProperty(IOConstants.COLUMNS, String.join(",", columnNames));
schema.setProperty(IOConstants.COLUMNS_TYPES, columnTypes.stream()
.map(DeltaHiveTypeTranslator::toHiveType)
.map(HiveType::getHiveTypeName)
.map(HiveTypeName::toString)
.collect(joining(":")));
return schema;
}

private void writeMetadataEntry(PageBuilder pageBuilder, RowType entryType, MetadataEntry metadataEntry)
{
pageBuilder.declarePosition();
Expand Down