openinx commented on a change in pull request #1213:
URL: https://github.com/apache/iceberg/pull/1213#discussion_r463436266
##########
File path: spark2/src/main/java/org/apache/iceberg/spark/source/Writer.java
##########
@@ -209,9 +212,15 @@ public String toString() {
return String.format("IcebergWrite(table=%s, format=%s)", table, format);
}
- private static class TaskCommit extends TaskResult implements
WriterCommitMessage {
- TaskCommit(TaskResult toCopy) {
- super(toCopy.files());
+ private static class TaskCommit implements WriterCommitMessage {
+ private final List<DataFile> taskFiles;
Review comment:
Fine, sounds good.
##########
File path: core/src/main/java/org/apache/iceberg/io/BaseTaskWriter.java
##########
@@ -0,0 +1,154 @@
+/*
+ * 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.io;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import org.apache.iceberg.DataFile;
+import org.apache.iceberg.DataFiles;
+import org.apache.iceberg.FileFormat;
+import org.apache.iceberg.Metrics;
+import org.apache.iceberg.PartitionKey;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.encryption.EncryptedOutputFile;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
+import org.apache.iceberg.util.Tasks;
+
+public abstract class BaseTaskWriter<T> implements TaskWriter<T> {
+ private final List<DataFile> completedFiles = Lists.newArrayList();
+ private final PartitionSpec spec;
+ private final FileFormat format;
+ private final FileAppenderFactory<T> appenderFactory;
+ private final OutputFileFactory fileFactory;
+ private final FileIO io;
+ private final long targetFileSize;
+
+ protected BaseTaskWriter(PartitionSpec spec, FileFormat format,
FileAppenderFactory<T> appenderFactory,
+ OutputFileFactory fileFactory, FileIO io, long
targetFileSize) {
+ this.spec = spec;
+ this.format = format;
+ this.appenderFactory = appenderFactory;
+ this.fileFactory = fileFactory;
+ this.io = io;
+ this.targetFileSize = targetFileSize;
+ }
+
+ @Override
+ public void abort() throws IOException {
+ close();
+
+ // clean up files created by this writer
+ Tasks.foreach(completedFiles)
+ .throwFailureWhenFinished()
+ .noRetry()
+ .run(file -> io.deleteFile(file.path().toString()));
+ }
+
+ @Override
+ public List<DataFile> complete() throws IOException {
+ close();
+
+ if (completedFiles.size() > 0) {
+ return ImmutableList.copyOf(completedFiles);
+ } else {
+ return Collections.emptyList();
+ }
+ }
+
+ protected class RollingFileWriter implements Closeable {
+ private static final int ROWS_DIVISOR = 1000;
+ private final PartitionKey partitionKey;
+
+ private EncryptedOutputFile currentFile = null;
+ private FileAppender<T> currentAppender = null;
+ private long currentRows = 0;
+
+ public RollingFileWriter(PartitionKey partitionKey) {
+ this.partitionKey = partitionKey;
+ }
+
+ public void add(T record) throws IOException {
+ if (currentAppender == null) {
+ openCurrent();
+ }
+
+ this.currentAppender.add(record);
+ this.currentRows++;
+
+ if (shouldRollToNewFile()) {
+ closeCurrent();
+ }
+ }
+
+ private void openCurrent() {
+ if (spec.fields().size() == 0) {
Review comment:
Yeah, it make sense. Thanks.
##########
File path: core/src/main/java/org/apache/iceberg/io/BaseTaskWriter.java
##########
@@ -0,0 +1,154 @@
+/*
+ * 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.io;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import org.apache.iceberg.DataFile;
+import org.apache.iceberg.DataFiles;
+import org.apache.iceberg.FileFormat;
+import org.apache.iceberg.Metrics;
+import org.apache.iceberg.PartitionKey;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.encryption.EncryptedOutputFile;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
+import org.apache.iceberg.util.Tasks;
+
+public abstract class BaseTaskWriter<T> implements TaskWriter<T> {
+ private final List<DataFile> completedFiles = Lists.newArrayList();
+ private final PartitionSpec spec;
+ private final FileFormat format;
+ private final FileAppenderFactory<T> appenderFactory;
+ private final OutputFileFactory fileFactory;
+ private final FileIO io;
+ private final long targetFileSize;
+
+ protected BaseTaskWriter(PartitionSpec spec, FileFormat format,
FileAppenderFactory<T> appenderFactory,
+ OutputFileFactory fileFactory, FileIO io, long
targetFileSize) {
+ this.spec = spec;
+ this.format = format;
+ this.appenderFactory = appenderFactory;
+ this.fileFactory = fileFactory;
+ this.io = io;
+ this.targetFileSize = targetFileSize;
+ }
+
+ @Override
+ public void abort() throws IOException {
+ close();
+
+ // clean up files created by this writer
+ Tasks.foreach(completedFiles)
+ .throwFailureWhenFinished()
+ .noRetry()
+ .run(file -> io.deleteFile(file.path().toString()));
+ }
+
+ @Override
+ public List<DataFile> complete() throws IOException {
+ close();
+
+ if (completedFiles.size() > 0) {
+ return ImmutableList.copyOf(completedFiles);
+ } else {
+ return Collections.emptyList();
+ }
+ }
+
+ protected class RollingFileWriter implements Closeable {
+ private static final int ROWS_DIVISOR = 1000;
+ private final PartitionKey partitionKey;
+
+ private EncryptedOutputFile currentFile = null;
+ private FileAppender<T> currentAppender = null;
+ private long currentRows = 0;
+
+ public RollingFileWriter(PartitionKey partitionKey) {
+ this.partitionKey = partitionKey;
+ }
+
+ public void add(T record) throws IOException {
+ if (currentAppender == null) {
+ openCurrent();
+ }
+
+ this.currentAppender.add(record);
+ this.currentRows++;
+
+ if (shouldRollToNewFile()) {
+ closeCurrent();
+ }
+ }
+
+ private void openCurrent() {
+ if (spec.fields().size() == 0) {
Review comment:
Yeah, it makes sense.
##########
File path: site/docs/javadoc/0.9.0/serialized-form.html
##########
@@ -1031,7 +1031,7 @@ <h4>spec</h4>
<li class="blockList"><a
id="org.apache.iceberg.spark.source.SparkBatchWrite.TaskCommit">
<!-- -->
</a>
-<h3>Class org.apache.iceberg.spark.source.SparkBatchWrite.TaskCommit extends
org.apache.iceberg.spark.source.TaskResult implements Serializable</h3>
+<h3>Class org.apache.iceberg.spark.source.SparkBatchWrite.TaskCommit
implements Serializable</h3>
Review comment:
Yes, you are right. we shouldn't change the 0.9.0 Javadoc, let's
revert it.
##########
File path: site/docs/javadoc/0.9.0/serialized-form.html
##########
@@ -1031,7 +1031,7 @@ <h4>spec</h4>
<li class="blockList"><a
id="org.apache.iceberg.spark.source.SparkBatchWrite.TaskCommit">
<!-- -->
</a>
-<h3>Class org.apache.iceberg.spark.source.SparkBatchWrite.TaskCommit extends
org.apache.iceberg.spark.source.TaskResult implements Serializable</h3>
+<h3>Class org.apache.iceberg.spark.source.SparkBatchWrite.TaskCommit
implements Serializable</h3>
Review comment:
You are right, we should not change the javadoc of 0.9.0 release.
##########
File path: core/src/main/java/org/apache/iceberg/io/UnpartitionedWriter.java
##########
@@ -17,24 +17,42 @@
* under the License.
*/
-package org.apache.iceberg.spark.source;
+package org.apache.iceberg.io;
import java.io.IOException;
import org.apache.iceberg.FileFormat;
import org.apache.iceberg.PartitionSpec;
-import org.apache.iceberg.io.FileIO;
-import org.apache.spark.sql.catalyst.InternalRow;
-class UnpartitionedWriter extends BaseWriter {
- UnpartitionedWriter(PartitionSpec spec, FileFormat format,
SparkAppenderFactory appenderFactory,
- OutputFileFactory fileFactory, FileIO io, long
targetFileSize) {
+public class UnpartitionedWriter<T> extends BaseTaskWriter<T> {
+
+ private RollingFileWriter currentWriter = null;
+
+ public UnpartitionedWriter(PartitionSpec spec, FileFormat format,
FileAppenderFactory<T> appenderFactory,
+ OutputFileFactory fileFactory, FileIO io, long
targetFileSize) {
super(spec, format, appenderFactory, fileFactory, io, targetFileSize);
+ }
- openCurrent();
+ @Override
+ public void write(T record) throws IOException {
+ if (currentWriter == null) {
+ currentWriter = new RollingFileWriter(null);
+ }
+ currentWriter.add(record);
}
@Override
- public void write(InternalRow row) throws IOException {
- writeInternal(row);
+ public void close() throws IOException {
+ closeCurrent();
+ }
+
+ private void closeCurrent() throws IOException {
Review comment:
Yeah, its logics could be just moved to `close()`.
##########
File path: spark2/src/main/java/org/apache/iceberg/spark/source/Writer.java
##########
@@ -209,9 +212,15 @@ public String toString() {
return String.format("IcebergWrite(table=%s, format=%s)", table, format);
}
- private static class TaskCommit extends TaskResult implements
WriterCommitMessage {
- TaskCommit(TaskResult toCopy) {
- super(toCopy.files());
+ private static class TaskCommit implements WriterCommitMessage {
+ private final List<DataFile> taskFiles;
Review comment:
Nice finding, make sense.
----------------------------------------------------------------
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]
