Depend on Spark-3.0.0-palantir.18 (cont'd) #1
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| /* | ||
| * 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.netflix.iceberg.spark.source; | ||
|
|
||
| import com.google.common.base.Preconditions; | ||
| import com.google.common.collect.Lists; | ||
| import com.netflix.iceberg.FileFormat; | ||
| import com.netflix.iceberg.Table; | ||
| import com.netflix.iceberg.expressions.Expression; | ||
| import com.netflix.iceberg.spark.SparkFilters; | ||
| import com.netflix.iceberg.spark.SparkSchemaUtil; | ||
| import org.apache.spark.sql.SaveMode; | ||
| import org.apache.spark.sql.sources.Filter; | ||
| import org.apache.spark.sql.sources.v2.DataSourceOptions; | ||
| import org.apache.spark.sql.sources.v2.SupportsBatchRead; | ||
| import org.apache.spark.sql.sources.v2.SupportsBatchWrite; | ||
| import org.apache.spark.sql.sources.v2.reader.*; | ||
| import org.apache.spark.sql.sources.v2.writer.BatchWrite; | ||
| import org.apache.spark.sql.sources.v2.writer.SupportsSaveMode; | ||
| import org.apache.spark.sql.sources.v2.writer.WriteBuilder; | ||
| import org.apache.spark.sql.types.StructType; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Locale; | ||
| import java.util.Optional; | ||
|
|
||
| import static com.netflix.iceberg.TableProperties.DEFAULT_FILE_FORMAT; | ||
| import static com.netflix.iceberg.TableProperties.DEFAULT_FILE_FORMAT_DEFAULT; | ||
|
|
||
| public class IcebergSparkTable implements SupportsBatchRead, SupportsBatchWrite { | ||
|
|
||
| private final Table table; | ||
|
|
||
| public IcebergSparkTable(Table table) { | ||
| this.table = table; | ||
| } | ||
|
|
||
| @Override | ||
| public ScanBuilder newScanBuilder(DataSourceOptions options) { | ||
| return new IcebergReaderBuilder(table); | ||
| } | ||
|
|
||
| @Override | ||
| public WriteBuilder newWriteBuilder(DataSourceOptions options) { | ||
| Optional<String> formatOption = options.get("iceberg.write.format"); | ||
| if (formatOption.isPresent()) { | ||
| return new IcebergWriterBuilder(table, FileFormat.valueOf(formatOption.get().toUpperCase(Locale.ENGLISH))); | ||
| } | ||
| return new IcebergWriterBuilder( | ||
| table, | ||
| FileFormat.valueOf(table.properties() | ||
| .getOrDefault(DEFAULT_FILE_FORMAT, DEFAULT_FILE_FORMAT_DEFAULT) | ||
| .toUpperCase(Locale.ENGLISH))); | ||
| } | ||
|
|
||
| @Override | ||
| public String name() { | ||
| return table.location(); | ||
| } | ||
|
|
||
| @Override | ||
| public StructType schema() { | ||
| return SparkSchemaUtil.convert(table.schema()); | ||
| } | ||
|
|
||
|
|
||
| private static class IcebergWriterBuilder implements WriteBuilder, | ||
| SupportsSaveMode { | ||
|
There was a problem hiding this comment. I think we should just say that we don't support SaveMode here, since we're specifically checking that only appending is allowed anyways. We'll discuss how to get Iceberg connected to table catalogs and the V2 logical plans when the time comes. |
||
| private final Table table; | ||
| private final FileFormat fileFormat; | ||
|
|
||
| public IcebergWriterBuilder(Table table, FileFormat fileFormat) { | ||
| this.table = table; | ||
| this.fileFormat = fileFormat; | ||
| } | ||
|
|
||
| @Override | ||
| public BatchWrite buildForBatch() { | ||
| return new Writer(table, fileFormat); | ||
| } | ||
|
|
||
| @Override | ||
| public WriteBuilder mode(SaveMode mode) { | ||
|
There was a problem hiding this comment. I think we should just say that we don't support
Owner
Author
There was a problem hiding this comment. Ok yup, the reason I did that was because some tests relied on it, but I can update those tests too. |
||
| Preconditions.checkArgument(mode == SaveMode.Append, "Save mode %s is not supported", mode); | ||
| return this; | ||
| } | ||
| } | ||
|
|
||
| private static class IcebergReaderBuilder implements ScanBuilder, | ||
| SupportsPushDownFilters, | ||
| SupportsPushDownRequiredColumns { | ||
|
|
||
| private static final Filter[] NO_FILTERS = new Filter[0]; | ||
|
|
||
| private final Table table; | ||
| private Filter[] pushedFilters = NO_FILTERS; | ||
| private List<Expression> filterExpressions = Lists.newArrayList(); | ||
| private StructType requestedSchema = null; | ||
|
|
||
| public IcebergReaderBuilder(Table table) { | ||
| this.table = table; | ||
| } | ||
|
|
||
| @Override | ||
| public Filter[] pushFilters(Filter[] filters) { | ||
| List<Expression> expressions = Lists.newArrayListWithExpectedSize(filters.length); | ||
| List<Filter> pushed = Lists.newArrayListWithExpectedSize(filters.length); | ||
|
|
||
| for (Filter filter : filters) { | ||
| Expression expr = SparkFilters.convert(filter); | ||
| if (expr != null) { | ||
| expressions.add(expr); | ||
| pushed.add(filter); | ||
| } | ||
| } | ||
|
|
||
| this.filterExpressions = expressions; | ||
| this.pushedFilters = pushed.toArray(new Filter[0]); | ||
|
|
||
| // Spark doesn't support residuals per task, so return all filters | ||
| // to get Spark to handle record-level filtering | ||
| return filters; | ||
| } | ||
|
|
||
| @Override | ||
| public Filter[] pushedFilters() { | ||
| return pushedFilters; | ||
| } | ||
|
|
||
| @Override | ||
| public void pruneColumns(StructType requiredSchema) { | ||
| this.requestedSchema = requiredSchema; | ||
| } | ||
|
|
||
| @Override | ||
| public Scan build() { | ||
| return new Reader(table, filterExpressions, requestedSchema); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did we need to use
commons-lang3? Not entirely opposed to it, just wondering if we can minimize the diff just a tiny bit.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm the original import doesn't seem to be part of the natural dependency tree anymore :/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's fine then, actually we probably want to be exclusively using
lang3in upstream as well. We'll catch this if we introduce Baseline and linting has a rule for it.