Skip to content

Fix compilation issue due to conflicting changes #7147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
srkukarni wants to merge 2 commits into from
Closed

Fix compilation issue due to conflicting changes #7147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
716b64e
Fix compilation issue due to conflicting changes
Jun 2, 2020
64d5d0f
Merge remote-tracking branch 'apache/master' into compile_fix
codelipenghui Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...er/src/test/java/org/apache/pulsar/broker/service/PrecisTopicPublishRateThrottleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void testPrecisTopicPublishRateLimitingDisabled() throws Exception {
PublishRate publishRate = new PublishRate(1,10);
// disable precis topic publish rate limiting
conf.setPreciseTopicPublishRateLimiterEnable(false);
conf.setMaxPendingPublishdRequestsPerConnection(0);
conf.setMaxPendingPublishRequestsPerConnection(0);
super.baseSetup();
final String topic = "persistent://prop/ns-abc/testPrecisTopicPublishRateLimiting";
org.apache.pulsar.client.api.Producer<byte[]> producer = pulsarClient.newProducer()
Expand Down Expand Up @@ -84,7 +84,7 @@ public void testPrecisTopicPublishRateLimitingDisabled() throws Exception {
public void testProducerBlockedByPrecisTopicPublishRateLimiting() throws Exception {
PublishRate publishRate = new PublishRate(1,10);
conf.setPreciseTopicPublishRateLimiterEnable(true);
conf.setMaxPendingPublishdRequestsPerConnection(0);
conf.setMaxPendingPublishRequestsPerConnection(0);
super.baseSetup();
final String topic = "persistent://prop/ns-abc/testPrecisTopicPublishRateLimiting";
org.apache.pulsar.client.api.Producer<byte[]> producer = pulsarClient.newProducer()
Expand Down Expand Up @@ -116,7 +116,7 @@ public void testProducerBlockedByPrecisTopicPublishRateLimiting() throws Excepti
public void testPrecisTopicPublishRateLimitingProduceRefresh() throws Exception {
PublishRate publishRate = new PublishRate(1,10);
conf.setPreciseTopicPublishRateLimiterEnable(true);
conf.setMaxPendingPublishdRequestsPerConnection(0);
conf.setMaxPendingPublishRequestsPerConnection(0);
super.baseSetup();
final String topic = "persistent://prop/ns-abc/testPrecisTopicPublishRateLimiting";
org.apache.pulsar.client.api.Producer<byte[]> producer = pulsarClient.newProducer()
Expand Down
2 changes: 1 addition & 1 deletion pulsar-io/batch/src/main/java/org/apache/pulsar/io/batch/BatchSourceExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.client.api.*;
import org.apache.pulsar.common.io.BatchSourceConfig;
import org.apache.pulsar.common.util.Reflections;
import org.apache.pulsar.functions.api.Record;
import org.apache.pulsar.functions.utils.Actions;
import org.apache.pulsar.functions.utils.FunctionCommon;
import org.apache.pulsar.functions.utils.Reflections;
import org.apache.pulsar.functions.utils.SourceConfigUtils;
import org.apache.pulsar.io.core.*;

Expand Down