diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-10-05 16:33:45 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-10-05 16:33:45 +0200 |
commit | 60d5c4a3966d7b22691afbb7ab9f4d127c2b182e (patch) | |
tree | 66dc655dc3ebac43a0983286d599f97b6e245d1f /searchcore | |
parent | db558ba6d4442c443cd18ba34bbf97a8e1321621 (diff) |
Remove document meta store stub method.
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp | 57 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h | 6 |
2 files changed, 1 insertions, 62 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp index bca5876267b..c6a2564cea2 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp @@ -302,59 +302,6 @@ DocumentMetaStore::onLoad() return true; } -bool -DocumentMetaStore::checkBuckets(const GlobalId &gid, const BucketId &bucketId, - const TreeType::Iterator &itr, bool found) -{ - bool success = true; -#if 0 - TreeType::Iterator p = itr; - --p; - if (p.valid()) { - DocId prevLid = p.getKey(); - RawDocumentMetaData &prevMetaData = _metaDataStore[prevLid]; - BucketId prevBucketId = prevMetaData.getBucketId(); - if (bucketId != prevBucketId && - (bucketId.contains(prevBucketId) || - prevBucketId.contains(bucketId))) { - LOG(error, - "Bucket overlap, gid %s bucketId %s and prev gid %s bucket %s", - gid.toString().c_str(), - bucketId.toString().c_str(), - prevMetaData.getGid().toString().c_str(), - prevBucketId.toString().c_str()); - success = false; - } - } - TreeType::Iterator n = itr; - if (found) - ++n; - if (n.valid()) { - DocId nextLid = n.getKey(); - RawDocumentMetaData &nextMetaData = _metaDataStore[nextLid]; - BucketId nextBucketId = nextMetaData.getBucketId(); - if (bucketId != nextBucketId && - (bucketId.contains(nextBucketId) || - nextBucketId.contains(bucketId))) { - LOG(error, - "Bucket overlap, gid %s bucketId %s and next gid %s bucket %s", - gid.toString().c_str(), - bucketId.toString().c_str(), - nextMetaData.getGid().toString().c_str(), - nextBucketId.toString().c_str()); - success = false; - } - } -#else - (void) gid; - (void) bucketId; - (void) itr; - (void) found; -#endif - return success; -} - - template <typename TreeView> typename TreeView::Iterator DocumentMetaStore::lowerBound(const BucketId &bucketId, @@ -523,9 +470,7 @@ DocumentMetaStore::put(const GlobalId &gid, TreeType::Iterator itr = _gidToLidMap.lowerBound(KeyComp::FIND_DOC_ID, comp); bool found = itr.valid() && !comp(KeyComp::FIND_DOC_ID, itr.getKey()); - if (!checkBuckets(gid, bucketId, itr, found)) { - // Failure - } else if (!found) { + if (!found) { if (validLid(lid)) { throw IllegalStateException( make_string( diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h index ba462fb070b..4274c49f5b5 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h @@ -91,12 +91,6 @@ private: std::unique_ptr<search::AttributeSaver> onInitSave(vespalib::stringref fileName) override; bool onLoad() override; - bool - checkBuckets(const GlobalId &gid, - const BucketId &bucketId, - const TreeType::Iterator &itr, - bool found); - template <typename TreeView> typename TreeView::Iterator lowerBound(const BucketId &bucketId, |