forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[improve][client]PIP-189: No batching if only one message in batch (a…
…pache#16605) [improve][client]PIP-189: No batching if only one message in batch apache#16605 ### Motivation * See apache#16619 ### Modifications * See apache#16619 * Most of the Modifications are relevant to `BatchMessageContainerImpl` * Of course there are some tests about batching need to be modified, because batched producer can also pubulish non-batched messages when this PIP applies. The tests include: * `RGUsageMTAggrWaitForAllMsgsTest` * `BatchMessageTest` * `BrokerEntryMetadataE2ETest` * `ClientDeduplicationTest` * `TopicReaderTest` * `PulsarClientToolTest`
- Loading branch information
Showing
9 changed files
with
240 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
...-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolForceBatchNum.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /** | ||
| * 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.cli; | ||
|
|
||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.Mockito.doAnswer; | ||
| import static org.mockito.Mockito.doReturn; | ||
| import static org.mockito.Mockito.spy; | ||
| import java.util.Properties; | ||
| import java.util.concurrent.TimeUnit; | ||
| import org.apache.pulsar.client.api.Authentication; | ||
| import org.apache.pulsar.client.api.ClientBuilder; | ||
| import org.apache.pulsar.client.api.MessageId; | ||
| import org.apache.pulsar.client.api.Producer; | ||
| import org.apache.pulsar.client.api.ProducerBuilder; | ||
| import org.apache.pulsar.client.api.Schema; | ||
| import org.apache.pulsar.client.api.TypedMessageBuilder; | ||
| import org.apache.pulsar.client.impl.PulsarClientImpl; | ||
| import org.mockito.stubbing.Answer; | ||
| import org.testng.Assert; | ||
|
|
||
| /** | ||
| * An implement of {@link PulsarClientTool} for test, which will publish messages iff there is enough messages | ||
| * in the batch. | ||
| */ | ||
| public class PulsarClientToolForceBatchNum extends PulsarClientTool{ | ||
| private final String topic; | ||
| private final int batchNum; | ||
|
|
||
| /** | ||
| * | ||
| * @param properties properties | ||
| * @param topic topic | ||
| * @param batchNum iff there is batchNum messages in the batch, the producer will flush and send. | ||
| */ | ||
| public PulsarClientToolForceBatchNum(Properties properties, String topic, int batchNum) { | ||
| super(properties); | ||
| this.topic = topic; | ||
| this.batchNum = batchNum; | ||
| } | ||
|
|
||
| @Override | ||
| protected void initJCommander() { | ||
| super.initJCommander(); | ||
| produceCommand = new CmdProduce() { | ||
| @Override | ||
| public void updateConfig(ClientBuilder newBuilder, Authentication authentication, String serviceURL) { | ||
| try { | ||
| super.updateConfig(mockClientBuilder(newBuilder), authentication, serviceURL); | ||
| } catch (Exception e) { | ||
| Assert.fail("update config fail " + e.getMessage()); | ||
| } | ||
| } | ||
| }; | ||
| jcommander.addCommand("produce", produceCommand); | ||
| } | ||
|
|
||
| private ClientBuilder mockClientBuilder(ClientBuilder newBuilder) throws Exception { | ||
| PulsarClientImpl client = (PulsarClientImpl) newBuilder.build(); | ||
| ProducerBuilder<byte[]> producerBuilder = client.newProducer() | ||
| .batchingMaxBytes(Integer.MAX_VALUE) | ||
| .batchingMaxMessages(batchNum) | ||
| .batchingMaxPublishDelay(Long.MAX_VALUE, TimeUnit.MILLISECONDS) | ||
| .topic(topic); | ||
| Producer<byte[]> producer = producerBuilder.create(); | ||
|
|
||
| PulsarClientImpl mockClient = spy(client); | ||
| ProducerBuilder<byte[]> mockProducerBuilder = spy(producerBuilder); | ||
| Producer<byte[]> mockProducer = spy(producer); | ||
| ClientBuilder mockClientBuilder = spy(newBuilder); | ||
|
|
||
| doAnswer((Answer<TypedMessageBuilder>) invocation -> { | ||
| TypedMessageBuilder typedMessageBuilder = spy((TypedMessageBuilder) invocation.callRealMethod()); | ||
| doAnswer((Answer<MessageId>) invocation1 -> { | ||
| TypedMessageBuilder mock = ((TypedMessageBuilder) invocation1.getMock()); | ||
| // using sendAsync() to replace send() | ||
| mock.sendAsync(); | ||
| return null; | ||
| }).when(typedMessageBuilder).send(); | ||
| return typedMessageBuilder; | ||
| }).when(mockProducer).newMessage(); | ||
|
|
||
| doReturn(mockProducer).when(mockProducerBuilder).create(); | ||
| doReturn(mockProducerBuilder).when(mockClient).newProducer(any(Schema.class)); | ||
| doReturn(mockClient).when(mockClientBuilder).build(); | ||
| return mockClientBuilder; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.