You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@iceberg.apache.org by "aokolnychyi (via GitHub)" <gi...@apache.org> on 2023/03/10 03:42:21 UTC
[GitHub] [iceberg] aokolnychyi commented on a diff in pull request #6924: Spark 3.3: Add SparkStagedScan to replace SparkFilesScan
aokolnychyi commented on code in PR #6924:
URL: https://github.com/apache/iceberg/pull/6924#discussion_r1131915859
##########
spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/source/SparkStagedScan.java:
##########
@@ -0,0 +1,96 @@
+/*
+ * 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.source;
+
+import java.util.List;
+import java.util.Objects;
+import org.apache.iceberg.ScanTask;
+import org.apache.iceberg.ScanTaskGroup;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.exceptions.ValidationException;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
+import org.apache.iceberg.spark.ScanTaskSetManager;
+import org.apache.iceberg.spark.SparkReadConf;
+import org.apache.iceberg.util.TableScanUtil;
+import org.apache.spark.sql.SparkSession;
+
+class SparkStagedScan extends SparkScan {
Review Comment:
Looks good!
##########
spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/ScanTaskSetManager.java:
##########
@@ -0,0 +1,80 @@
+/*
+ * 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;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.iceberg.HasTableOperations;
+import org.apache.iceberg.ScanTask;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.TableOperations;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
+import org.apache.iceberg.util.Pair;
+
+public class ScanTaskSetManager {
+
+ private static final ScanTaskSetManager INSTANCE = new ScanTaskSetManager();
+
+ private final Map<Pair<String, String>, List<? extends ScanTask>> tasksMap =
+ Maps.newConcurrentMap();
+
+ private ScanTaskSetManager() {}
+
+ public static ScanTaskSetManager get() {
+ return INSTANCE;
+ }
+
+ public <T extends ScanTask> void stageTasks(Table table, String setID, List<T> tasks) {
+ Preconditions.checkArgument(
+ tasks != null && tasks.size() > 0, "Cannot stage null or empty tasks");
+ Pair<String, String> id = toId(table, setID);
+ tasksMap.put(id, tasks);
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T extends ScanTask> List<T> fetchTasks(Table table, String setId) {
+ Pair<String, String> id = toId(table, setId);
+ return (List<T>) tasksMap.get(id);
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T extends ScanTask> List<T> removeTasks(Table table, String setID) {
Review Comment:
nit: `setID` -> `setId`.
##########
spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/source/SparkFilesScan.java:
##########
@@ -32,6 +32,8 @@
import org.apache.iceberg.util.TableScanUtil;
import org.apache.spark.sql.SparkSession;
+/** @deprecated use {@link SparkStagedScan} instead */
Review Comment:
Looks like this was missed.
##########
spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/ScanTaskSetManager.java:
##########
@@ -0,0 +1,80 @@
+/*
+ * 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;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.iceberg.HasTableOperations;
+import org.apache.iceberg.ScanTask;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.TableOperations;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
+import org.apache.iceberg.util.Pair;
+
+public class ScanTaskSetManager {
+
+ private static final ScanTaskSetManager INSTANCE = new ScanTaskSetManager();
+
+ private final Map<Pair<String, String>, List<? extends ScanTask>> tasksMap =
+ Maps.newConcurrentMap();
+
+ private ScanTaskSetManager() {}
+
+ public static ScanTaskSetManager get() {
+ return INSTANCE;
+ }
+
+ public <T extends ScanTask> void stageTasks(Table table, String setID, List<T> tasks) {
Review Comment:
nit: `setID` -> `setId`
--
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.
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
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