amogh-jahagirdar commented on code in PR #11369:
URL: https://github.com/apache/iceberg/pull/11369#discussion_r1859891750
##########
core/src/main/java/org/apache/iceberg/ContentFileParser.java:
##########
@@ -48,6 +48,97 @@ class ContentFileParser {
private ContentFileParser() {}
+ public static void unboundContentFileToJson(
+ ContentFile<?> contentFile, PartitionSpec spec, JsonGenerator generator)
throws IOException {
+ Preconditions.checkArgument(contentFile != null, "Invalid content file:
null");
+ Preconditions.checkArgument(spec != null, "Invalid partition spec: null");
+ Preconditions.checkArgument(generator != null, "Invalid JSON generator:
null");
+ Preconditions.checkArgument(
+ contentFile.specId() == spec.specId(),
+ "Invalid partition spec id from content file: expected = %s, actual =
%s",
+ spec.specId(),
+ contentFile.specId());
+
+ generator.writeStartObject();
+ // ignore the ordinal position (ContentFile#pos) of the file in a manifest,
+ // as it isn't used and BaseFile constructor doesn't support it.
Review Comment:
Don't think we need this comment, we can remove it
##########
core/src/main/java/org/apache/iceberg/RESTFileScanTaskParser.java:
##########
@@ -0,0 +1,89 @@
+/*
+ * 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;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+import org.apache.iceberg.expressions.Expression;
+import org.apache.iceberg.expressions.ExpressionParser;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList;
+import org.apache.iceberg.relocated.com.google.common.collect.Sets;
+import org.apache.iceberg.util.JsonUtil;
+
+public class RESTFileScanTaskParser {
Review Comment:
On second look, shouldn't this be in the REST package?
##########
core/src/main/java/org/apache/iceberg/rest/requests/PlanTableScanRequestParser.java:
##########
@@ -0,0 +1,126 @@
+/*
+ * 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.rest.requests;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import java.util.List;
+import org.apache.iceberg.expressions.Expression;
+import org.apache.iceberg.expressions.ExpressionParser;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.util.JsonUtil;
+
+public class PlanTableScanRequestParser {
+ private static final String SNAPSHOT_ID = "snapshot-id";
+ private static final String SELECT = "select";
+ private static final String FILTER = "filter";
+ private static final String CASE_SENSITIVE = "case-sensitive";
+ private static final String USE_SNAPSHOT_SCHEMA = "use-snapshot-schema";
+ private static final String START_SNAPSHOT_ID = "start-snapshot-id";
+ private static final String END_SNAPSHOT_ID = "end-snapshot-id";
+ private static final String STATS_FIELDS = "stats-fields";
+
+ private PlanTableScanRequestParser() {}
+
+ public static String toJson(PlanTableScanRequest request) {
+ return toJson(request, false);
+ }
+
+ public static String toJson(PlanTableScanRequest request, boolean pretty) {
+ return JsonUtil.generate(gen -> toJson(request, gen), pretty);
+ }
+
+ @SuppressWarnings("checkstyle:CyclomaticComplexity")
+ public static void toJson(PlanTableScanRequest request, JsonGenerator gen)
throws IOException {
+ Preconditions.checkArgument(null != request, "Invalid plan table scan
request: null");
+
+ gen.writeStartObject();
+ if (request.snapshotId() != null) {
+ gen.writeNumberField(SNAPSHOT_ID, request.snapshotId());
+ }
+
+ if (request.startSnapshotId() != null) {
+ gen.writeNumberField(START_SNAPSHOT_ID, request.startSnapshotId());
+ }
+
+ if (request.endSnapshotId() != null) {
+ gen.writeNumberField(END_SNAPSHOT_ID, request.endSnapshotId());
+ }
Review Comment:
On second look, the way this is written is a bit confusing after reading
again since on the surface it seems like it's possible serializing
snapshotId/startingSnapshotId/endSnapshotID even though it's either a point in
time scan or an incremental scan. To be clear, I know that validate checks
this, I'm more so talking about how a reader would interpret this code.
concretely I'd recommend replacing this with:
````
private void serializeSnapshotIdForScan(JsonGenerator gen, request) {
if (request.snapshotId() != null) {
gen.writeNumberField(SNAPSHOT_ID, request.snapshotId());
} else {
gen.writeNumberField(START_SNAPSHOT_ID, request.startSnapshotId());
gen.writeNumberField(END_SNAPSHOT_ID, request.endSnapshotId());
}
}
````
I think then you'd also be able to get rid of cyclomatic complexity override
above.
##########
core/src/main/java/org/apache/iceberg/rest/requests/FetchScanTasksRequest.java:
##########
@@ -0,0 +1,67 @@
+/*
+ * 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.rest.requests;
+
+import org.apache.iceberg.relocated.com.google.common.base.MoreObjects;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.rest.RESTRequest;
+
+@SuppressWarnings("checkstyle:VisibilityModifier")
Review Comment:
Do we need this?
##########
api/src/main/java/org/apache/iceberg/exceptions/EntityNotFoundException.java:
##########
@@ -0,0 +1,34 @@
+/*
+ * 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.exceptions;
+
+import com.google.errorprone.annotations.FormatMethod;
+
+/** Exception raised when an entity is not found. */
+public class EntityNotFoundException extends RESTException implements
CleanableFailure {
Review Comment:
I'd say let's remove this for now since at the moment it's not being used, I
think it's something we can add once there's clarity on how it would get used.
--
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-unsubscr...@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For additional commands, e-mail: issues-h...@iceberg.apache.org
