diff options
34 files changed, 119 insertions, 119 deletions
diff --git a/searchcore/src/apps/fdispatch/fdispatch.cpp b/searchcore/src/apps/fdispatch/fdispatch.cpp index 21fa696330a..97cfdcb408c 100644 --- a/searchcore/src/apps/fdispatch/fdispatch.cpp +++ b/searchcore/src/apps/fdispatch/fdispatch.cpp @@ -134,7 +134,7 @@ FastS_FDispatchApp::GetOptions(int *exitCode) int errflg = 0; int c; const char *optArgument; - int longopt_index; /* Shows which long option was used */ + int longopt_index; /* Shows which long option was used */ static struct option longopts[] = { { "config-id", 1, NULL, 0 }, { NULL, 0, NULL, 0 } diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp index b642dc77919..905d0434886 100644 --- a/searchcore/src/apps/tests/persistenceconformance_test.cpp +++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp @@ -337,7 +337,7 @@ public: { destroyIterators(); removeHandlers(); // Block calls to document db from engine - close(); // Block upcalls to engine from document db + close(); // Block upcalls to engine from document db } }; diff --git a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp index 26a745df148..4d6d63cf641 100644 --- a/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp +++ b/searchcore/src/apps/vespa-dump-feed/vespa-dump-feed.cpp @@ -83,10 +83,10 @@ FeedHandler::handleMessage(mbus::Message::UP message) documentapi::DocumentMessage::UP msg((documentapi::DocumentMessage*)message.release()); switch (msg->getType()) { case documentapi::DocumentProtocol::MESSAGE_PUTDOCUMENT: - handleDocumentPut(((documentapi::PutDocumentMessage&)(*msg)).getDocumentSP()); - break; + handleDocumentPut(((documentapi::PutDocumentMessage&)(*msg)).getDocumentSP()); + break; default: - break; + break; } reply = msg->createReply(); // use default reply for all messages msg->swapState(*reply); diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp index 0bbbdabd0aa..899dc146c8e 100644 --- a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp @@ -289,13 +289,13 @@ TEST_F("require that attributes are flushed and loaded", BaseFixture) AttributeManagerFixture amf(f); proton::AttributeManager &am = amf._m; AttributeVector::SP a1 = amf.addAttribute("a1"); - EXPECT_EQUAL(1u, a1->getNumDocs()); // Resized to size of attributemanager + EXPECT_EQUAL(1u, a1->getNumDocs()); // Resized to size of attributemanager fillAttribute(a1, 1, 3, 2, 100); - EXPECT_EQUAL(3u, a1->getNumDocs()); // Resized to size of attributemanager + EXPECT_EQUAL(3u, a1->getNumDocs()); // Resized to size of attributemanager AttributeVector::SP a2 = amf.addAttribute("a2"); - EXPECT_EQUAL(1u, a2->getNumDocs()); // Not resized to size of attributemanager + EXPECT_EQUAL(1u, a2->getNumDocs()); // Not resized to size of attributemanager fillAttribute(a2, 1, 5, 4, 100); - EXPECT_EQUAL(5u, a2->getNumDocs()); // Increased + EXPECT_EQUAL(5u, a2->getNumDocs()); // Increased EXPECT_TRUE(!ia1.load()); EXPECT_TRUE(!ia2.load()); EXPECT_TRUE(!ia3.load()); diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp index badb42d4be4..ce0205af29f 100644 --- a/searchcore/src/tests/proton/attribute/attribute_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp @@ -314,7 +314,7 @@ TEST_F("require that attribute writer handles remove", Fixture) f.remove(2, 0); // same sync token as previous try { f.remove(1, 0); // lower sync token than previous - EXPECT_TRUE(true); // update is ignored + EXPECT_TRUE(true); // update is ignored } catch (vespalib::IllegalStateException & e) { LOG(info, "Got expected exception: '%s'", e.getMessage().c_str()); EXPECT_TRUE(true); @@ -430,7 +430,7 @@ TEST_F("require that attribute writer handles update", Fixture) f.update(2, upd, 1, immediateCommit); // same sync token as previous try { f.update(1, upd, 1, immediateCommit); // lower sync token than previous - EXPECT_TRUE(true); // update is ignored + EXPECT_TRUE(true); // update is ignored } catch (vespalib::IllegalStateException & e) { LOG(info, "Got expected exception: '%s'", e.getMessage().c_str()); EXPECT_TRUE(true); diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp index 4b4e5b955a1..04ee9669d73 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp @@ -239,7 +239,7 @@ public: class MyExecutor: public vespalib::ThreadStackExecutor { public: - FastOS_ThreadId _threadId; + FastOS_ThreadId _threadId; MyExecutor(); diff --git a/searchcore/src/vespa/searchcore/fdispatch/common/timestat.cpp b/searchcore/src/vespa/searchcore/fdispatch/common/timestat.cpp index 808f16b633d..5dec5ba4bc3 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/common/timestat.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/common/timestat.cpp @@ -96,8 +96,8 @@ FastS_TimeStatHistory::getRecentStats(double tsince, double FastS_TimeStatHistory::getLoadTime(double tsince, double tnow) { - const uint32_t holeSize = 2; // 2 missing slots => hole - const uint32_t minSlotLoad = 4; // Mininum load for not being "missing" + const uint32_t holeSize = 2; // 2 missing slots => hole + const uint32_t minSlotLoad = 4; // Mininum load for not being "missing" uint32_t sinceTimeIdx = getTimeIdx(tsince); uint32_t timeIdx = getTimeIdx(tnow); uint32_t slotCount = _slotCount; @@ -106,9 +106,9 @@ FastS_TimeStatHistory::getLoadTime(double tsince, double tnow) for (; slotCount > 0u; --slotCount, slotIdx = prevTimeSlot(slotIdx)) { TimeSlot &ts = _timeSlots[slotIdx]; if (ts._timeIdx + holeSize < doneTimeIdx) - break; // Found hole, i.e. holeSize missing slots + break; // Found hole, i.e. holeSize missing slots if (ts._timeIdx + holeSize < sinceTimeIdx) - break; // No point in looking further back + break; // No point in looking further back if (ts._count >= minSlotLoad) doneTimeIdx = ts._timeIdx; } diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp index b6a1133d01d..d9f2b4ecd4f 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/program/fdispatch.cpp @@ -149,14 +149,14 @@ Fdispatch::CheckTempFail() FNETLiveCounter = _FNET_adapter.GetLiveCounter(); if (FNETLiveCounter == _lastFNETLiveCounter) { if (_FNETLiveCounterFailed) { - failflag = true; // Still failure + failflag = true; // Still failure } else if (!_FNETLiveCounterDanger) { _FNETLiveCounterDanger = true; _FNETLiveCounterDangerStart.SetNow(); } else if (_FNETLiveCounterDangerStart.MilliSecsToNow() >= 6000) { LOG(error, "fdispatch::Fdispatch::CheckTempFail: FNET inactive for 6 seconds, deadlock ?"); - _FNETLiveCounterFailed = true; // Note that we failed - failflag = true; // Force temporary failure + _FNETLiveCounterFailed = true; // Note that we failed + failflag = true; // Force temporary failure } else if (_FNETLiveCounterDangerStart.MilliSecsToNow() >= 3000 && !_FNETLiveCounterWarned) { _FNETLiveCounterWarned = true; diff --git a/searchcore/src/vespa/searchcore/fdispatch/program/searchadapter.h b/searchcore/src/vespa/searchcore/fdispatch/program/searchadapter.h index 0e9cef7f52a..d60b39c52be 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/program/searchadapter.h +++ b/searchcore/src/vespa/searchcore/fdispatch/program/searchadapter.h @@ -28,7 +28,7 @@ private: FastS_DataSetCollection *_dsc; FastS_ISearch *_search; FastS_SearchInfo *_searchInfo; - FastS_QueryResult *_queryResult; + FastS_QueryResult *_queryResult; void handleRequest(); SearchReply::UP createReply(); diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h b/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h index 0e387240a0f..be5dc80c35a 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/configdesc.h @@ -129,9 +129,9 @@ private: uint32_t _unitRefCost; // Cost to reference us uint32_t _partBits; // # bits used to encode part id uint32_t _rowBits; // # bits used to encode row id - uint32_t _numParts; // Number of partitions + uint32_t _numParts; // Number of partitions uint32_t _firstPart; // First partition - uint32_t _minChildParts; // Minimum partitions live to avoid tempfail + uint32_t _minChildParts; // Minimum partitions live to avoid tempfail uint32_t _maxNodesDownPerFixedRow; // max number of nodes down in a row before considering another row. bool _useRoundRobinForFixedRow; // Either plain roundrobin or random. uint32_t _maxHitsPerNode; // max hits requested from single node @@ -165,7 +165,7 @@ private: FastS_EngineDesc *_enginesHead; // first engine in dataset FastS_EngineDesc *_enginesTail; // last engine in dataset - uint32_t _mpp; // Minimum number of engines per partition + uint32_t _mpp; // Minimum number of engines per partition public: explicit FastS_DataSetDesc(uint32_t datasetid); ~FastS_DataSetDesc(); diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp index 5e8a09cc1a9..0374ac52b65 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.cpp @@ -176,7 +176,7 @@ FastS_DataSetBase::CheckQueryQueue_HasLock(FastS_TimeKeeper *timeKeeper) double delay; double fnow; - active = _queryQueue.GetActiveQueries(); // active from us + active = _queryQueue.GetActiveQueries(); // active from us estactive = CalculateQueueLens_HasLock(dispatchnodes);// active from us and others if (dispatchnodes == 0) @@ -210,7 +210,7 @@ FastS_DataSetBase::CheckQueryQueue_HasLock(FastS_TimeKeeper *timeKeeper) } if (active >= _queryQueue._overload._maxouractive) - return; // hard limit for how much we queue + return; // hard limit for how much we queue if (active >= _queryQueue._overload._minouractive && estactive >= _queryQueue._overload._minestactive) @@ -220,10 +220,10 @@ FastS_DataSetBase::CheckQueryQueue_HasLock(FastS_TimeKeeper *timeKeeper) SetActiveQuery_HasLock(); DeQueueHeadWakeup_HasLock(); - active++; // one more active from us - estactive += dispatchnodes; // Assume other nodes do likewise + active++; // one more active from us + estactive += dispatchnodes; // Assume other nodes do likewise if (_queryQueue._drainAllowed >= (double) dispatchnodes) - _queryQueue._drainAllowed -= dispatchnodes; // Rate limitation + _queryQueue._drainAllowed -= dispatchnodes; // Rate limitation else _queryQueue._drainAllowed = 0.0; } diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h index ac294694a6d..447de11147a 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/dataset_base.h @@ -63,7 +63,7 @@ public: { public: double _drainRate; // Queue drain rate - double _drainMax; // Max queue drain at once + double _drainMax; // Max queue drain at once uint32_t _minouractive; // minimum active requests from us uint32_t _maxouractive; // maximum active requests from us (queue) uint32_t _cutoffouractive; // cutoff active requests @@ -140,8 +140,8 @@ public: queryQueue_t(const queryQueue_t &); queryQueue_t& operator=(const queryQueue_t &); - queryQueued_t *_head; - queryQueued_t *_tail; + queryQueued_t *_head; + queryQueued_t *_tail; unsigned int _queueLen; unsigned int _active; @@ -175,7 +175,7 @@ protected: // Total cost as seen by referencing objects std::atomic<uint32_t> _totalrefcost; - uint32_t _mldDocStamp; + uint32_t _mldDocStamp; public: FastS_DataSetBase(FastS_AppContext *appCtx, diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.cpp index c6a7710cc4f..83ec3d73b11 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.cpp @@ -330,10 +330,10 @@ FastS_EngineBase::HandlePingResponse(uint32_t partid, _config._name, (uint32_t)_reported._docstamp, (uint32_t)docstamp); - if (docstamp == 0) { - LOG(warning, "Search node %s (partid %d) went bad (docstamp 0)", - _config._name, partid); - } + if (docstamp == 0) { + LOG(warning, "Search node %s (partid %d) went bad (docstamp 0)", + _config._name, partid); + } } } diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h b/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h index 3d306b183ed..51c8eb5fbc4 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/engine_base.h @@ -41,8 +41,8 @@ public: }; // the node goes up and down... - FastOS_Time _fliptime; // When state changed last to UP or big chg - FastOS_Time _floptime; // When state changed last from UP + FastOS_Time _fliptime; // When state changed last to UP or big chg + FastOS_Time _floptime; // When state changed last from UP // search/docsum slowness uint32_t _slowQueryCnt; @@ -107,10 +107,10 @@ public: public: char *_name; - uint32_t _unitrefcost; // Cost to reference us - uint32_t _confPartID; // Partid configured in partitions file - uint32_t _confRowID; // What row this engine belongs to - bool _confPartIDOverrides; // Ignore lower partid and use our conf value + uint32_t _unitrefcost; // Cost to reference us + uint32_t _confPartID; // Partid configured in partitions file + uint32_t _confRowID; // What row this engine belongs to + bool _confPartIDOverrides; // Ignore lower partid and use our conf value config_t(FastS_EngineDesc *desc); ~config_t(); }; @@ -133,7 +133,7 @@ protected: // Total cost as seen by referencing objects std::atomic<uint32_t> _totalrefcost; - std::atomic<uint32_t> _activecnt; // Our "load" on search node + std::atomic<uint32_t> _activecnt; // Our "load" on search node FastS_PlainDataSet *_dataset; // dataset for this engine diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp index 9f7b8f0c5bb..c5e3d001210 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.cpp @@ -12,10 +12,10 @@ #include <vespa/log/log.h> LOG_SETUP(".fnet_search"); -#define IS_MLD_PART(part) ((part) > mldpartidmask) -#define MLD_PART_TO_PARTID(part) ((part) & mldpartidmask) -#define ENCODE_MLD_PART(part) (((part) + 1) << partbits) -#define DECODE_MLD_PART(part) (((part) >> partbits) - 1) +#define IS_MLD_PART(part) ((part) > mldpartidmask) +#define MLD_PART_TO_PARTID(part) ((part) & mldpartidmask) +#define ENCODE_MLD_PART(part) (((part) + 1) << partbits) +#define DECODE_MLD_PART(part) (((part) >> partbits) - 1) using fdispatch::SearchPath; using vespalib::nbostream; @@ -530,7 +530,7 @@ FastS_FNET_Search::EncodePartIDs(uint32_t partid, uint32_t rowid, bool mld, FastS_FNET_Search::FastS_FNET_Search(FastS_DataSetCollection *dsc, FastS_FNET_DataSet *dataset, - FastS_TimeKeeper *timeKeeper) + FastS_TimeKeeper *timeKeeper) : FastS_AsyncSearch(dataset->GetID()), _lock(), _timeKeeper(timeKeeper), @@ -642,7 +642,7 @@ FastS_FNET_Search::GotDocsum(FastS_FNET_SearchNode *node, node->_pendingDocsums--; _pendingDocsums--; if ( ! _resbuf[offset]._buf.empty()) - _goodDocsums++; // Only nonempty docsum is considered good + _goodDocsums++; // Only nonempty docsum is considered good if (node->_pendingDocsums == 0) { node->_docsumTime = (GetTimeKeeper()->GetTime() - _startTime - node->_queryTime); _pendingDocsumNodes--; @@ -1246,7 +1246,7 @@ FastS_FNET_Search::GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) node->_docsumRow = row; } else if (!node->_flags._docsumMld || row != node->_docsumRow) { if (_nodesConnected) - continue; // Drop (inconsistent) + continue; // Drop (inconsistent) node = node->allocExtraDocsumNode(true, row, rowbits); } node->_docidCnt++; @@ -1258,7 +1258,7 @@ FastS_FNET_Search::GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) node->_docsumRow = row; } else if (node->_flags._docsumMld || row != node->_docsumRow) { if (_nodesConnected) - continue; // Drop (inconsistent) + continue; // Drop (inconsistent) node = node->allocExtraDocsumNode(false, row, rowbits); } node->_docidCnt++; @@ -1276,7 +1276,7 @@ FastS_FNET_Search::GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) node->_flags._docsumMld = true;// Only accept MLD from now on } else if (!node->_flags._docsumMld) { if (_nodesConnected) - continue; // Drop (inconsistent) + continue; // Drop (inconsistent) node = node->allocExtraDocsumNode(true, 0, 0); } node->_docidCnt++; @@ -1287,7 +1287,7 @@ FastS_FNET_Search::GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) if (node->_docidCnt == 0) { } else if (node->_flags._docsumMld) { if (_nodesConnected) - continue; // Drop (inconsistent) + continue; // Drop (inconsistent) node = node->allocExtraDocsumNode(false, 0, 0); } node->_docidCnt++; @@ -1326,7 +1326,7 @@ FastS_FNET_Search::GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) node = getNode(partid); if (!node->_flags._docsumMld || row != node->_docsumRow) { if (_nodesConnected) - continue; // Drop (inconsistent) + continue; // Drop (inconsistent) node = node->allocExtraDocsumNode(true, row, rowbits); } @@ -1340,7 +1340,7 @@ FastS_FNET_Search::GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) node = getNode(partid0); if (node->_flags._docsumMld || row != node->_docsumRow) { if (_nodesConnected) - continue; // Drop (inconsistent) + continue; // Drop (inconsistent) node = node->allocExtraDocsumNode(false, row, rowbits); } @@ -1359,7 +1359,7 @@ FastS_FNET_Search::GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) node = getNode(partid); if (!node->_flags._docsumMld) { if (_nodesConnected) - continue; // Drop (inconsistent) + continue; // Drop (inconsistent) node = node->allocExtraDocsumNode(true, 0, 0); } @@ -1373,7 +1373,7 @@ FastS_FNET_Search::GetDocsums(const FastS_hitresult *hits, uint32_t hitcnt) node = getNode(p->_partition); if (node->_flags._docsumMld) { if (_nodesConnected) - continue; // Drop (inconsistent) + continue; // Drop (inconsistent) node = node->allocExtraDocsumNode(false, 0, 0); } diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h index 039a56fbc9b..5a2c3c6a0c9 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/fnet_search.h @@ -222,9 +222,9 @@ private: Timeout _timeout; FastS_QueryCacheUtil _util; std::unique_ptr<search::grouping::MergingManager> _groupMerger; - FastS_DataSetCollection *_dsc; // owner keeps this alive + FastS_DataSetCollection *_dsc; // owner keeps this alive FastS_FNET_DataSet *_dataset; - bool _datasetActiveCostRef; + bool _datasetActiveCostRef; std::vector<FastS_FNET_SearchNode> _nodes; bool _nodesConnected; @@ -233,27 +233,27 @@ private: FNETMode _FNET_mode; - uint32_t _pendingQueries; // # nodes with query left - uint32_t _goodQueries; // # queries good - uint32_t _pendingDocsums; // # docsums left + uint32_t _pendingQueries; // # nodes with query left + uint32_t _goodQueries; // # queries good + uint32_t _pendingDocsums; // # docsums left uint32_t _pendingDocsumNodes; // # nodes with docsums left - uint32_t _requestedDocsums; // # docsums requested - uint32_t _goodDocsums; // # docsums good - uint32_t _queryNodes; // #nodes with query + uint32_t _requestedDocsums; // # docsums requested + uint32_t _goodDocsums; // # docsums good + uint32_t _queryNodes; // #nodes with query uint32_t _queryNodesTimedOut; // #nodes with query timeout - uint32_t _docsumNodes; // #nodes with docsums + uint32_t _docsumNodes; // #nodes with docsums uint32_t _docsumNodesTimedOut; // #nodes with docsum timeout uint32_t _docsumsTimedOut; bool _queryTimeout; bool _docsumTimeout; - double _queryStartTime; + double _queryStartTime; double _queryMinWait; double _queryMaxWait; bool _queryWaitCalculated; - double _adjustedQueryTimeOut; - double _docSumStartTime; - double _adjustedDocSumTimeOut; + double _adjustedQueryTimeOut; + double _docSumStartTime; + double _adjustedDocSumTimeOut; uint32_t _fixedRow; std::vector<FastS_fullresult> _resbuf; diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp index d9b469252fe..fd60b16ee70 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.cpp @@ -164,7 +164,7 @@ FastS_NodeManager::SubscribePartMap(const config::ConfigUri & configUri) uint32_t FastS_NodeManager::SetPartMap(const PartitionsConfig& partmap, - unsigned int waitms) + unsigned int waitms) { LockConfig(); FastS_DataSetCollDesc *configDesc = new FastS_DataSetCollDesc(); diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h index e077f47f218..e42964d82da 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/nodemanager.h @@ -29,8 +29,8 @@ private: FastOS_Mutex _stampLock; FastS_AppContext *_appCtx; uint32_t _mldPartit; - uint32_t _mldDocStamp; // Bumped for all cache flushes - uint32_t _mldDocStampMin; // Bumped for global cache flush + uint32_t _mldDocStamp; // Bumped for all cache flushes + uint32_t _mldDocStampMin; // Bumped for global cache flush uint32_t _gencnt; FastS_QueryPerf _queryPerf; diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h b/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h index d2392855695..9afd44046a4 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/plain_dataset.h @@ -50,9 +50,9 @@ public: Partition *_partitions; uint32_t _partBits; uint32_t _rowBits; - uint32_t _num_partitions; // Number of partitions (active) + uint32_t _num_partitions; // Number of partitions (active) uint32_t _first_partition; // From partitions-file 'firstpart' (active) - uint32_t _minchildparts; // Minimum partitions live to avoid tempfail + uint32_t _minchildparts; // Minimum partitions live to avoid tempfail uint32_t _maxNodesDownPerFixedRow; bool _useRoundRobinForFixedRow; uint32_t _childnodes; @@ -61,7 +61,7 @@ public: uint32_t _childparts; uint32_t _childmaxpartsNow; uint32_t _childmaxpartsSinceReload; - uint32_t _mpp; // Number of engines needed per partition + uint32_t _mpp; // Number of engines needed per partition std::vector<uint32_t> _numPartitions; @@ -117,15 +117,15 @@ protected: double _slowQueryLimitBias; double _slowDocsumLimitFactor; double _slowDocsumLimitBias; - double _monitorInterval; - double _higherCoverageMaxSearchWait; - double _higherCoverageMinSearchWait; - double _higherCoverageBaseSearchWait; - double _minimalSearchCoverage; - double _higherCoverageMaxDocSumWait; - double _higherCoverageMinDocSumWait; - double _higherCoverageBaseDocSumWait; - double _minimalDocSumCoverage; + double _monitorInterval; + double _higherCoverageMaxSearchWait; + double _higherCoverageMinSearchWait; + double _higherCoverageBaseSearchWait; + double _minimalSearchCoverage; + double _higherCoverageMaxDocSumWait; + double _higherCoverageMinDocSumWait; + double _higherCoverageBaseDocSumWait; + double _minimalDocSumCoverage; uint32_t _maxHitsPerNode; // Max hits requested from single node uint32_t _estimateParts; // number of partitions used for estimate uint32_t _estimatePartCutoff; // First partition not used for estimate diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp index df4b8c09451..5a2fd5a95c3 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp +++ b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.cpp @@ -56,7 +56,7 @@ FastS_QueryCacheUtil::setSearchRequest(const search::engine::SearchRequest * req void FastS_QueryCacheUtil::SetupQuery(uint32_t maxhits, - uint32_t offset) + uint32_t offset) { FastS_assert(_queryResult._hitbuf == NULL); FastS_assert(_alignedHitBuf == NULL); @@ -152,5 +152,5 @@ FastS_QueryCacheUtil::InitEstimateMode() _searchInfo._searchOffset = 0; _searchInfo._maxHits = 0; _ranking.clear(); - _dateTime = 0; + _dateTime = 0; } diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h index 074b53e7de0..c9871475e71 100644 --- a/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h +++ b/searchcore/src/vespa/searchcore/fdispatch/search/querycacheutil.h @@ -18,24 +18,24 @@ private: FastS_QueryCacheUtil(const FastS_QueryCacheUtil &); FastS_QueryCacheUtil& operator=(const FastS_QueryCacheUtil &); - double _startTime; // For the query + double _startTime; // For the query - uint32_t _userMaxHits; // Max hits spec.d by user; NB: see _systemMaxHits - uint32_t _alignedMaxHits; // Max hits (forwarded to engine) + uint32_t _userMaxHits; // Max hits spec.d by user; NB: see _systemMaxHits + uint32_t _alignedMaxHits; // Max hits (forwarded to engine) uint32_t _alignedSearchOffset; // Search offset (forwarded to engine) vespalib::string _ranking; // ranking profile to be used uint32_t _randomSeed; // seed for random rank values - uint32_t _dateTime; // datetime used for freshness boost + uint32_t _dateTime; // datetime used for freshness boost - FastS_query _query; // NB: Here it is! + FastS_query _query; // NB: Here it is! FastS_QueryResult _queryResult; FastS_DocsumsResult _docsumsResult; FastS_SearchInfo _searchInfo; - FastS_hitresult *_alignedHitBuf; // Hits from engine - bool _hitbuf_needfree; // Destructor should free _hitbuf. - uint32_t _alignedHitCount; // # Hits from engine + FastS_hitresult *_alignedHitBuf; // Hits from engine + bool _hitbuf_needfree; // Destructor should free _hitbuf. + uint32_t _alignedHitCount; // # Hits from engine uint32_t *_sortIndex; char *_sortData; // NB: same malloc as _sortIndex diff --git a/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp b/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp index 2cd6e7d9255..0915c11acfa 100644 --- a/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp @@ -220,7 +220,7 @@ SelectPruner::visitComparison(const Compare &expr) } return; } - _resultSet.fill(); // should be less if const + _resultSet.fill(); // should be less if const addNodeCount(lhs); addNodeCount(rhs); } diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp index 2fc395d4438..0ac634d05df 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp @@ -454,7 +454,7 @@ DocumentMetaStore::DocumentMetaStore(BucketDBOwner::SP bucketDB, _subDbType(subDbType), _trackDocumentSizes(true) { - ensureSpace(0); // lid 0 is reserved + ensureSpace(0); // lid 0 is reserved setCommittedDocIdLimit(1u); // lid 0 is reserved _gidToLidMap.getAllocator().freeze(); // create initial frozen tree generation_t generation = getGenerationHandler().getCurrentGeneration(); @@ -846,7 +846,7 @@ DocumentMetaStore::getLids(const BucketId &bucketId, std::vector<DocId> &lids) uint8_t bucketUsedBits = metaData.getBucketUsedBits(); assert(BucketId::validUsedBits(bucketUsedBits)); if (bucketUsedBits != bucketId.getUsedBits()) - continue; // Skip document belonging to overlapping bucket + continue; // Skip document belonging to overlapping bucket lids.push_back(lid); } } diff --git a/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp b/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp index 4a5034bf423..81bdddba345 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp @@ -106,7 +106,7 @@ DocumentBucketMover::moveDocuments(size_t maxDocsToMove) : _source->_metaStore->lowerBound(_bucket)); const Iterator end = _source->_metaStore->upperBound(_bucket); size_t docsMoved = 0; - size_t docsSkipped = 0; // In absence of a proper cost metric + size_t docsSkipped = 0; // In absence of a proper cost metric typedef std::vector<MoveKey> MoveVec; MoveVec toMove; for (; itr != end && docsMoved < maxDocsToMove; ++itr) { diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp index 6dd9a3e3ee2..d83f3714e4c 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp @@ -623,7 +623,7 @@ DocumentDB::saveInitialConfig(const DocumentDBConfig &configSnapshot) lock_guard guard(_configMutex); if (_config_store->getBestSerialNum() != 0) - return; // Initial config already present + return; // Initial config already present SerialNum confSerial = _feedHandler.incSerialNum(); // Elide save of new config entry in transaction log, it would be diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h index 6773798d2d7..d06ce9050b7 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h @@ -173,7 +173,7 @@ private: * * Called by executor thread. * - * @param feedView shared pointer to feed view to be dropped. + * @param feedView shared pointer to feed view to be dropped. */ void performDropFeedView(IFeedView::SP feedView); void performDropFeedView2(IFeedView::SP feedView); @@ -375,8 +375,8 @@ public: virtual SerialNum getCurrentSerialNumber() const { - // Called by flush scheduler thread, by executor task or - // visitor callback. + // Called by flush scheduler thread, by executor task or + // visitor callback. // XXX: Contains future value during replay. return _feedHandler.getSerialNum(); } diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp index a1cdad5bd22..cae45d50d6d 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp @@ -336,7 +336,7 @@ forwardConfig(const BootstrapConfig::SP & config) { if (!_ignoreForwardedConfig && config->getGeneration() < _bootstrapConfig->getGeneration()) - return; // Enforce time direction + return; // Enforce time direction _bootstrapConfig = config; _ignoreForwardedConfig = false; } diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp index 2bd2cb1eda1..4d8bfe38271 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp @@ -451,7 +451,7 @@ FileConfigManager::prune(SerialNum serialNum) } std::sort(toPrune.begin(), toPrune.end()); if (!toPrune.empty()) - toPrune.pop_back(); // Keep newest old entry + toPrune.pop_back(); // Keep newest old entry if (toPrune.empty()) return; for (const auto &serial : toPrune) { diff --git a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h index e2621bc6118..ab98882e6d1 100644 --- a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h +++ b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.h @@ -19,7 +19,7 @@ class IFrozenBucketHandler; class PruneRemovedDocumentsJob : public BlockableMaintenanceJob { private: - const IDocumentMetaStore &_metaStore; // external ownership + const IDocumentMetaStore &_metaStore; // external ownership uint32_t _subDbId; double _cfgAgeLimit; const vespalib::string &_docTypeName; diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h index ab64c511310..19cf6c9c4c3 100644 --- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h +++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.h @@ -22,10 +22,10 @@ private: class Session { private: fastos::TimeStamp _createTime; - int64_t _numDocs; + int64_t _numDocs; vespalib::string _delayedConfigs; int64_t _gen; - bool _down; + bool _down; public: typedef std::shared_ptr<Session> SP; Session(); diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp index f88fb07ab29..df1417f0d73 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.cpp @@ -276,7 +276,7 @@ reconfigure(vespalib::Closure0<bool>::UP closure) bool ret = true; if (closure.get() != NULL) - ret = closure->call(); // Perform index manager reconfiguration now + ret = closure->call(); // Perform index manager reconfiguration now reconfigureIndexSearchable(); return ret; } diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h index ed540053de3..d62a92d33a8 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h @@ -40,7 +40,7 @@ namespace documentmetastore { class LidReuseDelayerConfig; } class DocSubDB : public IDocumentSubDB { protected: - IDocumentSubDBOwner &_owner; + IDocumentSubDBOwner &_owner; search::transactionlog::SyncProxy &_tlSyncer; public: @@ -151,7 +151,7 @@ protected: SerialNum _flushedDocumentMetaStoreSerialNum; SerialNum _flushedDocumentStoreSerialNum; DocumentMetaStore::SP _dms; - ISummaryManager::SP _iSummaryMgr; // Interface class + ISummaryManager::SP _iSummaryMgr; // Interface class private: SummaryManager::SP _rSummaryMgr; // Our specific subclass ISummaryAdapter::SP _summaryAdapter; diff --git a/searchcore/src/vespa/searchcore/util/eventloop.h b/searchcore/src/vespa/searchcore/util/eventloop.h index 1f49ce5651f..0a17ec1287a 100644 --- a/searchcore/src/vespa/searchcore/util/eventloop.h +++ b/searchcore/src/vespa/searchcore/util/eventloop.h @@ -8,8 +8,8 @@ class FastS_TimeOut { public: enum ValName { - maxSockSilent, // 0 - valCnt // 1 - Must be last, used as array size: + maxSockSilent, // 0 + valCnt // 1 - Must be last, used as array size: }; static double _val[valCnt]; diff --git a/searchcore/src/vespa/searchcore/util/log.cpp b/searchcore/src/vespa/searchcore/util/log.cpp index 193f9204310..fc25fa1f346 100644 --- a/searchcore/src/vespa/searchcore/util/log.cpp +++ b/searchcore/src/vespa/searchcore/util/log.cpp @@ -9,9 +9,9 @@ LOG_SETUP(".searchcore.util.log"); * assert and abort functions. */ void __FastS_assert_fail(const char *assertion, - const char *file, - unsigned int line, - const char * function) + const char *file, + unsigned int line, + const char * function) { const char *vtag = V_TAG; if (function != NULL) { @@ -30,9 +30,9 @@ void __FastS_assert_fail(const char *assertion, } void __FastS_abort(const char *message, - const char *file, - unsigned int line, - const char * function) + const char *file, + unsigned int line, + const char * function) { const char *vtag = V_TAG; if (function != NULL) { |