This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 30e4098 Fix some spelling typos (#2385)
30e4098 is described below
commit 30e40989ebc21b6fe29cf1c503f34f33de068ac5
Author: Jia Zhai <[email protected]>
AuthorDate: Fri Aug 17 23:49:17 2018 +0800
Fix some spelling typos (#2385)
* fix some typos
* change Faild to Failed
---
.../loadbalance/impl/ModularLoadManagerImpl.java | 2 +-
.../org/apache/pulsar/broker/service/Consumer.java | 2 +-
.../broker/namespace/NamespaceServiceTest.java | 12 ++++++------
.../SubscriptionMessageDispatchThrottlingTest.java | 2 +-
pulsar-client-cpp/perf/PerfProducer.cc | 2 +-
pulsar-client-cpp/perf/RateLimiter.h | 10 +++++-----
pulsar-client-go/pulsar/client.go | 2 +-
.../org/apache/pulsar/admin/cli/CmdNamespaces.java | 22 +++++++++++-----------
.../apache/pulsar/client/api/ClientBuilder.java | 2 +-
.../pulsar/client/api/ClientConfiguration.java | 2 +-
.../org/apache/pulsar/client/impl/ClientCnx.java | 4 ++--
.../apache/pulsar/client/impl/ConsumerImpl.java | 2 +-
.../apache/pulsar/client/impl/ProducerImpl.java | 2 +-
.../org/apache/pulsar/common/util/RateLimiter.java | 22 +++++++++++-----------
site2/website/static/js/pjax-api.min.js | 2 +-
15 files changed, 45 insertions(+), 45 deletions(-)
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
index 714389f..1c36992 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
@@ -658,7 +658,7 @@ public class ModularLoadManagerImpl implements
ModularLoadManager, ZooKeeperCach
.canSplitBundle(namespaceBundleFactory.getBundle(namespaceName, bundleRange))) {
continue;
}
- log.info("Load-manager splitting budnle {} and unloading
{}", bundleName, unloadSplitBundles);
+ log.info("Load-manager splitting bundle {} and unloading
{}", bundleName, unloadSplitBundles);
pulsar.getAdminClient().namespaces().splitNamespaceBundle(namespaceName,
bundleRange,
unloadSplitBundles);
// Make sure the same bundle is not selected again.
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
index 4c54018..883bf55 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
@@ -449,7 +449,7 @@ public class Consumer {
}
if (log.isDebugEnabled()) {
- log.debug("[{}-{}] Added more flow control message permits {} (old
was: {}), blocked = ", topicName,
+ log.debug("[{}-{}] Added more flow control message permits {} (old
was: {}), blocked = {} ", topicName,
subscription, additionalNumberOfMessages, oldPermits,
blockedConsumerOnUnackedMsgs);
}
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
index 2c51e16..0399548 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
@@ -115,7 +115,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
result.get();
} catch (Exception e) {
// make sure: no failure
- fail("split bundle faild", e);
+ fail("split bundle failed", e);
}
NamespaceBundleFactory bundleFactory =
this.pulsar.getNamespaceService().getNamespaceBundleFactory();
NamespaceBundles updatedNsBundles = bundleFactory.getBundles(nsname);
@@ -194,7 +194,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
result.get();
} catch (Exception e) {
// make sure: no failure
- fail("split bundle faild", e);
+ fail("split bundle failed", e);
}
// old bundle should be removed from status-map
@@ -385,7 +385,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
result.get();
} catch (Exception e) {
// make sure: no failure
- fail("split bundle faild", e);
+ fail("split bundle failed", e);
}
NamespaceBundleFactory bundleFactory =
this.pulsar.getNamespaceService().getNamespaceBundleFactory();
NamespaceBundles updatedNsBundles = bundleFactory.getBundles(nsname);
@@ -448,7 +448,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
try {
result1.get();
} catch (Exception e) {
- fail("split bundle faild", e);
+ fail("split bundle failed", e);
}
NamespaceBundles updatedNsBundles =
namespaceService.getNamespaceBundleFactory().getBundles(nsname);
@@ -459,7 +459,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
try {
ownershipCache.removeOwnership(bundle).get();
} catch (Exception e) {
- fail("faild to remove ownership", e);
+ fail("failed to remove ownership", e);
}
});
@@ -468,7 +468,7 @@ public class NamespaceServiceTest extends BrokerTestBase {
result2.get();
} catch (Exception e) {
// make sure: NPE does not occur
- fail("split bundle faild", e);
+ fail("split bundle failed", e);
}
}
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SubscriptionMessageDispatchThrottlingTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SubscriptionMessageDispatchThrottlingTest.java
index 04494d1..b4b60af 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SubscriptionMessageDispatchThrottlingTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SubscriptionMessageDispatchThrottlingTest.java
@@ -111,7 +111,7 @@ public class SubscriptionMessageDispatchThrottlingTest
extends MessageDispatchTh
producer.send(new byte[80]);
}
- // consumer should not have received all publihsed message due to
message-rate throttling
+ // consumer should not have received all published message due to
message-rate throttling
Assert.assertTrue(totalReceived.get() < messageRate * 2);
consumer.close();
diff --git a/pulsar-client-cpp/perf/PerfProducer.cc
b/pulsar-client-cpp/perf/PerfProducer.cc
index 859d4bd..596afd5 100644
--- a/pulsar-client-cpp/perf/PerfProducer.cc
+++ b/pulsar-client-cpp/perf/PerfProducer.cc
@@ -145,7 +145,7 @@ void runProducer(const Arguments& args, std::string
topicName, int threadIndex,
try {
while (true) {
if (args.rate != -1) {
- limiter->aquire();
+ limiter->acquire();
}
pulsar::Message msg =
builder.create().setAllocatedContent(payload.get(), args.msgSize).build();
diff --git a/pulsar-client-cpp/perf/RateLimiter.h
b/pulsar-client-cpp/perf/RateLimiter.h
index 90aeb0f..5fa8f81 100644
--- a/pulsar-client-cpp/perf/RateLimiter.h
+++ b/pulsar-client-cpp/perf/RateLimiter.h
@@ -29,9 +29,9 @@ class RateLimiter {
public:
RateLimiter(double rate);
- void aquire();
+ void acquire();
- void aquire(int permits);
+ void acquire(int permits);
private:
RateLimiter(const RateLimiter&);
@@ -54,11 +54,11 @@ RateLimiter::RateLimiter(double rate)
assert(rate < 1e6 && "Exceeded maximum rate");
}
-void RateLimiter::aquire() {
- aquire(1);
+void RateLimiter::acquire() {
+ acquire(1);
}
-void RateLimiter::aquire(int permits) {
+void RateLimiter::acquire(int permits) {
Clock::time_point now = Clock::now();
Lock lock(mutex_);
diff --git a/pulsar-client-go/pulsar/client.go
b/pulsar-client-go/pulsar/client.go
index 8d0b6e6..777b7cd 100644
--- a/pulsar-client-go/pulsar/client.go
+++ b/pulsar-client-go/pulsar/client.go
@@ -49,7 +49,7 @@ type ClientOptions struct {
// Set the operation timeout (default: 30 seconds)
// Producer-create, subscribe and unsubscribe operations will be
retried until this interval, after which the
- // operation will be maked as failed
+ // operation will be marked as failed
OperationTimeoutSeconds time.Duration
// Set the number of threads to be used for message listeners (default:
1 thread)
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java
index 341b249..8a86aac 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java
@@ -93,7 +93,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Get the configuration policies of a
namspace")
+ @Parameters(commandDescription = "Get the configuration policies of a
namespace")
private class GetPolicies extends CliCommand {
@Parameter(description = "tenant/namespace\n", required = true)
private java.util.List<String> params;
@@ -162,7 +162,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Grant permissions on a namspace")
+ @Parameters(commandDescription = "Grant permissions on a namespace")
private class GrantPermissions extends CliCommand {
@Parameter(description = "tenant/namespace", required = true)
private java.util.List<String> params;
@@ -180,7 +180,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Revoke permissions on a namspace")
+ @Parameters(commandDescription = "Revoke permissions on a namespace")
private class RevokePermissions extends CliCommand {
@Parameter(description = "tenant/namespace", required = true)
private java.util.List<String> params;
@@ -195,7 +195,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Get the permissions on a namspace")
+ @Parameters(commandDescription = "Get the permissions on a namespace")
private class Permissions extends CliCommand {
@Parameter(description = "tenant/namespace\n", required = true)
private java.util.List<String> params;
@@ -207,7 +207,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Set replication clusters for a namspace")
+ @Parameters(commandDescription = "Set replication clusters for a
namespace")
private class SetReplicationClusters extends CliCommand {
@Parameter(description = "tenant/namespace", required = true)
private java.util.List<String> params;
@@ -224,7 +224,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Get replication clusters for a namspace")
+ @Parameters(commandDescription = "Get replication clusters for a
namespace")
private class GetReplicationClusters extends CliCommand {
@Parameter(description = "tenant/namespace\n", required = true)
private java.util.List<String> params;
@@ -236,7 +236,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Set Message TTL for a namspace")
+ @Parameters(commandDescription = "Set Message TTL for a namespace")
private class SetMessageTTL extends CliCommand {
@Parameter(description = "tenant/namespace", required = true)
private java.util.List<String> params;
@@ -251,7 +251,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Set Anti-affinity group name for a
namspace")
+ @Parameters(commandDescription = "Set Anti-affinity group name for a
namespace")
private class SetAntiAffinityGroup extends CliCommand {
@Parameter(description = "tenant/namespace", required = true)
private java.util.List<String> params;
@@ -266,7 +266,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Get Anti-affinity group name for a
namspace")
+ @Parameters(commandDescription = "Get Anti-affinity group name for a
namespace")
private class GetAntiAffinityGroup extends CliCommand {
@Parameter(description = "tenant/namespace\n", required = true)
private java.util.List<String> params;
@@ -297,7 +297,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Remove Anti-affinity group name for a
namspace")
+ @Parameters(commandDescription = "Remove Anti-affinity group name for a
namespace")
private class DeleteAntiAffinityGroup extends CliCommand {
@Parameter(description = "tenant/namespace\n", required = true)
private java.util.List<String> params;
@@ -374,7 +374,7 @@ public class CmdNamespaces extends CmdBase {
}
}
- @Parameters(commandDescription = "Get message TTL for a namspace")
+ @Parameters(commandDescription = "Get message TTL for a namespace")
private class GetMessageTTL extends CliCommand {
@Parameter(description = "tenant/namespace\n", required = true)
private java.util.List<String> params;
diff --git
a/pulsar-client/src/main/java/org/apache/pulsar/client/api/ClientBuilder.java
b/pulsar-client/src/main/java/org/apache/pulsar/client/api/ClientBuilder.java
index 14f595f..8aff26f 100644
---
a/pulsar-client/src/main/java/org/apache/pulsar/client/api/ClientBuilder.java
+++
b/pulsar-client/src/main/java/org/apache/pulsar/client/api/ClientBuilder.java
@@ -173,7 +173,7 @@ public interface ClientBuilder extends Cloneable {
* Set the operation timeout <i>(default: 30 seconds)</i>
* <p>
* Producer-create, subscribe and unsubscribe operations will be retried
until this interval, after which the
- * operation will be maked as failed
+ * operation will be marked as failed
*
* @param operationTimeout
* operation timeout
diff --git
a/pulsar-client/src/main/java/org/apache/pulsar/client/api/ClientConfiguration.java
b/pulsar-client/src/main/java/org/apache/pulsar/client/api/ClientConfiguration.java
index 5860cd3..a2213b3 100644
---
a/pulsar-client/src/main/java/org/apache/pulsar/client/api/ClientConfiguration.java
+++
b/pulsar-client/src/main/java/org/apache/pulsar/client/api/ClientConfiguration.java
@@ -140,7 +140,7 @@ public class ClientConfiguration implements Serializable {
* Set the operation timeout <i>(default: 30 seconds)</i>
* <p>
* Producer-create, subscribe and unsubscribe operations will be retried
until this interval, after which the
- * operation will be maked as failed
+ * operation will be marked as failed
*
* @param operationTimeout
* operation timeout
diff --git
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
index 887a890..02443cc 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
@@ -710,7 +710,7 @@ public class ClientCnx extends PulsarHandler {
*/
private void checkServerError(ServerError error, String errMsg) {
if (ServerError.ServiceNotReady.equals(error)) {
- log.error("{} Close connection becaues received internal-server
error {}", ctx.channel(), errMsg);
+ log.error("{} Close connection because received internal-server
error {}", ctx.channel(), errMsg);
ctx.close();
} else if (ServerError.TooManyRequests.equals(error)) {
long rejectedRequests =
NUMBER_OF_REJECTED_REQUESTS_UPDATER.getAndIncrement(this);
@@ -719,7 +719,7 @@ public class ClientCnx extends PulsarHandler {
eventLoopGroup.schedule(() ->
NUMBER_OF_REJECTED_REQUESTS_UPDATER.set(ClientCnx.this, 0),
rejectedRequestResetTimeSec, TimeUnit.SECONDS);
} else if (rejectedRequests >=
maxNumberOfRejectedRequestPerConnection) {
- log.error("{} Close connection becaues received {} rejected
request in {} seconds ", ctx.channel(),
+ log.error("{} Close connection because received {} rejected
request in {} seconds ", ctx.channel(),
NUMBER_OF_REJECTED_REQUESTS_UPDATER.get(ClientCnx.this),
rejectedRequestResetTimeSec);
ctx.close();
}
diff --git
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
index 1c69c75..3e94724 100644
---
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
+++
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
@@ -307,7 +307,7 @@ public class ConsumerImpl<T> extends ConsumerBase<T>
implements ConnectionHandle
Message<T> message;
try {
- // is cnx is null or if the connection breaks the connectionOpened
function will send the flow again
+ // if cnx is null or if the connection breaks the connectionOpened
function will send the flow again
waitingOnReceiveForZeroQueueSize = true;
synchronized (this) {
if (isConnected()) {
diff --git
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
index 12a49c0..c3428e2 100644
---
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
+++
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
@@ -713,7 +713,7 @@ public class ProducerImpl<T> extends ProducerBase<T>
implements TimerTask, Conne
semaphore.release(op.numMessagesInBatch);
try {
op.callback.sendComplete(
- new
PulsarClientException.ChecksumException("Checksum failded on corrupt message"));
+ new
PulsarClientException.ChecksumException("Checksum failed on corrupt message"));
} catch (Throwable t) {
log.warn("[{}] [{}] Got exception while completing the
callback for msg {}:", topic,
producerName, sequenceId, t);
diff --git
a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimiter.java
b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimiter.java
index 518453e..177d240 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimiter.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/RateLimiter.java
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
import com.google.common.base.MoreObjects;
/**
- *
+ *
* A Rate Limiter that distributes permits at a configurable rate. Each {@link
#acquire()} blocks if necessary until a
* permit is available, and then takes it. Each {@link #tryAcquire()} tries to
acquire permits from available permits,
* it returns true if it succeed else returns false. Rate limiter release
configured permits at every configured rate
@@ -43,14 +43,14 @@ import com.google.common.base.MoreObjects;
* <li><b>Per second rate-limiting:</b> Per second rate-limiting not satisfied
by Guava-RateLimiter
* <p>
* <b>Guava RateLimiter:</b> For X permits: it releases X/1000 permits every
msec. therefore, for permits=2/sec => it
- * release 1st permit on first 500msec and 2nd permit on next 500ms. therfore,
if 2 request comes with in 500msec
+ * release 1st permit on first 500msec and 2nd permit on next 500ms.
therefore, if 2 request comes with in 500msec
* duration then 2nd request fails to acquire permit though we have configured
2 permits/second.
* <p>
* <b>RateLimiter:</b> it releases X permits every second. so, in above
usecase: if 2 requests comes at the same time
* then both will acquire the permit.
* <li><b>Faster: </b>RateLimiter is light-weight and faster than
Guava-RateLimiter</li>
* </ul>
- *
+ *
*
*/
public class RateLimiter implements AutoCloseable{
@@ -109,7 +109,7 @@ public class RateLimiter implements AutoCloseable{
/**
* Acquires the given number of permits from this {@code RateLimiter},
blocking until the request be granted.
- *
+ *
* This method is equivalent to {@code acquire(1)}.
*
* @param permits
@@ -188,8 +188,8 @@ public class RateLimiter implements AutoCloseable{
/**
* Return available permits for this {@link RateLimiter}
- *
- * @return returns 0 if permis is not available
+ *
+ * @return returns 0 if permits is not available
*/
public synchronized long getAvailablePermits() {
return Math.max(0, this.permits - this.acquiredPermits);
@@ -197,7 +197,7 @@ public class RateLimiter implements AutoCloseable{
/**
* Resets new rate by configuring new value for permits per configured
rate-period
- *
+ *
* @param permits
*/
public synchronized void setRate(long permits) {
@@ -206,7 +206,7 @@ public class RateLimiter implements AutoCloseable{
/**
* Resets new rate with new permits and rate-time.
- *
+ *
* @param permits
* @param rateTime
* @param timeUnit
@@ -220,10 +220,10 @@ public class RateLimiter implements AutoCloseable{
this.timeUnit = timeUnit;
this.renewTask = createTask();
}
-
+
/**
* Returns configured permit rate per pre-configured rate-period.
- *
+ *
* @return rate
*/
public synchronized long getRate() {
@@ -258,4 +258,4 @@ public class RateLimiter implements AutoCloseable{
.add("acquiredPermits", acquiredPermits).toString();
}
-}
\ No newline at end of file
+}
diff --git a/site2/website/static/js/pjax-api.min.js
b/site2/website/static/js/pjax-api.min.js
index f17a5ca..999616a 100644
--- a/site2/website/static/js/pjax-api.min.js
+++ b/site2/website/static/js/pjax-api.min.js
@@ -1,4 +1,4 @@
/*! pjax-api v3.23.0 https://github.com/falsandtru/pjax-api | (c) 2012,
falsandtru | (Apache-2.0 AND MPL-2.0) License */
-require=function(){return function e(t,n,r){function
i(o,c){if(!n[o]){if(!t[o]){var u="function"==typeof
require&&require;if(!c&&u)return u(o,!0);if(s)return s(o,!0);var a=new
Error("Cannot find module '"+o+"'");throw a.code="MODULE_NOT_FOUND",a}var
l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){return
i(t[o][1][e]||e)},l,l.exports,e,t,n,r)}return n[o].exports}for(var
s="function"==typeof require&&require,o=0;o<r.length;o++)i(r[o]);return
i}}()({1:[function(e,t,n){},{}],2:[functi [...]
+require=function(){return function e(t,n,r){function
i(o,c){if(!n[o]){if(!t[o]){var u="function"==typeof
require&&require;if(!c&&u)return u(o,!0);if(s)return s(o,!0);var a=new
Error("Cannot find module '"+o+"'");throw a.code="MODULE_NOT_FOUND",a}var
l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){return
i(t[o][1][e]||e)},l,l.exports,e,t,n,r)}return n[o].exports}for(var
s="function"==typeof require&&require,o=0;o<r.length;o++)i(r[o]);return
i}}()({1:[function(e,t,n){},{}],2:[functi [...]
window.Pjax = require('pjax-api').default;
