hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Improve dsl

Browse Source
This commit is contained in:
Hubert Van De Walle 2020-08-21 16:28:03 +02:00
parent f12947acbd
commit 372652d332
3 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
search/src/main/kotlin/Extractors.kt
View File

@ -23,13 +23,9 @@ internal fun PersistedNote.toDocument(): Document {
}
}
internal fun TopDocs.toResults(searcher: IndexSearcher) = scoreDocs.map {
searcher.doc(it.doc).let { doc ->
PersistedNoteMetadata(
title = doc.get(titleField),
uuid = UuidFieldConverter.fromDoc(doc.get(uuidField)),
updatedAt = LocalDateTimeFieldConverter.fromDoc(doc.get(updatedAtField)),
tags = TagsFieldConverter.fromDoc(doc.get(tagsField))
internal fun Document.toNoteMeta() = PersistedNoteMetadata(
title = get(titleField),
uuid = UuidFieldConverter.fromDoc(get(uuidField)),
updatedAt = LocalDateTimeFieldConverter.fromDoc(get(updatedAtField)),
tags = TagsFieldConverter.fromDoc(get(tagsField))
)
}
}

18
search/src/main/kotlin/LuceneDsl.kt
View File

@ -1,12 +1,14 @@
package be.simplenotes.search
import org.apache.lucene.document.Document
import org.apache.lucene.index.Term
import org.apache.lucene.search.BooleanClause
import org.apache.lucene.search.BooleanQuery
import org.apache.lucene.search.FuzzyQuery
import org.apache.lucene.search.Query
import org.apache.lucene.search.*
import org.slf4j.LoggerFactory
fun query(receiver: LuceneDsl.() -> Unit): Query {
private val logger = LoggerFactory.getLogger("be.simplenotes.search.dsl")
fun IndexSearcher.query(receiver: LuceneDsl.() -> Unit): List<Document> {
val indexSearcher = this
val builder = BooleanQuery.Builder()
val dsl = LuceneDsl()
dsl.apply { this.receiver() }
@ -15,11 +17,15 @@ fun query(receiver: LuceneDsl.() -> Unit): Query {
builder.add(BooleanClause(FuzzyQuery(Term(field, query)), BooleanClause.Occur.SHOULD))
}
}
return builder.build()
val query = builder.build()
val topDocs = indexSearcher.search(query, dsl.count)
logger.debug("Searching: `$query` results: ${topDocs.totalHits.value}")
return topDocs.scoreDocs.map { indexSearcher.doc(it.doc) }
}
class LuceneDsl {
val clauses = mutableListOf<BooleanExpression>()
var count: Int = 10
fun addBooleanClause(booleanDsl: BooleanExpression) {
clauses.add(booleanDsl)

42
search/src/main/kotlin/NoteSearcherImpl.kt
View File

@ -1,13 +1,14 @@
package be.simplenotes.search
import be.simplenotes.domain.model.PersistedNote
import be.simplenotes.domain.model.PersistedNoteMetadata
import be.simplenotes.domain.usecases.search.NoteSearcher
import be.simplenotes.domain.usecases.search.SearchTerms
import be.simplenotes.search.utils.rmdir
import org.apache.lucene.analysis.standard.StandardAnalyzer
import org.apache.lucene.document.Document
import org.apache.lucene.index.*
import org.apache.lucene.search.*
import org.apache.lucene.search.IndexSearcher
import org.apache.lucene.search.TermQuery
import org.apache.lucene.store.Directory
import org.apache.lucene.store.FSDirectory
import org.slf4j.LoggerFactory
@ -26,22 +27,25 @@ class NoteSearcherImpl(basePath: Path = Path.of("/tmp", "lucene")) : NoteSearche
return FSDirectory.open(index)
}
private fun getIndexSearcher(userId: Int): IndexSearcher {
private fun indexSearcher(userId: Int): IndexSearcher {
val directory = getDirectory(userId)
val reader: IndexReader = DirectoryReader.open(directory)
return IndexSearcher(reader)
}
private fun writer(userId: Int): IndexWriter {
val dir = getDirectory(userId)
val config = IndexWriterConfig(StandardAnalyzer())
return IndexWriter(dir, config)
}
// endregion
override fun indexNote(userId: Int, note: PersistedNote) {
logger.debug("Indexing note ${note.uuid} for user $userId")
val dir = getDirectory(userId)
val config = IndexWriterConfig(StandardAnalyzer())
val writer = IndexWriter(dir, config)
val doc = note.toDocument()
with(writer) {
with(writer(userId)) {
addDocument(doc)
commit()
close()
@ -51,12 +55,9 @@ class NoteSearcherImpl(basePath: Path = Path.of("/tmp", "lucene")) : NoteSearche
override fun indexNotes(userId: Int, notes: List<PersistedNote>) {
logger.debug("Indexing notes for user $userId")
val dir = getDirectory(userId)
val config = IndexWriterConfig(StandardAnalyzer())
val writer = IndexWriter(dir, config)
val docs = notes.map { it.toDocument() }
with(writer) {
with(writer(userId)) {
addDocuments(docs)
commit()
close()
@ -66,11 +67,7 @@ class NoteSearcherImpl(basePath: Path = Path.of("/tmp", "lucene")) : NoteSearche
override fun deleteIndex(userId: Int, uuid: UUID) {
logger.debug("Deleting index $uuid for user $userId")
val dir = getDirectory(userId)
val config = IndexWriterConfig(StandardAnalyzer())
val writer = IndexWriter(dir, config)
with(writer) {
with(writer(userId)) {
deleteDocuments(TermQuery(Term(uuidField, UuidFieldConverter.toDoc(uuid))))
commit()
close()
@ -83,19 +80,12 @@ class NoteSearcherImpl(basePath: Path = Path.of("/tmp", "lucene")) : NoteSearche
indexNote(userId, note)
}
override fun search(userId: Int, terms: SearchTerms): List<PersistedNoteMetadata> {
val searcher = getIndexSearcher(userId)
val query = query {
override fun search(userId: Int, terms: SearchTerms) =
indexSearcher(userId).query {
or { titleField eq terms.title }
or { tagsField eq terms.tag }
or { contentField eq terms.content }
}
val topDocs = searcher.search(query, 10)
logger.debug("Searching: `$query` results: ${topDocs.totalHits.value}")
return topDocs.toResults(searcher)
}
}.map(Document::toNoteMeta)
override fun dropIndex(userId: Int) = rmdir(File(baseFile, userId.toString()).toPath())