Skip to content

Commit

Permalink
Verify spelling fixes pass check-spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
jsoref committed Mar 21, 2024
2 parents 2ae68d1 + aef52c0 commit 6109981
Show file tree
Hide file tree
Showing 255 changed files with 570 additions and 570 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Expand Up @@ -103,10 +103,10 @@ else()
set(FDB_VERSION ${PROJECT_VERSION})
endif()
if (NOT FDB_RELEASE)
string(TIMESTAMP FDB_BUILD_TIMESTMAP %Y%m%d%H%M%S)
string(TIMESTAMP FDB_BUILD_TIMESTAMP %Y%m%d%H%M%S)
# Adding support to pass custom fdb_build timestamp,
# required to achieve uniform naming across different builds
set(FDB_BUILDTIME "${FDB_BUILD_TIMESTMAP}" CACHE STRING "A timestamp for packages")
set(FDB_BUILDTIME "${FDB_BUILD_TIMESTAMP}" CACHE STRING "A timestamp for packages")
set(FDB_BUILDTIME_STRING ".${FDB_BUILDTIME}")
set(PRERELEASE_TAG "prerelease")
endif()
Expand Down Expand Up @@ -144,7 +144,7 @@ include(CompileCoverageTool)
include(FlowCommands)

################################################################################
# Vexilographer
# Vexillographer
################################################################################

include(CompileVexillographer)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -150,9 +150,9 @@ cpack -G DEB

For RPM simply replace `DEB` with `RPM`.

### MacOS
### macOS

The build under MacOS will work the same way as on Linux. To get boost and ninja you can use [Homebrew](https://brew.sh/).
The build under macOS will work the same way as on Linux. To get boost and ninja you can use [Homebrew](https://brew.sh/).

```sh
cmake -G Ninja <PATH_TO_FOUNDATIONDB_SOURCE>
Expand Down
2 changes: 1 addition & 1 deletion SWIFT_GUIDE.md
Expand Up @@ -47,7 +47,7 @@ The integration works "both ways", i.e. Swift can call into Flow/C++ code, as we

Swift generates clang modules which can be consumed in C++. For example, the module `fdbserver_swift` contains all swift code in `fdbserver/`.

> Note: you can check, and add new files to the `_swift` targets by locating the command, e.g. `add_library(fdbserver_swft` in [fdbserver/CMakeLists.txt](fdbserver/CMakeLists.txt).
> Note: you can check, and add new files to the `_swift` targets by locating the command, e.g. `add_library(fdbserver_swift` in [fdbserver/CMakeLists.txt](fdbserver/CMakeLists.txt).
Then, you can then include the generated module in C++:

Expand Down
2 changes: 1 addition & 1 deletion SWIFT_IDE_SETUP.md
Expand Up @@ -11,7 +11,7 @@ Note that Swift 5.9 (or higher) is required for the build at the time of writing
You can download Swift toolchains from [https://www.swift.org/download/](https://www.swift.org/download/),
or by using the experimental https://github.com/swift-server/swiftly which simplifies this process.

## VSCode + Cross Compilation (MacOS to Linux)
## VSCode + Cross Compilation (macOS to Linux)

## Host toolchain setup

Expand Down
2 changes: 1 addition & 1 deletion bindings/bindingtester/run_binding_tester.sh
Expand Up @@ -42,7 +42,7 @@ VERSION="1.6"
if [ "${#}" -lt 2 ]
then
echo 'run_binding_tester.sh <number of cycles> <error file>'
echo ' cycles: number of cycles to run test (0 => unlimitted)'
echo ' cycles: number of cycles to run test (0 => unlimited)'
echo ''
echo ' Modifiable Environment Variables:'
echo ' CONCURRENCY: number of concurrent requests'
Expand Down
4 changes: 2 additions & 2 deletions bindings/c/test/apitester/TesterTransactionExecutor.cpp
Expand Up @@ -230,7 +230,7 @@ class TransactionContextBase : public ITransactionContext {
return errCode == error_code_no_cluster_file_found || errCode == error_code_connection_string_invalid;
}

// Complete the transaction with an (unretriable) error
// Complete the transaction with an (unretryable) error
void transactionFailed(fdb::Error err) {
ASSERT(err);
std::unique_lock<std::mutex> lock(mutex);
Expand Down Expand Up @@ -701,7 +701,7 @@ class TransactionExecutorBase : public ITransactionExecutor {
originalClusterFile = clusterFile;
this->clusterFile = tamperedClusterFile.getFileName();

// begin with a valid cluster file, but with non existing address
// begin with a valid cluster file, but with nonexistent address
tamperedClusterFile.write(fmt::format("{}:{}@192.168.{}.{}:{}",
Random().get().randomStringLowerCase<std::string>(3, 8),
Random().get().randomStringLowerCase<std::string>(1, 100),
Expand Down
2 changes: 1 addition & 1 deletion bindings/c/test/fdb_c_client_config_tests.py
Expand Up @@ -452,7 +452,7 @@ def test_no_external_client_support_api_version_ignore(self):
test.exec()

def test_one_external_client_wrong_api_version(self):
# Multiple external clients, API version unsupported by one of othem
# Multiple external clients, API version unsupported by one of them
test = ClientConfigTest(self)
test.create_external_lib_dir(
[CURRENT_VERSION, PREV_RELEASE_VERSION, PREV2_RELEASE_VERSION]
Expand Down
2 changes: 1 addition & 1 deletion bindings/c/test/mako/async.cpp
Expand Up @@ -251,7 +251,7 @@ void ResumableStateForRunWorkload::onIterationEnd(FutureRC rc) {

void ResumableStateForRunWorkload::updateErrorStats(fdb::Error err, int op) {
if (err) {
if (err.is(1020 /*not_commited*/)) {
if (err.is(1020 /*not_committed*/)) {
stats.incrConflictCount();
} else if (err.is(1031 /*timeout*/)) {
stats.incrTimeoutCount(op);
Expand Down
2 changes: 1 addition & 1 deletion bindings/c/test/mako/ddsketch.hpp
Expand Up @@ -166,7 +166,7 @@ class DDSketchBase {

uint64_t getPopulationSize() const { return populationSize; }

double getErrorGurantee() const { return errorGuarantee; }
double getErrorGuarantee() const { return errorGuarantee; }

DDSketchBase<Impl, T>& mergeWith(const DDSketchBase<Impl, T>& anotherSketch) {
// Must have the same guarantee
Expand Down
4 changes: 2 additions & 2 deletions bindings/c/test/mako/mako.cpp
Expand Up @@ -294,7 +294,7 @@ int populate(Database db, const ThreadArgs& thread_args, int thread_tps, Workflo

void updateErrorStatsRunMode(WorkflowStatistics& stats, fdb::Error err, int op) {
if (err) {
if (err.is(1020 /*not_commited*/)) {
if (err.is(1020 /*not_committed*/)) {
stats.incrConflictCount();
} else if (err.is(1031 /*timeout*/)) {
stats.incrTimeoutCount(op);
Expand Down Expand Up @@ -2207,7 +2207,7 @@ void printReport(Arguments const& args,
fmt::fprintf(fp, "\"totalErrors\": %lu,", final_worker_stats.getTotalErrorCount());
fmt::fprintf(fp, "\"totalTimeouts\": %lu,", final_worker_stats.getTotalTimeoutCount());
fmt::fprintf(fp, "\"overallTPS\": %lu,", tps_i);
fmt::fprintf(fp, "\"workerProcesseCPU\": %.8f,", cpu_util_worker_processes);
fmt::fprintf(fp, "\"workerProcessesCPU\": %.8f,", cpu_util_worker_processes);
fmt::fprintf(fp, "\"workerThreadCPU\": %.8f,", cpu_util_worker_threads);
fmt::fprintf(fp, "\"localNetworkCPU\": %.8f,", cpu_util_local_fdb_networks);
fmt::fprintf(fp, "\"externalNetworkCPU\": %.8f,", cpu_util_external_fdb_networks);
Expand Down
4 changes: 2 additions & 2 deletions bindings/c/test/mako/mako.rst
Expand Up @@ -178,10 +178,10 @@ Format
Transaction Specification Examples
----------------------------------
- | 100 GETs (Non-commited)
- | 100 GETs (Non-committed)
| ``g100``
- | 10 GET RANGE with Range of 50 (Non-commited)
- | 10 GET RANGE with Range of 50 (Non-committed)
| ``gr10:50``
- | 90 GETs and 10 Updates (Committed)
Expand Down
2 changes: 1 addition & 1 deletion bindings/flow/Tuple.cpp
Expand Up @@ -547,7 +547,7 @@ Tuple Tuple::getNested(size_t index) const {
}
}

// The item may shrink because of escaped nulls that are unespaced.
// The item may shrink because of escaped nulls that are unescaped.
return Tuple(dest, dest_offsets);
}

Expand Down
2 changes: 1 addition & 1 deletion bindings/flow/Tuple.h
Expand Up @@ -115,7 +115,7 @@ struct Tuple {
static const uint8_t TRUE_CODE;
static const uint8_t UUID_CODE;
// Java Tuple layer VERSIONSTAMP has 96 bits(12 bytes).
// It has additional 2 bytes user code than the internal VERSIONTAMP of size 10 bytes
// It has additional 2 bytes user code than the internal VERSIONSTAMP of size 10 bytes
static const uint8_t VERSIONSTAMP_96_CODE;

Tuple(const StringRef& data);
Expand Down
2 changes: 1 addition & 1 deletion bindings/go/src/_stacktester/directory.go
Expand Up @@ -204,7 +204,7 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
path := sm.maybePath()
// This ***HAS*** to call Transact to ensure that any directory version
// key set in the process of trying to remove this potentially
// non-existent directory, in the REMOVE but not REMOVE_IF_EXISTS case,
// nonexistent directory, in the REMOVE but not REMOVE_IF_EXISTS case,
// doesn't end up committing the version key. (Other languages have
// separate remove() and remove_if_exists() so don't have this tricky
// issue).
Expand Down
2 changes: 1 addition & 1 deletion bindings/go/src/fdb/doc.go
Expand Up @@ -112,7 +112,7 @@ implemented using only error values:
If either read encounters an error, it will be returned to Transact, which will
determine if the error is retryable or not (using (Transaction).OnError). If the
error is an FDB Error and retryable (such as a conflict with with another
error is an FDB Error and retryable (such as a conflict with another
transaction), then the programmer-provided function will be run again. If the
error is fatal (or not an FDB Error), then the error will be returned to the
caller of Transact.
Expand Down
2 changes: 1 addition & 1 deletion bindings/go/src/fdb/tuple/tuple.go
Expand Up @@ -121,7 +121,7 @@ func (uuid UUID) String() string {
return fmt.Sprintf("%x-%x-%x-%x-%x", uuid[0:4], uuid[4:6], uuid[6:8], uuid[8:10], uuid[10:])
}

// Versionstamp is struct for a FoundationDB verionstamp. Versionstamps are
// Versionstamp is struct for a FoundationDB versionstamp. Versionstamps are
// 12 bytes long composed of a 10 byte transaction version and a 2 byte user
// version. The transaction version is filled in at commit time and the user
// version is provided by the application to order results within a transaction.
Expand Down
2 changes: 1 addition & 1 deletion bindings/java/JavaWorkload.cpp
Expand Up @@ -534,7 +534,7 @@ struct JavaWorkload final : FDBWorkload {
jvm->shutdownWorkload(workload, name);
jvm->env->DeleteGlobalRef(workload);
} catch (JNIError& e) {
log.trace(error, "JNIShutDownUnsucessful", { { "Error", e.toString() }, { "Location", e.location() } });
log.trace(error, "JNIShutDownUnsuccessful", { { "Error", e.toString() }, { "Location", e.location() } });
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions bindings/java/README.md
Expand Up @@ -31,14 +31,14 @@ make packages
#### Multi-Platform Jar-File

If you want to create a jar file that can run on more than one supported
architecture (the official one supports MacOS, Linux, and Windows), you can do
architecture (the official one supports macOS, Linux, and Windows), you can do
that by executing the following steps:

1. Create a directory called `lib` somewhere on your file system.
1. Create a subdirectory for each *additional* platform you want to support
(`windows` for windows, `osx` for MacOS, and `linux` for Linux).
(`windows` for windows, `osx` for macOS, and `linux` for Linux).
1. Under each of those create a subdirectory with the name of the architecture
(currently only `amd64` is supported - on MacOS this has to be called
(currently only `amd64` is supported - on macOS this has to be called
`x86_64` - `amd64` on all others).
1. Set the cmake variable `FAT_JAR_BINARIES` to this `lib` directory. For
example, if you created this directory structure under `/foo/bar`, the
Expand Down
6 changes: 3 additions & 3 deletions bindings/java/fdbJNI.cpp
Expand Up @@ -94,11 +94,11 @@ void throwOutOfMem(JNIEnv* jenv) {
}

static jthrowable getThrowable(JNIEnv* jenv, fdb_error_t e, const char* msg = nullptr) {
jclass excepClass = jenv->FindClass("com/apple/foundationdb/FDBException");
jclass exceptionClass = jenv->FindClass("com/apple/foundationdb/FDBException");
if (jenv->ExceptionOccurred())
return JNI_NULL;

jmethodID excepCtor = jenv->GetMethodID(excepClass, "<init>", "(Ljava/lang/String;I)V");
jmethodID exceptionCtor = jenv->GetMethodID(exceptionClass, "<init>", "(Ljava/lang/String;I)V");
if (jenv->ExceptionOccurred())
return JNI_NULL;

Expand All @@ -107,7 +107,7 @@ static jthrowable getThrowable(JNIEnv* jenv, fdb_error_t e, const char* msg = nu
if (jenv->ExceptionOccurred())
return JNI_NULL;

jthrowable t = (jthrowable)jenv->NewObject(excepClass, excepCtor, m, e);
jthrowable t = (jthrowable)jenv->NewObject(exceptionClass, exceptionCtor, m, e);
if (jenv->ExceptionOccurred())
return JNI_NULL;

Expand Down
2 changes: 1 addition & 1 deletion bindings/java/src/README.md
Expand Up @@ -30,7 +30,7 @@ test, do the following:

1. Tag all tests that require multiple clients with `@Tag("MultiClient")`
2. Ensure that your tests have the `MultiClientHelper` extension present, and Registered as an extension
3. Ensure that your test class is in the the JAVA_INTEGRATION_TESTS list in `test.cmake`
3. Ensure that your test class is in the JAVA_INTEGRATION_TESTS list in `test.cmake`

( see `BasicMultiClientIntegrationTest` for a good reference example)

Expand Down
Expand Up @@ -28,7 +28,7 @@
import org.junit.jupiter.api.extension.ExtendWith;

/**
* Miscellanenous tests for Java-bindings-specific implementation of
* Miscellaneous tests for Java-bindings-specific implementation of
* transactions
*/
@ExtendWith(RequiresDatabase.class)
Expand Down
Expand Up @@ -271,14 +271,14 @@ void testRangeScansWorkWithRowLimit(StreamingMode mode) throws Exception {
for (KeyValue actualKv : kvs) {
if (ByteArrayUtil.compareTo(entry.getKey(), 0, entry.getKey().length, actualKv.getKey(), 0,
actualKv.getKey().length) == 0) {
String erroMsg = String.format("Incorrect value for key '%s'; Expected: <%s>, Actual: <%s>",
String errorMsg = String.format("Incorrect value for key '%s'; Expected: <%s>, Actual: <%s>",
new String(entry.getKey()), new String(entry.getValue()),
new String(actualKv.getValue()));
Assertions.assertEquals(
0,
ByteArrayUtil.compareTo(entry.getValue(), 0, entry.getValue().length,
actualKv.getValue(), 0, actualKv.getValue().length),
erroMsg);
errorMsg);
found = true;
break;
}
Expand Down Expand Up @@ -321,14 +321,14 @@ void testRangeScansWorkWithoutRowLimitReversed(StreamingMode mode) throws Except
for (KeyValue actualKv : kvs) {
if (ByteArrayUtil.compareTo(entry.getKey(), 0, entry.getKey().length, actualKv.getKey(), 0,
actualKv.getKey().length) == 0) {
String erroMsg = String.format("Incorrect value for key '%s'; Expected: <%s>, Actual: <%s>",
String errorMsg = String.format("Incorrect value for key '%s'; Expected: <%s>, Actual: <%s>",
new String(entry.getKey()), new String(entry.getValue()),
new String(actualKv.getValue()));
Assertions.assertEquals(
0,
ByteArrayUtil.compareTo(entry.getValue(), 0, entry.getValue().length,
actualKv.getValue(), 0, actualKv.getValue().length),
erroMsg);
errorMsg);
found = true;
break;
}
Expand Down Expand Up @@ -368,14 +368,14 @@ void testRangeScansWorkWithRowLimitReversed(StreamingMode mode) throws Exception
for (KeyValue actualKv : kvs) {
if (ByteArrayUtil.compareTo(entry.getKey(), 0, entry.getKey().length, actualKv.getKey(), 0,
actualKv.getKey().length) == 0) {
String erroMsg = String.format("Incorrect value for key '%s'; Expected: <%s>, Actual: <%s>",
String errorMsg = String.format("Incorrect value for key '%s'; Expected: <%s>, Actual: <%s>",
new String(entry.getKey()), new String(entry.getValue()),
new String(actualKv.getValue()));
Assertions.assertEquals(
0,
ByteArrayUtil.compareTo(entry.getValue(), 0, entry.getValue().length,
actualKv.getValue(), 0, actualKv.getValue().length),
erroMsg);
errorMsg);
found = true;
break;
}
Expand Down
Expand Up @@ -385,7 +385,7 @@ void replaceWorks() throws Exception {
byte[] expectedResults = arrays.get(i + 3);
byte[] results = ByteArrayUtil.replace(src, pattern, replacement);
String errorMsg = String.format(
"results <%s> did not match expected results <%s> when replaceing <%s> with <%s> in <%s>",
"results <%s> did not match expected results <%s> when replacing <%s> with <%s> in <%s>",
ByteArrayUtil.printable(results), ByteArrayUtil.printable(expectedResults),
ByteArrayUtil.printable(pattern), ByteArrayUtil.printable(replacement), ByteArrayUtil.printable(src));

Expand Down
12 changes: 6 additions & 6 deletions bindings/java/src/main/com/apple/foundationdb/Database.java
Expand Up @@ -334,7 +334,7 @@ default CompletableFuture<Long> verifyBlobRange(byte[] beginKey, byte[] endKey)
*
* @param beginKey start of the key range
* @param endKey end of the key range
* @param version version to read at
* @param version to read at
*
* @return a future with the version of the last blob granule.
*/
Expand All @@ -347,7 +347,7 @@ default CompletableFuture<Long> verifyBlobRange(byte[] beginKey, byte[] endKey,
*
* @param beginKey start of the key range
* @param endKey end of the key range
* @param version version to read at
* @param version to read at
* @param e the {@link Executor} to use for asynchronous callbacks
*
* @return a future with the version of the last blob granule.
Expand All @@ -373,7 +373,7 @@ default CompletableFuture<Boolean> flushBlobRange(byte[] beginKey, byte[] endKey
* @param beginKey start of the key range
* @param endKey end of the key range
* @param compact force compact or just flush
* @param version version to flush at
* @param version to flush at
*
* @return a future with a boolean for success or failure
*/
Expand All @@ -387,7 +387,7 @@ default CompletableFuture<Boolean> flushBlobRange(byte[] beginKey, byte[] endKey
* @param beginKey start of the key range
* @param endKey end of the key range
* @param compact force compact or just flush
* @param version version to flush at
* @param version to flush at
* @param e the {@link Executor} to use for asynchronous callbacks
*
* @return a future with a boolean for success or failure
Expand Down Expand Up @@ -485,7 +485,7 @@ <T> CompletableFuture<T> readAsync(
* transaction may be executed twice. For more information about how to reason
* about these situations see
* <a href="/foundationdb/developer-guide.html#transactions-with-unknown-results"
* target="_blank">the FounationDB Developer Guide</a>
* target="_blank">the FoundationDB Developer Guide</a>
*
* @param retryable the block of logic to execute in a {@link Transaction} against
* this database
Expand Down Expand Up @@ -527,7 +527,7 @@ default <T> T run(Function<? super Transaction, T> retryable) {
* transaction may be executed twice. For more information about how to reason
* about these situations see
* <a href="/foundationdb/developer-guide.html#transactions-with-unknown-results"
* target="_blank">the FounationDB Developer Guide</a><br>
* target="_blank">the FoundationDB Developer Guide</a><br>
* <br>
* Any errors encountered executing {@code retryable}, or received from the
* database, will be set on the returned {@code CompletableFuture}.
Expand Down
Expand Up @@ -207,7 +207,7 @@ public void accept(MappedRangeResultInfo data, Throwable error) {

private synchronized void startNextFetch() {
if (fetchOutstanding)
throw new IllegalStateException("Reentrant call not allowed"); // This can not be called reentrantly
throw new IllegalStateException("Reentrant call not allowed"); // This cannot be called reentrantly
if (isCancelled) return;

if (chunk != null && mainChunkIsTheLast()) return;
Expand Down
Expand Up @@ -209,7 +209,7 @@ public void accept(RangeResultInfo data, Throwable error) {

private synchronized void startNextFetch() {
if(fetchOutstanding)
throw new IllegalStateException("Reentrant call not allowed"); // This can not be called reentrantly
throw new IllegalStateException("Reentrant call not allowed"); // This cannot be called reentrantly
if(isCancelled)
return;

Expand Down

0 comments on commit 6109981

Please sign in to comment.