cjmctague closed pull request #1047: Spelling corrections in comments/javadocs
URL: https://github.com/apache/fluo/pull/1047
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/contrib/create-release-candidate.sh
b/contrib/create-release-candidate.sh
index 2f260dfe..465ad6e9 100755
--- a/contrib/create-release-candidate.sh
+++ b/contrib/create-release-candidate.sh
@@ -73,7 +73,7 @@ gitCommit() { gitCommits -n1 "$@"; }
gitSubject() { pretty %s "$@"; }
createEmail() {
- # $1 version (optional); $2 rc seqence num (optional); $3 staging repo num
(optional)
+ # $1 version (optional); $2 rc sequence num (optional); $3 staging repo num
(optional)
local ver; [[ -n "$1" ]] && ver=$1 || ver=$(prompter 'version to be released
(eg. x.y.z)' '[0-9]+[.][0-9]+[.][0-9]+')
local rc; [[ -n "$2" ]] && rc=$2 || rc=$(prompter 'release candidate
sequence number (eg. 1, 2, etc.)' '[0-9]+')
local stagingrepo; [[ -n "$3" ]] && stagingrepo=$3 || stagingrepo=$(prompter
'staging repository number from
https://repository.apache.org/#stagingRepositories' '[0-9]+')
diff --git
a/modules/accumulo/src/main/java/org/apache/fluo/accumulo/iterators/TimestampSkippingIterator.java
b/modules/accumulo/src/main/java/org/apache/fluo/accumulo/iterators/TimestampSkippingIterator.java
index ec2a83f5..75ba96f4 100644
---
a/modules/accumulo/src/main/java/org/apache/fluo/accumulo/iterators/TimestampSkippingIterator.java
+++
b/modules/accumulo/src/main/java/org/apache/fluo/accumulo/iterators/TimestampSkippingIterator.java
@@ -191,7 +191,7 @@ private static boolean
removeDeletingIterator(SortedKeyValueIterator<Key, Value>
@VisibleForTesting
public final boolean shouldSeek() {
/*
- * This method is a saftey check to ensure the deleting iterator was
removed. If this iterator
+ * This method is a safety check to ensure the deleting iterator was
removed. If this iterator
* was not removed for some reason, then the performance of seeking will
be O(N^2). In the case
* where its not removed, it would be better to just scan forward.
*/
@@ -202,7 +202,7 @@ private void seek(Range range) throws IOException {
if (hasSeeked) {
// Making assumptions based on how Accumulo currently works. Currently
Accumulo does not set
// up iterators until the 1st seek. Therefore can only remove the
deleting iter after the 1st
- // seek. Also, Accumulo may switch data sources and re-setup the
deleting iterator, thats why
+ // seek. Also, Accumulo may switch data sources and re-setup the
deleting iterator, that's why
// this iterator keeps trying to remove it.
removedDeletingIterator |= removeDeletingIterator(source);
if (!removedDeletingIterator) {
diff --git
a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/GarbageCollectionIteratorTest.java
b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/GarbageCollectionIteratorTest.java
index 591fdce9..18d12918 100644
---
a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/GarbageCollectionIteratorTest.java
+++
b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/GarbageCollectionIteratorTest.java
@@ -305,7 +305,7 @@ public void testDelLock() {
Assert.assertEquals(expected, output);
- // test write that supercedes a del lock
+ // test write that supersedes a del lock
input = new TestData();
input.add("0 f q WRITE 22", "21");
input.add("0 f q DEL_LOCK 19", "0 ROLLBACK");
@@ -460,7 +460,7 @@ public void testDeletes() {
expected.add("0 h q DATA 33", "9");
Assert.assertEquals(expected, output);
- // test write that supercededs a delete... delete should not cause write
to be GCed
+ // test write that supersedes a delete... delete should not cause write to
be GCed
TestData input = new TestData(inputBase);
input.add("0 f q WRITE 60", "55");
input.add("0 f q DATA 55", "abc");
diff --git
a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/SnapshotIteratorTest.java
b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/SnapshotIteratorTest.java
index 4e0c27d4..417fd810 100644
---
a/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/SnapshotIteratorTest.java
+++
b/modules/accumulo/src/test/java/org/apache/fluo/accumulo/iterators/SnapshotIteratorTest.java
@@ -123,7 +123,7 @@ public void testDelLock() {
checkInput(input, expected, 23);
- // test case where there is newer lock thats not invalidated by DEL_LOCK
+ // test case where there is newer lock that's not invalidated by DEL_LOCK
input = new TestData();
input.add("0 f q DEL_LOCK 18", "0 ABORT");
input.add("0 f q WRITE 16", "11");
@@ -303,7 +303,7 @@ private void checkManyColumnData(TestData input, int
numToWrite, Range range) th
for (int i = numToWrite * 3 - 1; i > 3; i -= 3) {
TestData output = new TestData(newSI(input, i), range);
TestData expected = new TestData();
- // snapshot time of commited transaction
+ // snapshot time of committed transaction
int st = i - 2;
int val1 = ("" + st).hashCode();
int val2 = ("" + val1).hashCode();
diff --git
a/modules/api/src/main/java/org/apache/fluo/api/client/AbstractSnapshotBase.java
b/modules/api/src/main/java/org/apache/fluo/api/client/AbstractSnapshotBase.java
index 8c0fa4cc..53cd458c 100644
---
a/modules/api/src/main/java/org/apache/fluo/api/client/AbstractSnapshotBase.java
+++
b/modules/api/src/main/java/org/apache/fluo/api/client/AbstractSnapshotBase.java
@@ -39,7 +39,7 @@
/*
* This map of String to Bytes is really only useful when user code is
executing a transactions.
- * Once a transaction is queued for commit, do not want this map to eat up
memory. Thats why a
+ * Once a transaction is queued for commit, do not want this map to eat up
memory. That's why a
* weak map is used.
*
* There is intentionally no reverse map from Bytes to String. Relying on
two things for this.
diff --git
a/modules/api/src/main/java/org/apache/fluo/api/client/LoaderExecutor.java
b/modules/api/src/main/java/org/apache/fluo/api/client/LoaderExecutor.java
index a593d461..6868d92e 100644
--- a/modules/api/src/main/java/org/apache/fluo/api/client/LoaderExecutor.java
+++ b/modules/api/src/main/java/org/apache/fluo/api/client/LoaderExecutor.java
@@ -30,7 +30,7 @@
void execute(Loader loader);
/**
- * Same as {@link #execute(Loader)}, but allows specifing an identity. The
identity is used in
+ * Same as {@link #execute(Loader)}, but allows specifying an identity. The
identity is used in
* metrics and trace logging. When an identity is not supplied, the class
name is used. In the
* case of lambdas the class name may not be the same in different processes.
*
diff --git
a/modules/api/src/main/java/org/apache/fluo/api/client/scanner/ScannerBuilder.java
b/modules/api/src/main/java/org/apache/fluo/api/client/scanner/ScannerBuilder.java
index 201385a2..ec7103b2 100644
---
a/modules/api/src/main/java/org/apache/fluo/api/client/scanner/ScannerBuilder.java
+++
b/modules/api/src/main/java/org/apache/fluo/api/client/scanner/ScannerBuilder.java
@@ -103,7 +103,7 @@ default ScannerBuilder overPrefix(CharSequence rowPrefix) {
*
* @see org.apache.fluo.api.data.Span#prefix(Bytes, Column)
* @param row restrict the scanner to data in an exact row.
- * @param colPrefix restrict scanner to data that begins with specifiec
+ * @param colPrefix restrict scanner to data that begins with a specific
* {@link org.apache.fluo.api.data.Column} prefix.
* @return self
* @since 1.2.0
@@ -116,7 +116,7 @@ default ScannerBuilder overPrefix(Bytes row, Column
colPrefix) {
*
* @see org.apache.fluo.api.data.Span#prefix(CharSequence, Column)
* @param row restrict the scanner to data in an exact row.
- * @param colPrefix restrict scanner to data that begins with specifiec
+ * @param colPrefix restrict scanner to data that begins with a specific
* {@link org.apache.fluo.api.data.Column} prefix.
* @return self
* @since 1.2.0
diff --git
a/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
b/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
index cf416c0c..f50b56f8 100644
---
a/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
+++
b/modules/api/src/main/java/org/apache/fluo/api/config/FluoConfiguration.java
@@ -797,7 +797,7 @@ private void addObserver(ObserverSpecification oconf, int
next) {
}
/**
- * Adds an {@link ObserverSpecification} to the configuration using a unique
integer prefix thats
+ * Adds an {@link ObserverSpecification} to the configuration using a unique
integer prefix that's
* not currently in use.
*
* @deprecated since 1.1.0. Replaced by {@link #setObserverProvider(String)}
and
diff --git
a/modules/api/src/main/java/org/apache/fluo/api/config/ObserverSpecification.java
b/modules/api/src/main/java/org/apache/fluo/api/config/ObserverSpecification.java
index 9ebb47b3..cbda0376 100644
---
a/modules/api/src/main/java/org/apache/fluo/api/config/ObserverSpecification.java
+++
b/modules/api/src/main/java/org/apache/fluo/api/config/ObserverSpecification.java
@@ -45,8 +45,8 @@ public ObserverSpecification(String className) {
/**
* @param className The name of a class that implements {@link Observer}
- * @param observerConfig Per observer configuration thats specific to this
observer. For
- * configuration thats the same across multiple observers, consider
using
+ * @param observerConfig Per observer configuration that's specific to this
observer. For
+ * configuration that's the same across multiple observers, consider
using
* {@link FluoConfiguration#getAppConfiguration()}
*/
public ObserverSpecification(String className, SimpleConfiguration
observerConfig) {
@@ -56,8 +56,8 @@ public ObserverSpecification(String className,
SimpleConfiguration observerConfi
/**
* @param className The name of a class that implements {@link Observer}
- * @param observerConfig Per observer configuration thats specific to this
observer. For
- * configuration thats the same across multiple observers, consider
using
+ * @param observerConfig Per observer configuration that's specific to this
observer. For
+ * configuration that's the same across multiple observers, consider
using
* {@link FluoConfiguration#getAppConfiguration()}
*/
public ObserverSpecification(String className, Map<String, String>
observerConfig) {
diff --git a/modules/api/src/main/java/org/apache/fluo/api/data/Bytes.java
b/modules/api/src/main/java/org/apache/fluo/api/data/Bytes.java
index dca8b080..8ae590c2 100644
--- a/modules/api/src/main/java/org/apache/fluo/api/data/Bytes.java
+++ b/modules/api/src/main/java/org/apache/fluo/api/data/Bytes.java
@@ -161,14 +161,14 @@ public String toString() {
}
/**
- * @return A read only byte buffer thats backed by the internal byte array.
+ * @return A read only byte buffer that's backed by the internal byte array.
*/
public ByteBuffer toByteBuffer() {
return ByteBuffer.wrap(data, offset, length).asReadOnlyBuffer();
}
/**
- * @return An input stream thats backed by the internal byte array
+ * @return An input stream that's backed by the internal byte array
*/
public InputStream toInputStream() {
return new ByteArrayInputStream(data, offset, length);
diff --git a/modules/api/src/test/resources/fluo.properties
b/modules/api/src/test/resources/fluo.properties
index 4b862857..4f408ab2 100644
--- a/modules/api/src/test/resources/fluo.properties
+++ b/modules/api/src/test/resources/fluo.properties
@@ -52,7 +52,7 @@ fluo.admin.accumulo.table=table9
# HDFS root path. Should match 'fs.defaultFS' property in Hadoop's
core-site.xml
fluo.admin.hdfs.root=hdfs://localhost:10000
# Fluo uses iterators within Accumulo tablet servers, therefore Accumulo per
-# table classpath need to be configured with a comma seperated list of uris
+# table classpath need to be configured with a comma separated list of uris
# where Accumulo can find Fluo jars. These jars should be reachable from
# every tablet server. For the default jars below, `fluo init` will place them
# in HDFS. If you add more jars to the classpath below, you will need to
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/client/LoaderExecutorAsyncImpl.java
b/modules/core/src/main/java/org/apache/fluo/core/client/LoaderExecutorAsyncImpl.java
index 5f644e88..c7117da1 100644
---
a/modules/core/src/main/java/org/apache/fluo/core/client/LoaderExecutorAsyncImpl.java
+++
b/modules/core/src/main/java/org/apache/fluo/core/client/LoaderExecutorAsyncImpl.java
@@ -68,7 +68,7 @@ private void close() {
commiting.decrement();
} else {
// its only expected that this should be called once.. if its called
multiple times in
- // indicates an error in asyn code
+ // indicates an error in async code
LoggerFactory.getLogger(LoaderCommitObserver.class).error("Close
called twice ",
new Exception());
}
diff --git
a/modules/core/src/main/java/org/apache/fluo/core/impl/FluoConfigurationImpl.java
b/modules/core/src/main/java/org/apache/fluo/core/impl/FluoConfigurationImpl.java
index 3c2f5dfb..dba18ae8 100644
---
a/modules/core/src/main/java/org/apache/fluo/core/impl/FluoConfigurationImpl.java
+++
b/modules/core/src/main/java/org/apache/fluo/core/impl/FluoConfigurationImpl.java
@@ -194,7 +194,7 @@ public static long
getVisibilityCacheTimeout(FluoConfiguration conf, TimeUnit tu
* {@value #TRANSACTOR_MAX_CACHE_SIZE} if set, the default
* {@value #TRANSACTOR_CACHE_TIMEOUT_DEFAULT} otherwise
*
- * @param conf The FluoConfiguartion
+ * @param conf The FluoConfiguration
* @return The maximum number of entries permitted in this cache
*/
diff --git a/modules/core/src/main/java/org/apache/fluo/core/util/ScanUtil.java
b/modules/core/src/main/java/org/apache/fluo/core/util/ScanUtil.java
index a6c8e68a..aa12c162 100644
--- a/modules/core/src/main/java/org/apache/fluo/core/util/ScanUtil.java
+++ b/modules/core/src/main/java/org/apache/fluo/core/util/ScanUtil.java
@@ -240,9 +240,9 @@ public static void scanAccumulo(ScanOpts options,
FluoConfiguration sConfig, Pri
HELP,
// hex encode node ascii
HEX,
- // scan accumuo table directly
+ // scan accumulo table directly
ACCUMULO,
- // endode output as json
+ // encode output as json
JSON,
// scan notification
NTFY
diff --git a/modules/distribution/src/main/config/fluo-app.properties
b/modules/distribution/src/main/config/fluo-app.properties
index bdddd5eb..88ffa74f 100644
--- a/modules/distribution/src/main/config/fluo-app.properties
+++ b/modules/distribution/src/main/config/fluo-app.properties
@@ -30,7 +30,7 @@
## If this property is set, fluo.observer.jars.url should not be set.
#fluo.observer.init.dir=/path/to/observer/jars/
-## Observer jars are retreived from this URL. If set, fluo.observer.init.dir
should not be set.
+## Observer jars are retrieved from this URL. If set, fluo.observer.init.dir
should not be set.
#fluo.observer.jars.url=hdfs://localhost:8020/path/to/observer/jars/
## Properties with a prefix of fluo.app.* can easily be retrieved by a Fluo
diff --git a/modules/distribution/src/main/config/fluo-env.sh
b/modules/distribution/src/main/config/fluo-env.sh
index 78acbb13..2d72d440 100755
--- a/modules/distribution/src/main/config/fluo-env.sh
+++ b/modules/distribution/src/main/config/fluo-env.sh
@@ -69,7 +69,7 @@ addToClasspath()
}
-# This function attemps to obtain Accumulo, Hadoop, and Zookeeper jars from the
+# This function attempts to obtain Accumulo, Hadoop, and Zookeeper jars from
the
# location where those dependencies are installed on the system.
setupClasspathFromSystem()
{
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/FaultyConfig.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/FaultyConfig.java
index 60f43cae..625323ef 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/FaultyConfig.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/FaultyConfig.java
@@ -33,7 +33,7 @@
* not have been written.
*
* <p>
- * The following code was copied from Accumulo in order to avoid depedning
on accumulo test
+ * The following code was copied from Accumulo in order to avoid depending
on accumulo test
* module.
*/
private static class FaultyConditionalWriter implements ConditionalWriter {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ReadLockIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ReadLockIT.java
index b88d66e4..00d01af2 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ReadLockIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ReadLockIT.java
@@ -273,7 +273,7 @@ public void testRandom() throws Exception {
try {
addEdge(tx, enodes[0], enodes[1]);
} catch (NullPointerException e) {
- // TOOD remove after finding bug
+ // TODO remove after finding bug
System.out.println(
" en0 " + enodes[0] + " en1 " + enodes[1] + " start ts " +
tx.getStartTimestamp());
dumpRow("r:" + enodes[0], System.out::println);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
