You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2020/04/15 23:28:27 UTC
[incubator-iceberg] branch master updated: Spark: move actions to a
separate package (#927)
This is an automated email from the ASF dual-hosted git repository.
blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 8b27fae Spark: move actions to a separate package (#927)
8b27fae is described below
commit 8b27fae275baca8b4623dffa142089f6aed50acc
Author: Anton Okolnychyi <ao...@apple.com>
AuthorDate: Wed Apr 15 16:28:17 2020 -0700
Spark: move actions to a separate package (#927)
---
spark/src/main/java/org/apache/iceberg/{ => actions}/Action.java | 2 +-
spark/src/main/java/org/apache/iceberg/{ => actions}/Actions.java | 3 ++-
.../org/apache/iceberg/{ => actions}/RemoveOrphanFilesAction.java | 8 +++++++-
.../apache/iceberg/{ => actions}/TestRemoveOrphanFilesAction.java | 7 ++++++-
.../apache/iceberg/spark/source/TestIcebergSourceTablesBase.java | 2 +-
5 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/spark/src/main/java/org/apache/iceberg/Action.java b/spark/src/main/java/org/apache/iceberg/actions/Action.java
similarity index 96%
rename from spark/src/main/java/org/apache/iceberg/Action.java
rename to spark/src/main/java/org/apache/iceberg/actions/Action.java
index 8e23176..a7bef13 100644
--- a/spark/src/main/java/org/apache/iceberg/Action.java
+++ b/spark/src/main/java/org/apache/iceberg/actions/Action.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg;
+package org.apache.iceberg.actions;
/**
* An action performed on a table.
diff --git a/spark/src/main/java/org/apache/iceberg/Actions.java b/spark/src/main/java/org/apache/iceberg/actions/Actions.java
similarity index 95%
rename from spark/src/main/java/org/apache/iceberg/Actions.java
rename to spark/src/main/java/org/apache/iceberg/actions/Actions.java
index a8e431b..549d541 100644
--- a/spark/src/main/java/org/apache/iceberg/Actions.java
+++ b/spark/src/main/java/org/apache/iceberg/actions/Actions.java
@@ -17,8 +17,9 @@
* under the License.
*/
-package org.apache.iceberg;
+package org.apache.iceberg.actions;
+import org.apache.iceberg.Table;
import org.apache.spark.sql.SparkSession;
public class Actions {
diff --git a/spark/src/main/java/org/apache/iceberg/RemoveOrphanFilesAction.java b/spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java
similarity index 97%
rename from spark/src/main/java/org/apache/iceberg/RemoveOrphanFilesAction.java
rename to spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java
index a82ad24..8f10812 100644
--- a/spark/src/main/java/org/apache/iceberg/RemoveOrphanFilesAction.java
+++ b/spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg;
+package org.apache.iceberg.actions;
import com.google.common.collect.Lists;
import java.io.IOException;
@@ -30,6 +30,12 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.iceberg.HasTableOperations;
+import org.apache.iceberg.MetadataTableType;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.TableOperations;
import org.apache.iceberg.exceptions.RuntimeIOException;
import org.apache.iceberg.hadoop.HiddenPathFilter;
import org.apache.iceberg.util.Tasks;
diff --git a/spark/src/test/java/org/apache/iceberg/TestRemoveOrphanFilesAction.java b/spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java
similarity index 98%
rename from spark/src/test/java/org/apache/iceberg/TestRemoveOrphanFilesAction.java
rename to spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java
index 9f4bc57..e0245b5 100644
--- a/spark/src/test/java/org/apache/iceberg/TestRemoveOrphanFilesAction.java
+++ b/spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iceberg;
+package org.apache.iceberg.actions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -31,6 +31,11 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.TableProperties;
import org.apache.iceberg.hadoop.HadoopTables;
import org.apache.iceberg.hadoop.HiddenPathFilter;
import org.apache.iceberg.spark.source.ThreeColumnRecord;
diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
index b569809..bc45a03 100644
--- a/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
+++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java
@@ -26,7 +26,6 @@ import java.util.Comparator;
import java.util.List;
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericRecordBuilder;
-import org.apache.iceberg.Actions;
import org.apache.iceberg.DataFile;
import org.apache.iceberg.ManifestFile;
import org.apache.iceberg.PartitionSpec;
@@ -34,6 +33,7 @@ import org.apache.iceberg.Schema;
import org.apache.iceberg.Snapshot;
import org.apache.iceberg.Table;
import org.apache.iceberg.TableProperties;
+import org.apache.iceberg.actions.Actions;
import org.apache.iceberg.avro.Avro;
import org.apache.iceberg.avro.AvroSchemaUtil;
import org.apache.iceberg.catalog.TableIdentifier;