stevenzwu commented on code in PR #6934:
URL: https://github.com/apache/iceberg/pull/6934#discussion_r1175617735
##########
core/src/main/java/org/apache/iceberg/BaseContentScanTask.java:
##########
@@ -52,12 +53,24 @@ public F file() {
return file;
}
+ protected Schema schema() {
Review Comment:
agree it is a little odd. On the other hand, partition spec is in the same
model in this class. As you said, otherwise we would have to change the
constructors of a bunch of classes. The current choice of passing schema and
spec as strings is to make those scan tasks serializable.
```
@Override
public PartitionSpec spec() {
if (spec == null) {
synchronized (this) {
if (spec == null) {
this.spec = PartitionSpecParser.fromJson(schema(), specString);
}
}
}
return spec;
}
```
cc @nastra
##########
core/src/main/java/org/apache/iceberg/ContentFileParser.java:
##########
@@ -0,0 +1,274 @@
+/*
+ * 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.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.util.JsonUtil;
+
+class ContentFileParser {
+ private static final String SPEC_ID = "spec-id";
+ private static final String CONTENT = "content";
+ private static final String FILE_PATH = "file-path";
+ private static final String FILE_FORMAT = "file-format";
+ private static final String PARTITION = "partition";
+ private static final String RECORD_COUNT = "record-count";
+ private static final String FILE_SIZE = "file-size-in-bytes";
+ private static final String COLUMN_SIZES = "column-sizes";
+ private static final String VALUE_COUNTS = "value-counts";
+ private static final String NULL_VALUE_COUNTS = "null-value-counts";
+ private static final String NAN_VALUE_COUNTS = "nan-value-counts";
+ private static final String LOWER_BOUNDS = "lower-bounds";
+ private static final String UPPER_BOUNDS = "upper-bounds";
+ private static final String KEY_METADATA = "key-metadata";
+ private static final String SPLIT_OFFSETS = "split-offsets";
+ private static final String EQUALITY_IDS = "equality-ids";
+ private static final String SORT_ORDER_ID = "sort-order-id";
+
+ private ContentFileParser() {}
+
+ private static boolean hasPartitionData(StructLike partitionData) {
+ return partitionData != null && partitionData.size() > 0;
+ }
+
+ static String toJson(ContentFile<?> contentFile, PartitionSpec spec) {
+ return JsonUtil.generate(
+ generator -> ContentFileParser.toJson(contentFile, spec, generator),
false);
+ }
+
+ static void toJson(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");
+
+ 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.
+
+ Preconditions.checkArgument(
+ contentFile.specId() == spec.specId(),
+ "Invalid partition spec id from content file: expected = %s, actual =
%s",
+ spec.specId(),
+ contentFile.specId());
+ generator.writeNumberField(SPEC_ID, contentFile.specId());
+
+ generator.writeStringField(CONTENT, contentFile.content().name());
+ generator.writeStringField(FILE_PATH, contentFile.path().toString());
+ generator.writeStringField(FILE_FORMAT, contentFile.format().name());
+
+ Preconditions.checkArgument(
+ spec.isPartitioned() == hasPartitionData(contentFile.partition()),
+ "Invalid partition data from content file: expected = %s, actual = %s",
+ spec.isPartitioned() ? "partitioned" : "unpartitioned",
+ hasPartitionData(contentFile.partition()) ? "partitioned" :
"unpartitioned");
+ if (contentFile.partition() != null) {
+ generator.writeFieldName(PARTITION);
+ SingleValueParser.toJson(spec.partitionType(), contentFile.partition(),
generator);
+ }
+
+ generator.writeNumberField(RECORD_COUNT, contentFile.recordCount());
Review Comment:
good catch
##########
core/src/main/java/org/apache/iceberg/ContentFileParser.java:
##########
@@ -0,0 +1,274 @@
+/*
+ * 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.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.util.JsonUtil;
+
+class ContentFileParser {
+ private static final String SPEC_ID = "spec-id";
+ private static final String CONTENT = "content";
+ private static final String FILE_PATH = "file-path";
+ private static final String FILE_FORMAT = "file-format";
+ private static final String PARTITION = "partition";
+ private static final String RECORD_COUNT = "record-count";
+ private static final String FILE_SIZE = "file-size-in-bytes";
+ private static final String COLUMN_SIZES = "column-sizes";
+ private static final String VALUE_COUNTS = "value-counts";
+ private static final String NULL_VALUE_COUNTS = "null-value-counts";
+ private static final String NAN_VALUE_COUNTS = "nan-value-counts";
+ private static final String LOWER_BOUNDS = "lower-bounds";
+ private static final String UPPER_BOUNDS = "upper-bounds";
+ private static final String KEY_METADATA = "key-metadata";
+ private static final String SPLIT_OFFSETS = "split-offsets";
+ private static final String EQUALITY_IDS = "equality-ids";
+ private static final String SORT_ORDER_ID = "sort-order-id";
+
+ private ContentFileParser() {}
+
+ private static boolean hasPartitionData(StructLike partitionData) {
+ return partitionData != null && partitionData.size() > 0;
+ }
+
+ static String toJson(ContentFile<?> contentFile, PartitionSpec spec) {
+ return JsonUtil.generate(
+ generator -> ContentFileParser.toJson(contentFile, spec, generator),
false);
+ }
+
+ static void toJson(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");
+
+ 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.
+
+ Preconditions.checkArgument(
+ contentFile.specId() == spec.specId(),
+ "Invalid partition spec id from content file: expected = %s, actual =
%s",
+ spec.specId(),
+ contentFile.specId());
+ generator.writeNumberField(SPEC_ID, contentFile.specId());
+
+ generator.writeStringField(CONTENT, contentFile.content().name());
+ generator.writeStringField(FILE_PATH, contentFile.path().toString());
+ generator.writeStringField(FILE_FORMAT, contentFile.format().name());
+
+ Preconditions.checkArgument(
+ spec.isPartitioned() == hasPartitionData(contentFile.partition()),
+ "Invalid partition data from content file: expected = %s, actual = %s",
+ spec.isPartitioned() ? "partitioned" : "unpartitioned",
+ hasPartitionData(contentFile.partition()) ? "partitioned" :
"unpartitioned");
+ if (contentFile.partition() != null) {
+ generator.writeFieldName(PARTITION);
+ SingleValueParser.toJson(spec.partitionType(), contentFile.partition(),
generator);
+ }
+
+ generator.writeNumberField(RECORD_COUNT, contentFile.recordCount());
+ generator.writeNumberField(FILE_SIZE, contentFile.fileSizeInBytes());
+
+ metricsToJson(contentFile, generator);
+
+ if (contentFile.keyMetadata() != null) {
+ generator.writeFieldName(KEY_METADATA);
+ SingleValueParser.toJson(DataFile.KEY_METADATA.type(),
contentFile.keyMetadata(), generator);
+ }
+
+ if (contentFile.splitOffsets() != null) {
+ generator.writeFieldName(SPLIT_OFFSETS);
+ SingleValueParser.toJson(
Review Comment:
sure. will switch to `JsonUtil.write...` when applicable
##########
core/src/main/java/org/apache/iceberg/ContentFileParser.java:
##########
@@ -0,0 +1,274 @@
+/*
+ * 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.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.util.JsonUtil;
+
+class ContentFileParser {
+ private static final String SPEC_ID = "spec-id";
+ private static final String CONTENT = "content";
+ private static final String FILE_PATH = "file-path";
+ private static final String FILE_FORMAT = "file-format";
+ private static final String PARTITION = "partition";
+ private static final String RECORD_COUNT = "record-count";
+ private static final String FILE_SIZE = "file-size-in-bytes";
+ private static final String COLUMN_SIZES = "column-sizes";
+ private static final String VALUE_COUNTS = "value-counts";
+ private static final String NULL_VALUE_COUNTS = "null-value-counts";
+ private static final String NAN_VALUE_COUNTS = "nan-value-counts";
+ private static final String LOWER_BOUNDS = "lower-bounds";
+ private static final String UPPER_BOUNDS = "upper-bounds";
+ private static final String KEY_METADATA = "key-metadata";
+ private static final String SPLIT_OFFSETS = "split-offsets";
+ private static final String EQUALITY_IDS = "equality-ids";
+ private static final String SORT_ORDER_ID = "sort-order-id";
+
+ private ContentFileParser() {}
+
+ private static boolean hasPartitionData(StructLike partitionData) {
+ return partitionData != null && partitionData.size() > 0;
+ }
+
+ static String toJson(ContentFile<?> contentFile, PartitionSpec spec) {
+ return JsonUtil.generate(
+ generator -> ContentFileParser.toJson(contentFile, spec, generator),
false);
+ }
+
+ static void toJson(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");
+
+ 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.
+
+ Preconditions.checkArgument(
Review Comment:
sure
--
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
