BewareMyPower commented on code in PR #19929:
URL: https://github.com/apache/pulsar/pull/19929#discussion_r1160506946
##########
pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java:
##########
@@ -733,11 +734,16 @@ boolean populateMessageSchema(MessageImpl msg,
SendCallback callback) {
completeCallbackAndReleaseSemaphore(msg.getUncompressedSize(),
callback, e);
return false;
}
+
byte[] schemaVersion = schemaCache.get(msg.getSchemaHash());
if (schemaVersion != null) {
- msgMetadataBuilder.setSchemaVersion(schemaVersion);
+ if (schemaVersion != SchemaVersion.Empty.bytes()) {
+ msg.getMessageBuilder().setSchemaVersion(schemaVersion);
Review Comment:
```suggestion
msgMetadataBuilder.setSchemaVersion(schemaVersion);
```
##########
pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerEmptySchemaCacheTest.java:
##########
@@ -0,0 +1,88 @@
+/*
+ * 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.pulsar.client.impl;
+
+import lombok.Cleanup;
+import org.apache.pulsar.client.api.MockBrokerService;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.common.protocol.Commands;
+import org.apache.pulsar.common.protocol.schema.SchemaVersion;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.testng.Assert.assertEquals;
+
+public class ProducerEmptySchemaCacheTest {
Review Comment:
Please add the test group, otherwise this test won't be run in CI.
```java
@Test(groups = "broker-impl")
```
##########
pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerEmptySchemaCacheTest.java:
##########
@@ -0,0 +1,70 @@
+package org.apache.pulsar.client.impl;
+
+import lombok.Cleanup;
+import org.apache.pulsar.client.api.MockBrokerService;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.common.protocol.Commands;
+import org.apache.pulsar.common.protocol.schema.SchemaVersion;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.testng.Assert.assertEquals;
+
+public class ProducerEmptySchemaCacheTest {
+
+ MockBrokerService mockBrokerService;
+
+ @BeforeClass(alwaysRun = true)
+ public void setup() {
+ mockBrokerService = new MockBrokerService();
+ mockBrokerService.start();
+ }
+
+ @AfterClass(alwaysRun = true)
+ public void teardown() {
+ if (mockBrokerService != null) {
Review Comment:
This is a new test. You don't have to copy legacy code. IMO,
`mockBrokerService` could never be `null` in `teardown`. You only need to call
`mockBrokerService.stop()` here.
##########
pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerEmptySchemaCacheTest.java:
##########
@@ -0,0 +1,88 @@
+/*
+ * 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.pulsar.client.impl;
+
+import lombok.Cleanup;
+import org.apache.pulsar.client.api.MockBrokerService;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.common.protocol.Commands;
+import org.apache.pulsar.common.protocol.schema.SchemaVersion;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.testng.Assert.assertEquals;
+
+public class ProducerEmptySchemaCacheTest {
+
+ MockBrokerService mockBrokerService;
+
+ @BeforeClass(alwaysRun = true)
+ public void setup() {
+ mockBrokerService = new MockBrokerService();
+ mockBrokerService.start();
+ }
+
+ @AfterClass(alwaysRun = true)
+ public void teardown() {
+ if (mockBrokerService != null) {
+ mockBrokerService.stop();
+ mockBrokerService = null;
+ }
+ }
+
+ @org.testng.annotations.Test
+ public void testConsumerUnsubscribeReference() throws Exception {
+ @Cleanup
+ PulsarClientImpl client = (PulsarClientImpl) PulsarClient.builder()
+ .serviceUrl(mockBrokerService.getBrokerAddress())
+ .build();
+
+ AtomicLong counter = new AtomicLong(0);
+
+ mockBrokerService.setHandleGetOrCreateSchema((ctx,
commandGetOrCreateSchema) -> {
+ counter.incrementAndGet();
+ ctx.writeAndFlush(
+
Commands.newGetOrCreateSchemaResponse(commandGetOrCreateSchema.getRequestId(),
+ SchemaVersion.Empty));
+ });
+
+ // this schema mode is used in consumer retry and dlq Producer
+ // when the origin consumer has Schema.BYTES schema
+ // and when retry message or dlq message is send
+ // will use typed message builder set Schema.Bytes to send message.
+
+ @Cleanup
+ Producer<byte[]> producer =
client.newProducer(Schema.AUTO_PRODUCE_BYTES(Schema.BYTES))
+ .topic("testAutoProduceBytesSchemaShouldCache")
+ .sendTimeout(5, TimeUnit.SECONDS)
+ .maxPendingMessages(0)
+ .enableBatching(false)
+ .create();
+
+ producer.newMessage(Schema.BYTES).value("hello".getBytes()).send();
+
+
+ assertEquals(counter.get(), 1);
Review Comment:
I reverted the change to `ProducerImpl`, the `counter.get()` is still 1.
Could you explain it?
--
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]
