sjvanrossum commented on code in PR #31608:
URL: https://github.com/apache/beam/pull/31608#discussion_r2063698292
##########
sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIO.java:
##########
@@ -1710,51 +1735,47 @@ public void startBundle(StartBundleContext c) throws
IOException {
public void processElement(@Element PubsubMessage message, @Timestamp
Instant timestamp)
throws IOException, SizeLimitExceededException {
// Validate again here just as a sanity check.
+ // TODO(sjvanrossum): https://github.com/apache/beam/issues/31800
+ // - Size validation makes no distinction between JSON and Protobuf
encoding
+ // - Accounting for HTTP to gRPC transcoding is non-trivial
PreparePubsubWriteDoFn.validatePubsubMessageSize(message,
maxPublishBatchByteSize);
- byte[] payload = message.getPayload();
- int messageSize = payload.length;
-
- PubsubTopic pubsubTopic;
+ // NOTE: The record id is always null.
Review Comment:
```suggestion
// NOTE: The record id is always null since it will be assigned by
Pub/Sub.
```
##########
sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubUnboundedSink.java:
##########
@@ -220,6 +234,16 @@ public void populateDisplayData(DisplayData.Builder
builder) {
/** Publish messages to Pubsub in batches. */
@VisibleForTesting
static class WriterFn extends DoFn<Iterable<OutgoingMessage>, Void> {
+ private class OutgoingData {
+ int bytes;
+ List<OutgoingMessage> messages;
+
+ OutgoingData() {
+ this.bytes = 0;
+ this.messages = new ArrayList<>(publishBatchSize);
Review Comment:
SGTM
```suggestion
this.messages = new ArrayList<>();
```
##########
sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubMessageSchemaCoder.java:
##########
@@ -0,0 +1,90 @@
+/*
+ * 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.beam.sdk.io.gcp.pubsub;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.beam.sdk.schemas.Schema;
+import org.apache.beam.sdk.schemas.SchemaCoder;
+import org.apache.beam.sdk.transforms.SerializableFunction;
+import org.apache.beam.sdk.values.Row;
+import org.apache.beam.sdk.values.TypeDescriptor;
+import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions;
+
+/**
+ * Provides a {@link SchemaCoder} for {@link PubsubMessage}, including the
topic and all fields of a
+ * PubSub message from server.
+ *
+ * <p>{@link SchemaCoder} is used so that fields can be added in the future
without breaking update
+ * compatibility.
+ */
+public class PubsubMessageSchemaCoder {
+ private static final Schema PUBSUB_MESSAGE_SCHEMA =
+ Schema.builder()
+ .addByteArrayField("payload")
+ .addNullableStringField("topic")
+ .addNullableMapField("attributes", Schema.FieldType.STRING,
Schema.FieldType.STRING)
+ .addNullableStringField("message_id")
+ .addNullableStringField("ordering_key")
+ .build();
+
+ private static final SerializableFunction<PubsubMessage, Row> TO_ROW =
+ (PubsubMessage message) -> {
+ Map<String, Object> fieldValues = new HashMap<>();
+ fieldValues.put("payload", message.getPayload());
+
+ String topic = message.getTopic();
+ if (topic != null) {
+ fieldValues.put("topic", topic);
+ }
+ Map<String, String> attributeMap = message.getAttributeMap();
+ if (attributeMap != null) {
+ fieldValues.put("attributes", attributeMap);
+ }
+ String messageId = message.getMessageId();
+ if (messageId != null) {
+ fieldValues.put("message_id", messageId);
+ }
+ String orderingKey = message.getOrderingKey();
+ if (orderingKey != null) {
+ fieldValues.put("ordering_key", orderingKey);
+ }
+ return
Row.withSchema(PUBSUB_MESSAGE_SCHEMA).withFieldValues(fieldValues).build();
+ };
+
+ private static final SerializableFunction<Row, PubsubMessage> FROM_ROW =
+ (Row row) -> {
+ PubsubMessage message =
+ new PubsubMessage(
+ Preconditions.checkNotNull(row.getBytes("payload")),
+ row.getMap("attributes"),
+ row.getString("message_id"),
+ row.getString("ordering_key"));
+
+ String topic = row.getString("topic");
Review Comment:
```suggestion
@Nullable String topic = row.getString("topic");
```
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
