This is an automated email from the ASF dual-hosted git repository.
rohangarg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 3b58a01c7c Correct spelling in messages and variable names. (#12932)
3b58a01c7c is described below
commit 3b58a01c7c92a1dee299d9b08031932ff869be79
Author: Adarsh Sanjeev <[email protected]>
AuthorDate: Wed Aug 24 11:06:31 2022 +0530
Correct spelling in messages and variable names. (#12932)
---
.../input/impl/InputEntityIteratingReader.java | 4 ++--
.../input/impl/InputEntityIteratingReaderTest.java | 2 +-
.../druid/security/basic/CommonCacheNotifier.java | 2 +-
...natorPollingBasicAuthenticatorCacheManager.java | 2 +-
...orBasicAuthenticatorMetadataStorageUpdater.java | 2 +-
...rdinatorPollingBasicAuthorizerCacheManager.java | 4 ++--
...natorBasicAuthorizerMetadataStorageUpdater.java | 2 +-
.../kafka/supervisor/KafkaSupervisorTest.java | 2 +-
.../kinesis/supervisor/KinesisSupervisorTest.java | 2 +-
.../supervisor/SeekableStreamSupervisor.java | 2 +-
.../java/org/apache/druid/query/QueriesTest.java | 24 +++++++++++-----------
.../druid/discovery/BaseNodeRoleWatcher.java | 10 ++++-----
.../query/lookup/LookupReferencesManager.java | 6 +++---
13 files changed, 32 insertions(+), 32 deletions(-)
diff --git
a/core/src/main/java/org/apache/druid/data/input/impl/InputEntityIteratingReader.java
b/core/src/main/java/org/apache/druid/data/input/impl/InputEntityIteratingReader.java
index 0354bea279..a76166a72d 100644
---
a/core/src/main/java/org/apache/druid/data/input/impl/InputEntityIteratingReader.java
+++
b/core/src/main/java/org/apache/druid/data/input/impl/InputEntityIteratingReader.java
@@ -79,8 +79,8 @@ public class InputEntityIteratingReader implements
InputSourceReader
}
catch (IOException e) {
throw new RuntimeException(entity.getUri() != null ?
- "Error occured while trying to read uri: "
+ entity.getUri() :
- "Error occured while reading input", e);
+ "Error occurred while trying to read uri: "
+ entity.getUri() :
+ "Error occurred while reading input", e);
}
});
}
diff --git
a/core/src/test/java/org/apache/druid/data/input/impl/InputEntityIteratingReaderTest.java
b/core/src/test/java/org/apache/druid/data/input/impl/InputEntityIteratingReaderTest.java
index 355e9f33e7..96ea16c866 100644
---
a/core/src/test/java/org/apache/druid/data/input/impl/InputEntityIteratingReaderTest.java
+++
b/core/src/test/java/org/apache/druid/data/input/impl/InputEntityIteratingReaderTest.java
@@ -121,7 +121,7 @@ public class InputEntityIteratingReaderTest
).iterator(),
temporaryFolder.newFolder()
);
- String expectedMessage = "Error occured while trying to read uri:
testscheme://some/path";
+ String expectedMessage = "Error occurred while trying to read uri:
testscheme://some/path";
Exception exception = Assert.assertThrows(RuntimeException.class,
firehose::read);
Assert.assertTrue(exception.getMessage().contains(expectedMessage));
diff --git
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/CommonCacheNotifier.java
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/CommonCacheNotifier.java
index 358ac105dc..696b33ea31 100644
---
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/CommonCacheNotifier.java
+++
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/CommonCacheNotifier.java
@@ -144,7 +144,7 @@ public class CommonCacheNotifier
LOG.noStackTrace().info(e, "%s: Interrupted while handling
updates for cachedUserMaps.", callerName);
}
catch (Throwable t) {
- LOG.makeAlert(t, callerName + ":Error occured while handling
updates for cachedUserMaps.").emit();
+ LOG.makeAlert(t, callerName + ":Error occurred while handling
updates for cachedUserMaps.").emit();
}
}
}
diff --git
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/CoordinatorPollingBasicAuthenticatorCacheManager.java
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/CoordinatorPollingBasicAuthenticatorCacheManager.java
index 5c87fa59c4..0c7dff247c 100644
---
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/CoordinatorPollingBasicAuthenticatorCacheManager.java
+++
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/cache/CoordinatorPollingBasicAuthenticatorCacheManager.java
@@ -127,7 +127,7 @@ public class
CoordinatorPollingBasicAuthenticatorCacheManager implements BasicAu
LOG.debug("Scheduled user cache poll is done");
}
catch (Throwable t) {
- LOG.makeAlert(t, "Error occured while polling for
cachedUserMaps.").emit();
+ LOG.makeAlert(t, "Error occurred while polling for
cachedUserMaps.").emit();
}
}
);
diff --git
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
index 994d6ed7f4..a83c20e422 100644
---
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
+++
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
@@ -192,7 +192,7 @@ public class
CoordinatorBasicAuthenticatorMetadataStorageUpdater implements Basi
LOG.debug("Scheduled db userMap poll is done");
}
catch (Throwable t) {
- LOG.makeAlert(t, "Error occured while polling for
cachedUserMaps.").emit();
+ LOG.makeAlert(t, "Error occurred while polling for
cachedUserMaps.").emit();
}
return ScheduledExecutors.Signal.REPEAT;
}
diff --git
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/CoordinatorPollingBasicAuthorizerCacheManager.java
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/CoordinatorPollingBasicAuthorizerCacheManager.java
index 32e69d9e01..9c45d9b09f 100644
---
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/CoordinatorPollingBasicAuthorizerCacheManager.java
+++
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/cache/CoordinatorPollingBasicAuthorizerCacheManager.java
@@ -136,7 +136,7 @@ public class CoordinatorPollingBasicAuthorizerCacheManager
implements BasicAutho
LOG.debug("Scheduled userMap cache poll is done");
}
catch (Throwable t) {
- LOG.makeAlert(t, "Error occured while polling for
cachedUserMaps.").emit();
+ LOG.makeAlert(t, "Error occurred while polling for
cachedUserMaps.").emit();
}
}
);
@@ -162,7 +162,7 @@ public class CoordinatorPollingBasicAuthorizerCacheManager
implements BasicAutho
LOG.debug("Scheduled groupMappingMap cache poll is done");
}
catch (Throwable t) {
- LOG.makeAlert(t, "Error occured while polling for
cachedGroupMappingMaps.").emit();
+ LOG.makeAlert(t, "Error occurred while polling for
cachedGroupMappingMaps.").emit();
}
}
);
diff --git
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java
index dc6db5b202..2de3ef11cc 100644
---
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java
+++
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java
@@ -235,7 +235,7 @@ public class
CoordinatorBasicAuthorizerMetadataStorageUpdater implements BasicAu
LOG.debug("Scheduled db poll is done");
}
catch (Throwable t) {
- LOG.makeAlert(t, "Error occured while polling for
cachedUserMaps, cachedGroupMappingMaps, cachedRoleMaps.").emit();
+ LOG.makeAlert(t, "Error occurred while polling for
cachedUserMaps, cachedGroupMappingMaps, cachedRoleMaps.").emit();
}
return ScheduledExecutors.Signal.REPEAT;
}
diff --git
a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
index 01062893ae..e6a3a919b4 100644
---
a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
+++
b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
@@ -1975,7 +1975,7 @@ public class KafkaSupervisorTest extends EasyMockSupport
.andReturn(Futures.immediateFailedFuture(new
RuntimeException())).times(2);
taskQueue.shutdown(
EasyMock.contains("sequenceName-0"),
- EasyMock.eq("An exception occured while waiting for task [%s] to
pause: [%s]"),
+ EasyMock.eq("An exception occurred while waiting for task [%s] to
pause: [%s]"),
EasyMock.contains("sequenceName-0"),
EasyMock.anyString()
);
diff --git
a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
index cf3e9d361e..42866c2310 100644
---
a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
+++
b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
@@ -2258,7 +2258,7 @@ public class KinesisSupervisorTest extends EasyMockSupport
.andReturn(Futures.immediateFailedFuture(new
RuntimeException())).times(2);
taskQueue.shutdown(
EasyMock.contains("sequenceName-0"),
- EasyMock.eq("An exception occured while waiting for task [%s] to
pause: [%s]"),
+ EasyMock.eq("An exception occurred while waiting for task [%s] to
pause: [%s]"),
EasyMock.contains("sequenceName-0"),
EasyMock.anyString()
);
diff --git
a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
index 59526028a8..225cc09de7 100644
---
a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
+++
b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
@@ -2967,7 +2967,7 @@ public abstract class
SeekableStreamSupervisor<PartitionIdType, SequenceOffsetTy
killTask(
taskId,
- "An exception occured while waiting for task [%s] to
pause: [%s]",
+ "An exception occurred while waiting for task [%s] to
pause: [%s]",
taskId,
pauseException
);
diff --git a/processing/src/test/java/org/apache/druid/query/QueriesTest.java
b/processing/src/test/java/org/apache/druid/query/QueriesTest.java
index ea16df6392..210314b636 100644
--- a/processing/src/test/java/org/apache/druid/query/QueriesTest.java
+++ b/processing/src/test/java/org/apache/druid/query/QueriesTest.java
@@ -72,16 +72,16 @@ public class QueriesTest
)
);
- boolean exceptionOccured = false;
+ boolean exceptionOccurred = false;
try {
Queries.prepareAggregations(ImmutableList.of(), aggFactories, postAggs);
}
catch (IllegalArgumentException e) {
- exceptionOccured = true;
+ exceptionOccurred = true;
}
- Assert.assertFalse(exceptionOccured);
+ Assert.assertFalse(exceptionOccurred);
}
@Test
@@ -104,16 +104,16 @@ public class QueriesTest
)
);
- boolean exceptionOccured = false;
+ boolean exceptionOccurred = false;
try {
Queries.prepareAggregations(ImmutableList.of(), aggFactories, postAggs);
}
catch (IllegalArgumentException e) {
- exceptionOccured = true;
+ exceptionOccurred = true;
}
- Assert.assertTrue(exceptionOccured);
+ Assert.assertTrue(exceptionOccurred);
}
@Test
@@ -158,16 +158,16 @@ public class QueriesTest
)
);
- boolean exceptionOccured = false;
+ boolean exceptionOccurred = false;
try {
Queries.prepareAggregations(ImmutableList.of(), aggFactories, postAggs);
}
catch (IllegalArgumentException e) {
- exceptionOccured = true;
+ exceptionOccurred = true;
}
- Assert.assertFalse(exceptionOccured);
+ Assert.assertFalse(exceptionOccurred);
}
@Test
@@ -212,16 +212,16 @@ public class QueriesTest
)
);
- boolean exceptionOccured = false;
+ boolean exceptionOccurred = false;
try {
Queries.prepareAggregations(ImmutableList.of(), aggFactories, postAggs);
}
catch (IllegalArgumentException e) {
- exceptionOccured = true;
+ exceptionOccurred = true;
}
- Assert.assertTrue(exceptionOccured);
+ Assert.assertTrue(exceptionOccurred);
}
@Test
diff --git
a/server/src/main/java/org/apache/druid/discovery/BaseNodeRoleWatcher.java
b/server/src/main/java/org/apache/druid/discovery/BaseNodeRoleWatcher.java
index e5c92d72dd..d347b42749 100644
--- a/server/src/main/java/org/apache/druid/discovery/BaseNodeRoleWatcher.java
+++ b/server/src/main/java/org/apache/druid/discovery/BaseNodeRoleWatcher.java
@@ -108,7 +108,7 @@ public class BaseNodeRoleWatcher
listener.nodesAdded(currNodes);
listener.nodeViewInitialized();
},
- "Exception occured in nodesAdded([%s]) in listener [%s].",
currNodes, listener
+ "Exception occurred in nodesAdded([%s]) in listener [%s].",
currNodes, listener
);
}
nodeListeners.add(listener);
@@ -145,7 +145,7 @@ public class BaseNodeRoleWatcher
for (DruidNodeDiscovery.Listener listener : nodeListeners) {
safeSchedule(
() -> listener.nodesAdded(newNode),
- "Exception occured in nodeAdded(node=[%s]) in listener [%s].",
+ "Exception occurred in nodeAdded(node=[%s]) in listener [%s].",
druidNode.getDruidNode().getHostAndPortToUse(),
listener
);
@@ -200,7 +200,7 @@ public class BaseNodeRoleWatcher
for (DruidNodeDiscovery.Listener listener : nodeListeners) {
safeSchedule(
() -> listener.nodesRemoved(nodeRemoved),
- "Exception occured in nodeRemoved(node [%s] of role [%s]) in
listener [%s].",
+ "Exception occurred in nodeRemoved(node [%s] of role [%s]) in
listener [%s].",
druidNode.getDruidNode().getUriToUse(),
druidNode.getNodeRole().getJsonName(),
listener
@@ -233,7 +233,7 @@ public class BaseNodeRoleWatcher
listener.nodesAdded(currNodes);
listener.nodeViewInitialized();
},
- "Exception occured in nodesAdded([%s]) in listener [%s].",
+ "Exception occurred in nodesAdded([%s]) in listener [%s].",
currNodes,
listener
);
@@ -282,7 +282,7 @@ public class BaseNodeRoleWatcher
listener.nodesRemoved(nodesDeleted);
}
},
- "Exception occured in resetNodes in listener [%s].",
+ "Exception occurred in resetNodes in listener [%s].",
listener
);
}
diff --git
a/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java
b/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java
index 0682a06f35..792c52f003 100644
---
a/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java
+++
b/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java
@@ -176,7 +176,7 @@ public class LookupReferencesManager implements
LookupExtractorFactoryContainerP
LockSupport.parkNanos(LookupReferencesManager.this,
TimeUnit.MINUTES.toNanos(1));
}
catch (Throwable t) {
- LOG.makeAlert(t, "Error occured while lookup notice
handling.").emit();
+ LOG.makeAlert(t, "Error occurred while lookup notice
handling.").emit();
}
}
}
@@ -219,8 +219,8 @@ public class LookupReferencesManager implements
LookupExtractorFactoryContainerP
notice.handle(lookupMap);
}
catch (Exception ex) {
- LOG.error(ex, "Exception occured while handling lookup notice [%s].",
notice);
- LOG.makeAlert("Exception occured while handling lookup notice, with
message [%s].", ex.getMessage()).emit();
+ LOG.error(ex, "Exception occurred while handling lookup notice [%s].",
notice);
+ LOG.makeAlert("Exception occurred while handling lookup notice, with
message [%s].", ex.getMessage()).emit();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]