You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@iceberg.apache.org by GitBox <gi...@apache.org> on 2020/12/03 15:23:48 UTC
[GitHub] [iceberg] aokolnychyi opened a new pull request #1869: Spark: Add RemoveOrphanFilesProcedure
aokolnychyi opened a new pull request #1869:
URL: https://github.com/apache/iceberg/pull/1869
This PR adds a stored procedure for removing orphan files.
This change was originally authored by @liukun4515 against my internal fork before we got the stored procedures in. I kept @liukun4515 as the lead author and added more changes based on the current API for stored procedures.
Tests to be done.
----------------------------------------------------------------
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] aokolnychyi commented on a change in pull request #1869: Spark: Add RemoveOrphanFilesProcedure
Posted by GitBox <gi...@apache.org>.
aokolnychyi commented on a change in pull request #1869:
URL: https://github.com/apache/iceberg/pull/1869#discussion_r535455572
##########
File path: spark3/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
##########
@@ -0,0 +1,136 @@
+/*
+ * 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.spark.procedures;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.apache.iceberg.actions.Actions;
+import org.apache.iceberg.actions.RemoveOrphanFilesAction;
+import org.apache.iceberg.spark.procedures.SparkProcedures.ProcedureBuilder;
+import org.apache.spark.sql.catalyst.InternalRow;
+import org.apache.spark.sql.catalyst.util.DateTimeUtils;
+import org.apache.spark.sql.connector.catalog.TableCatalog;
+import org.apache.spark.sql.connector.iceberg.catalog.ProcedureParameter;
+import org.apache.spark.sql.types.DataTypes;
+import org.apache.spark.sql.types.Metadata;
+import org.apache.spark.sql.types.StructField;
+import org.apache.spark.sql.types.StructType;
+import org.apache.spark.unsafe.types.UTF8String;
+
+/**
+ * A procedure that removes orphan files in a table.
+ *
+ * @see Actions#removeOrphanFiles()
+ */
+public class RemoveOrphanFilesProcedure extends BaseProcedure {
+
+ private static final ProcedureParameter[] PARAMETERS = new ProcedureParameter[]{
+ ProcedureParameter.required("namespace", DataTypes.StringType),
+ ProcedureParameter.required("table", DataTypes.StringType),
+ ProcedureParameter.optional("older_than", DataTypes.TimestampType),
+ ProcedureParameter.optional("location", DataTypes.StringType),
+ ProcedureParameter.optional("dry_run", DataTypes.BooleanType),
+ ProcedureParameter.optional("validate_interval", DataTypes.BooleanType)
+ };
+
+ private static final StructType OUTPUT_TYPE = new StructType(new StructField[]{
+ new StructField("orphan_file_location", DataTypes.StringType, false, Metadata.empty())
+ });
+
+ public static ProcedureBuilder builder() {
+ return new BaseProcedure.Builder<RemoveOrphanFilesProcedure>() {
+ @Override
+ protected RemoveOrphanFilesProcedure doBuild() {
+ return new RemoveOrphanFilesProcedure(tableCatalog());
+ }
+ };
+ }
+
+ private RemoveOrphanFilesProcedure(TableCatalog catalog) {
+ super(catalog);
+ }
+
+ @Override
+ public ProcedureParameter[] parameters() {
+ return PARAMETERS;
+ }
+
+ @Override
+ public StructType outputType() {
+ return OUTPUT_TYPE;
+ }
+
+ @Override
+ public InternalRow[] call(InternalRow args) {
+ String namespace = args.getString(0);
+ String tableName = args.getString(1);
+ Long olderThanMillis = args.isNullAt(2) ? null : DateTimeUtils.toMillis(args.getLong(2));
+ String location = args.isNullAt(3) ? null : args.getString(3);
+ boolean dryRun = !args.isNullAt(4) && args.getBoolean(4);
Review comment:
I wrote that and Intellij suggested to simplify it :) I agree it is more obvious with the ternary expression, I'll change back.
----------------------------------------------------------------
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] aokolnychyi commented on a change in pull request #1869: Spark: Add RemoveOrphanFilesProcedure
Posted by GitBox <gi...@apache.org>.
aokolnychyi commented on a change in pull request #1869:
URL: https://github.com/apache/iceberg/pull/1869#discussion_r535543884
##########
File path: spark3/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
##########
@@ -0,0 +1,136 @@
+/*
+ * 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.spark.procedures;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.apache.iceberg.actions.Actions;
+import org.apache.iceberg.actions.RemoveOrphanFilesAction;
+import org.apache.iceberg.spark.procedures.SparkProcedures.ProcedureBuilder;
+import org.apache.spark.sql.catalyst.InternalRow;
+import org.apache.spark.sql.catalyst.util.DateTimeUtils;
+import org.apache.spark.sql.connector.catalog.TableCatalog;
+import org.apache.spark.sql.connector.iceberg.catalog.ProcedureParameter;
+import org.apache.spark.sql.types.DataTypes;
+import org.apache.spark.sql.types.Metadata;
+import org.apache.spark.sql.types.StructField;
+import org.apache.spark.sql.types.StructType;
+import org.apache.spark.unsafe.types.UTF8String;
+
+/**
+ * A procedure that removes orphan files in a table.
+ *
+ * @see Actions#removeOrphanFiles()
+ */
+public class RemoveOrphanFilesProcedure extends BaseProcedure {
+
+ private static final ProcedureParameter[] PARAMETERS = new ProcedureParameter[]{
+ ProcedureParameter.required("namespace", DataTypes.StringType),
+ ProcedureParameter.required("table", DataTypes.StringType),
+ ProcedureParameter.optional("older_than", DataTypes.TimestampType),
+ ProcedureParameter.optional("location", DataTypes.StringType),
+ ProcedureParameter.optional("dry_run", DataTypes.BooleanType),
+ ProcedureParameter.optional("validate_interval", DataTypes.BooleanType)
+ };
+
+ private static final StructType OUTPUT_TYPE = new StructType(new StructField[]{
+ new StructField("orphan_file_location", DataTypes.StringType, false, Metadata.empty())
+ });
+
+ public static ProcedureBuilder builder() {
+ return new BaseProcedure.Builder<RemoveOrphanFilesProcedure>() {
+ @Override
+ protected RemoveOrphanFilesProcedure doBuild() {
+ return new RemoveOrphanFilesProcedure(tableCatalog());
+ }
+ };
+ }
+
+ private RemoveOrphanFilesProcedure(TableCatalog catalog) {
+ super(catalog);
+ }
+
+ @Override
+ public ProcedureParameter[] parameters() {
+ return PARAMETERS;
+ }
+
+ @Override
+ public StructType outputType() {
+ return OUTPUT_TYPE;
+ }
+
+ @Override
+ public InternalRow[] call(InternalRow args) {
+ String namespace = args.getString(0);
+ String tableName = args.getString(1);
+ Long olderThanMillis = args.isNullAt(2) ? null : DateTimeUtils.toMillis(args.getLong(2));
+ String location = args.isNullAt(3) ? null : args.getString(3);
+ boolean dryRun = !args.isNullAt(4) && args.getBoolean(4);
Review comment:
Done
----------------------------------------------------------------
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] aokolnychyi merged pull request #1869: Spark: Add RemoveOrphanFilesProcedure
Posted by GitBox <gi...@apache.org>.
aokolnychyi merged pull request #1869:
URL: https://github.com/apache/iceberg/pull/1869
----------------------------------------------------------------
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] rdblue commented on a change in pull request #1869: Spark: Add RemoveOrphanFilesProcedure
Posted by GitBox <gi...@apache.org>.
rdblue commented on a change in pull request #1869:
URL: https://github.com/apache/iceberg/pull/1869#discussion_r535451734
##########
File path: spark3/src/main/java/org/apache/iceberg/spark/procedures/RemoveOrphanFilesProcedure.java
##########
@@ -0,0 +1,136 @@
+/*
+ * 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.spark.procedures;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.apache.iceberg.actions.Actions;
+import org.apache.iceberg.actions.RemoveOrphanFilesAction;
+import org.apache.iceberg.spark.procedures.SparkProcedures.ProcedureBuilder;
+import org.apache.spark.sql.catalyst.InternalRow;
+import org.apache.spark.sql.catalyst.util.DateTimeUtils;
+import org.apache.spark.sql.connector.catalog.TableCatalog;
+import org.apache.spark.sql.connector.iceberg.catalog.ProcedureParameter;
+import org.apache.spark.sql.types.DataTypes;
+import org.apache.spark.sql.types.Metadata;
+import org.apache.spark.sql.types.StructField;
+import org.apache.spark.sql.types.StructType;
+import org.apache.spark.unsafe.types.UTF8String;
+
+/**
+ * A procedure that removes orphan files in a table.
+ *
+ * @see Actions#removeOrphanFiles()
+ */
+public class RemoveOrphanFilesProcedure extends BaseProcedure {
+
+ private static final ProcedureParameter[] PARAMETERS = new ProcedureParameter[]{
+ ProcedureParameter.required("namespace", DataTypes.StringType),
+ ProcedureParameter.required("table", DataTypes.StringType),
+ ProcedureParameter.optional("older_than", DataTypes.TimestampType),
+ ProcedureParameter.optional("location", DataTypes.StringType),
+ ProcedureParameter.optional("dry_run", DataTypes.BooleanType),
+ ProcedureParameter.optional("validate_interval", DataTypes.BooleanType)
+ };
+
+ private static final StructType OUTPUT_TYPE = new StructType(new StructField[]{
+ new StructField("orphan_file_location", DataTypes.StringType, false, Metadata.empty())
+ });
+
+ public static ProcedureBuilder builder() {
+ return new BaseProcedure.Builder<RemoveOrphanFilesProcedure>() {
+ @Override
+ protected RemoveOrphanFilesProcedure doBuild() {
+ return new RemoveOrphanFilesProcedure(tableCatalog());
+ }
+ };
+ }
+
+ private RemoveOrphanFilesProcedure(TableCatalog catalog) {
+ super(catalog);
+ }
+
+ @Override
+ public ProcedureParameter[] parameters() {
+ return PARAMETERS;
+ }
+
+ @Override
+ public StructType outputType() {
+ return OUTPUT_TYPE;
+ }
+
+ @Override
+ public InternalRow[] call(InternalRow args) {
+ String namespace = args.getString(0);
+ String tableName = args.getString(1);
+ Long olderThanMillis = args.isNullAt(2) ? null : DateTimeUtils.toMillis(args.getLong(2));
+ String location = args.isNullAt(3) ? null : args.getString(3);
+ boolean dryRun = !args.isNullAt(4) && args.getBoolean(4);
Review comment:
I usually think a ternary expression is easier to read in situations like this, rather than trying to think about negating `isNullAt`:
```java
boolean dryRun = args.isNullAt(4) ? false : args.getBoolean(4);
```
----------------------------------------------------------------
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] aokolnychyi commented on pull request #1869: Spark: Add RemoveOrphanFilesProcedure
Posted by GitBox <gi...@apache.org>.
aokolnychyi commented on pull request #1869:
URL: https://github.com/apache/iceberg/pull/1869#issuecomment-738083217
I don't know why Github does not pick up `Lead-authored-by` from the [commit](https://github.com/apache/iceberg/pull/1869/commits/8241a04a46a29213c65b7e9eede319c760c9832c). Worked for me in Spark.
----------------------------------------------------------------
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] aokolnychyi commented on pull request #1869: Spark: Add RemoveOrphanFilesProcedure
Posted by GitBox <gi...@apache.org>.
aokolnychyi commented on pull request #1869:
URL: https://github.com/apache/iceberg/pull/1869#issuecomment-738695943
I added two more tests and merged, thanks for reviewing, @rdblue!
----------------------------------------------------------------
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:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org