Backup_Repos/komga
1
0
Fork 0
mirror of https://github.com/gotson/komga.git synced 2025-12-06 08:32:25 +01:00
Code Issues Projects Releases Wiki Activity

refactor: move lucene commit to separate class

Browse source
This commit is contained in:
Gauthier Roebroeck 2025-07-31 15:01:24 +08:00
parent a80eb59b1b
commit 243355f2c9
4 changed files with 60 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneAsyncCommitter.kt Normal file
View file

@ -0,0 +1,33 @@
package org.gotson.komga.infrastructure.search
import org.apache.lucene.index.IndexWriter
import org.apache.lucene.search.SearcherManager
import org.springframework.beans.factory.annotation.Value
import org.springframework.scheduling.TaskScheduler
import org.springframework.stereotype.Component
import java.time.Duration
import java.time.ZonedDateTime
import java.util.concurrent.ScheduledFuture
@Component
class LuceneAsyncCommitter(
private val indexWriter: IndexWriter,
private val searcherManager: SearcherManager,
private val taskScheduler: TaskScheduler,
@param:Value("#{@komgaProperties.lucene.commitDelay}")
private val commitDelay: Duration,
) : LuceneCommitter {
@Volatile
private var commitFuture: ScheduledFuture<*>? = null
private val commitRunnable =
Runnable {
indexWriter.commit()
searcherManager.maybeRefresh()
}
override fun commitAndMaybeRefresh() {
if (commitFuture == null || commitFuture!!.isDone)
commitFuture = taskScheduler.schedule(commitRunnable, ZonedDateTime.now().plus(commitDelay).toInstant())
}
}

5
komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneComimtter.kt Normal file
View file

@ -0,0 +1,5 @@
package org.gotson.komga.infrastructure.search
interface LuceneCommitter {
fun commitAndMaybeRefresh()
}

14
komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneConfiguration.kt
View file

@ -1,5 +1,10 @@
package org.gotson.komga.infrastructure.search
import org.apache.lucene.analysis.Analyzer
import org.apache.lucene.index.IndexWriter
import org.apache.lucene.index.IndexWriterConfig
import org.apache.lucene.search.SearcherFactory
import org.apache.lucene.search.SearcherManager
import org.apache.lucene.store.ByteBuffersDirectory
import org.apache.lucene.store.Directory
import org.apache.lucene.store.FSDirectory
@ -30,4 +35,13 @@ class LuceneConfiguration(
@Bean
@Profile("!test")
fun diskDirectory(): Directory = FSDirectory.open(Paths.get(komgaProperties.lucene.dataDirectory), SingleInstanceLockFactory())
@Bean
fun indexWriter(
directory: Directory,
indexAnalyzer: Analyzer,
): IndexWriter = IndexWriter(directory, IndexWriterConfig(indexAnalyzer))
@Bean
fun searcherManager(indexWriter: IndexWriter) = SearcherManager(indexWriter, SearcherFactory())
}

39
komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneHelper.kt
View file

@ -15,16 +15,10 @@ import org.apache.lucene.queryparser.classic.ParseException
import org.apache.lucene.queryparser.classic.QueryParser
import org.apache.lucene.search.BooleanClause
import org.apache.lucene.search.BooleanQuery
import org.apache.lucene.search.SearcherFactory
import org.apache.lucene.search.SearcherManager
import org.apache.lucene.search.TermQuery
import org.apache.lucene.store.Directory
import org.springframework.beans.factory.annotation.Value
import org.springframework.scheduling.TaskScheduler
import org.springframework.stereotype.Component
import java.time.Duration
import java.time.ZonedDateTime
import java.util.concurrent.ScheduledFuture
private val logger = KotlinLogging.logger {}
@ -34,14 +28,11 @@ private const val MAX_RESULTS = 1000
class LuceneHelper(
private val directory: Directory,
private val searchAnalyzer: Analyzer,
private val taskScheduler: TaskScheduler,
private val indexAnalyzer: Analyzer,
@param:Value("#{@komgaProperties.lucene.commitDelay}")
private val commitDelay: Duration,
private val indexWriter: IndexWriter,
private val searcherManager: SearcherManager,
private val luceneCommitter: LuceneCommitter,
) {
private val indexWriter: IndexWriter = IndexWriter(directory, IndexWriterConfig(indexAnalyzer))
private val searcherManager = SearcherManager(indexWriter, SearcherFactory())
fun indexExists(): Boolean = DirectoryReader.indexExists(directory)
fun setIndexVersion(version: Int) {
@ -87,7 +78,7 @@ class LuceneHelper(
val searcher = searcherManager.acquire()
val topDocs = searcher.search(booleanQuery, MAX_RESULTS)
topDocs.scoreDocs.map { searcher.storedFields().document(it.doc)[entity.id] }
} catch (e: ParseException) {
} catch (_: ParseException) {
emptyList()
} catch (e: Exception) {
logger.error(e) { "Error fetching entities from index" }
@ -104,12 +95,12 @@ class LuceneHelper(
fun addDocument(doc: Document) {
indexWriter.addDocument(doc)
commitAndMaybeRefresh()
luceneCommitter.commitAndMaybeRefresh()
}
fun addDocuments(docs: Iterable<Document>) {
indexWriter.addDocuments(docs)
commitAndMaybeRefresh()
luceneCommitter.commitAndMaybeRefresh()
}
fun updateDocument(
@ -117,25 +108,11 @@ class LuceneHelper(
doc: Document,
) {
indexWriter.updateDocument(term, doc)
commitAndMaybeRefresh()
luceneCommitter.commitAndMaybeRefresh()
}
fun deleteDocuments(term: Term) {
indexWriter.deleteDocuments(term)
commitAndMaybeRefresh()
}
@Volatile
private var commitFuture: ScheduledFuture<*>? = null
private val commitRunnable =
Runnable {
indexWriter.commit()
searcherManager.maybeRefresh()
}
private fun commitAndMaybeRefresh() {
if (commitFuture == null || commitFuture!!.isDone)
commitFuture = taskScheduler.schedule(commitRunnable, ZonedDateTime.now().plus(commitDelay).toInstant())
luceneCommitter.commitAndMaybeRefresh()
}
}