aboutsummaryrefslogtreecommitdiffstats
path: root/searchcorespi
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2019-01-07 21:24:20 +0100
committerGitHub <noreply@github.com>2019-01-07 21:24:20 +0100
commit0d69f9fa258df33f00b708f1ee9af58a8f33917c (patch)
treeabfc76398a10cebc8ba584c98a073a25e83eafab /searchcorespi
parent8191ade44977f2874d60fc6811bbb9427a60510d (diff)
Revert "Compact lid space on source selector."
Diffstat (limited to 'searchcorespi')
-rw-r--r--searchcorespi/src/tests/plugin/plugin.cpp1
-rw-r--r--searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h8
-rw-r--r--searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp10
-rw-r--r--searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h1
4 files changed, 0 insertions, 20 deletions
diff --git a/searchcorespi/src/tests/plugin/plugin.cpp b/searchcorespi/src/tests/plugin/plugin.cpp
index d32b02f45fd..5614ea1da3a 100644
--- a/searchcorespi/src/tests/plugin/plugin.cpp
+++ b/searchcorespi/src/tests/plugin/plugin.cpp
@@ -20,7 +20,6 @@ public:
virtual void removeDocument(uint32_t, SerialNum) override { }
virtual void commit(SerialNum, OnWriteDoneType) override { }
virtual void heartBeat(SerialNum ) override {}
- void compactLidSpace(uint32_t, SerialNum) override {}
virtual SerialNum getCurrentSerialNum() const override { return 0; }
virtual SerialNum getFlushedSerialNum() const override { return 0; }
virtual IndexSearchable::SP getSearchable() const override {
diff --git a/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h b/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h
index cc07a940ef1..be439d499dd 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/iindexmanager.h
@@ -108,14 +108,6 @@ public:
virtual void heartBeat(SerialNum serialNum) = 0;
/**
- * This method is called when lid space is compacted.
- *
- * @param lidLimit The new lid limit.
- * @param serialNum The serial number of the lid space compaction operation.
- */
- virtual void compactLidSpace(uint32_t lidLimit, SerialNum serialNum) = 0;
-
- /**
* Returns the current serial number of the index.
* This should also reflect any heart beats.
*
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
index 6a7f4a14f2a..1e63741084d 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.cpp
@@ -1173,16 +1173,6 @@ IndexMaintainer::heartBeat(SerialNum serialNum)
_current_serial_num = serialNum;
}
-void
-IndexMaintainer::compactLidSpace(uint32_t lidLimit, SerialNum serialNum)
-{
- assert(_ctx.getThreadingService().index().isCurrentThread());
- LOG(info, "compactLidSpace(%u, %lu)", lidLimit, serialNum);
- LockGuard lock(_index_update_lock);
- _current_serial_num = serialNum;
- _selector->compactLidSpace(lidLimit);
-}
-
IFlushTarget::List
IndexMaintainer::getFlushTargets(void)
{
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
index 06f02c5b9ef..fb0bc2e5e78 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexmaintainer.h
@@ -357,7 +357,6 @@ public:
void removeDocument(uint32_t lid, SerialNum serialNum) override;
void commit(SerialNum serialNum, OnWriteDoneType onWriteDone) override;
void heartBeat(search::SerialNum serialNum) override;
- void compactLidSpace(uint32_t lidLimit, SerialNum serialNum) override;
SerialNum getCurrentSerialNum() const override {
return _current_serial_num;