Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Pick 2.0](index writer) fix docWriter is null, when reenter close #217

Merged
merged 2 commits into from
May 22, 2024
Merged

[Pick 2.0](index writer) fix docWriter is null, when reenter close #217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6453e00
[Fix](index writer) fix core if docWriter nullptr when IndexWriter do…
airborne12 May 10, 2024
e4adb82
[Fix](index writer) fix docWriter is null, when reenter close (#214)
airborne12 May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/core/CLucene/index/IndexWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,10 @@ void IndexWriter::closeInternal(bool waitForMerges) {
try {
if (infoStream != NULL)
message(string("now flush at close"));

// if docWriter is nullptr, maybe it's been flushed already
if (docWriter == nullptr) {
return;
}
docWriter->close();

// Only allow a _CLNEW merge to be triggered if we are
Expand Down Expand Up @@ -2048,6 +2051,11 @@ void IndexWriter::flush(bool triggerMerge, bool _flushDocStores) {
bool IndexWriter::doFlush(bool _flushDocStores) {
SCOPED_LOCK_MUTEX(THIS_LOCK)

// if docWriter is nullptr, maybe it's been flushed already
if (docWriter == nullptr) {
return false;
}

// Make sure no threads are actively adding a document

// Returns true if docWriter is currently aborting, in
Expand Down
Loading