From cc21a938c7b84cae3923bf807c269e9a8663a6c9 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Tue, 2 Oct 2018 18:19:12 +0200 Subject: [PATCH] fixed typos --- arangod/Cluster/ClusterMethods.cpp | 2 +- arangod/Cluster/TraverserEngine.cpp | 2 +- arangod/GeoIndex/Near.h | 2 +- arangod/IResearch/IResearchLink.cpp | 2 +- arangod/Replication/DatabaseInitialSyncer.h | 2 +- arangod/Replication/ReplicationApplierState.h | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp index 715eb992bf..7a95bfeba5 100644 --- a/arangod/Cluster/ClusterMethods.cpp +++ b/arangod/Cluster/ClusterMethods.cpp @@ -2594,7 +2594,7 @@ int flushWalOnAllDBServers(bool waitForSync, bool waitForCollector, double maxWa } if (nrok != (int)DBservers.size()) { - LOG_TOPIC(WARN, arangodb::Logger::CLUSTER)\ + LOG_TOPIC(WARN, arangodb::Logger::CLUSTER) << "could not flush WAL on all servers. confirmed: " << nrok << ", expected: " << DBservers.size(); return globalErrorCode; diff --git a/arangod/Cluster/TraverserEngine.cpp b/arangod/Cluster/TraverserEngine.cpp index ec702ee36d..2dc1258bb3 100644 --- a/arangod/Cluster/TraverserEngine.cpp +++ b/arangod/Cluster/TraverserEngine.cpp @@ -206,7 +206,7 @@ bool BaseEngine::lockCollection(std::string const& shard) { LOG_TOPIC(ERR, arangodb::Logger::CLUSTER) << "Locking shard " << shard << " lead to exception '" << lockResult.errorNumber() << "' (" - << lockResult.errorMessage() << ") "; + << lockResult.errorMessage() << ")"; return false; } diff --git a/arangod/GeoIndex/Near.h b/arangod/GeoIndex/Near.h index 148a908823..fb330accd5 100644 --- a/arangod/GeoIndex/Near.h +++ b/arangod/GeoIndex/Near.h @@ -137,7 +137,7 @@ class NearUtils { /// @brief remove closest buffered result void popNearest() { _buffer.pop(); } - /// @brief reset query to inital state + /// @brief reset query to initial state void reset(); /// aid density estimation by reporting a result close diff --git a/arangod/IResearch/IResearchLink.cpp b/arangod/IResearch/IResearchLink.cpp index 957c6787c0..02afa99b82 100644 --- a/arangod/IResearch/IResearchLink.cpp +++ b/arangod/IResearch/IResearchLink.cpp @@ -505,7 +505,7 @@ int IResearchLink::unload() { LOG_TOPIC_IF(WARN, arangodb::iresearch::TOPIC, TRI_ERROR_NO_ERROR != res) << "failed to drop collection from view while unloading dropped " - << "IResearch link '" << _id << "' for IResearch view '" + << "arangosearch link '" << _id << "' for arangosearch view '" << _view->name() << "'"; return res; diff --git a/arangod/Replication/DatabaseInitialSyncer.h b/arangod/Replication/DatabaseInitialSyncer.h index 03c197972f..8cc7d9a0d3 100644 --- a/arangod/Replication/DatabaseInitialSyncer.h +++ b/arangod/Replication/DatabaseInitialSyncer.h @@ -138,7 +138,7 @@ class DatabaseInitialSyncer final : public InitialSyncer { bool isAborted() const override; /// @brief insert the batch id and barrier ID. - /// For use in globalinitalsyncer + /// For use in globalinitialsyncer // TODO worker safety void useAsChildSyncer(replutils::MasterInfo const& info, uint64_t barrierId, double barrierUpdateTime, uint64_t batchId, diff --git a/arangod/Replication/ReplicationApplierState.h b/arangod/Replication/ReplicationApplierState.h index 0d4599caa2..ec98c7c216 100644 --- a/arangod/Replication/ReplicationApplierState.h +++ b/arangod/Replication/ReplicationApplierState.h @@ -68,13 +68,13 @@ struct ReplicationApplierState { char _progressTime[24]; TRI_server_id_t _serverId; - /// performs inital sync or running tailing syncer + /// performs initial sync or running tailing syncer bool isActive() const { return (_phase == ActivityPhase::INITIAL || _phase == ActivityPhase::TAILING); } - /// performs inital sync or running tailing syncer + /// performs initial sync or running tailing syncer bool isInitializing() const { return _phase == ActivityPhase::INITIAL; }