diff --git a/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/index/HighDimensionLucene99Codec.java b/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/index/HighDimensionLucene912Codec.java similarity index 93% rename from inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/index/HighDimensionLucene99Codec.java rename to inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/index/HighDimensionLucene912Codec.java index 5312a783415..acebe96fecf 100644 --- a/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/index/HighDimensionLucene99Codec.java +++ b/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/index/HighDimensionLucene912Codec.java @@ -22,17 +22,17 @@ import org.apache.lucene.codecs.KnnVectorsFormat; import org.apache.lucene.codecs.KnnVectorsReader; import org.apache.lucene.codecs.KnnVectorsWriter; -import org.apache.lucene.codecs.lucene99.Lucene99Codec; +import org.apache.lucene.codecs.lucene912.Lucene912Codec; import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat; import org.apache.lucene.index.SegmentReadState; import org.apache.lucene.index.SegmentWriteState; -public class HighDimensionLucene99Codec - extends Lucene99Codec +public class HighDimensionLucene912Codec + extends Lucene912Codec { private final KnnVectorsFormat defaultKnnVectorsFormat; - public HighDimensionLucene99Codec(int aDimension) + public HighDimensionLucene912Codec(int aDimension) { var knnFormat = new Lucene99HnswVectorsFormat(); defaultKnnVectorsFormat = new HighDimensionKnnVectorsFormat(knnFormat, aDimension); diff --git a/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/index/LuceneIndexPool.java b/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/index/LuceneIndexPool.java index eb51e6927cd..48d689a0cdb 100644 --- a/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/index/LuceneIndexPool.java +++ b/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/index/LuceneIndexPool.java @@ -152,7 +152,7 @@ public PooledIndex create(Long aKey) throws Exception { var dir = new MMapDirectory(getIndexDirectory(aKey)); var iwc = new IndexWriterConfig(); - iwc.setCodec(new HighDimensionLucene99Codec(embeddingService.getDimension())); + iwc.setCodec(new HighDimensionLucene912Codec(embeddingService.getDimension())); return new PooledIndex(aKey, dir, new IndexWriter(dir, iwc)); } diff --git a/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/userguide/UserGuideQueryServiceImpl.java b/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/userguide/UserGuideQueryServiceImpl.java index daa46432bbf..db5549845b4 100644 --- a/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/userguide/UserGuideQueryServiceImpl.java +++ b/inception/inception-assistant/src/main/java/de/tudarmstadt/ukp/inception/assistant/userguide/UserGuideQueryServiceImpl.java @@ -50,7 +50,7 @@ import de.tudarmstadt.ukp.inception.assistant.config.AssistantProperties; import de.tudarmstadt.ukp.inception.assistant.embedding.EmbeddingService; -import de.tudarmstadt.ukp.inception.assistant.index.HighDimensionLucene99Codec; +import de.tudarmstadt.ukp.inception.assistant.index.HighDimensionLucene912Codec; import de.tudarmstadt.ukp.inception.scheduling.SchedulingService; import de.tudarmstadt.ukp.inception.support.SettingsUtil; import de.tudarmstadt.ukp.inception.support.json.JSONUtil; @@ -198,7 +198,7 @@ else if (LOG.isTraceEnabled()) { IndexWriter getIndexWriter() throws IOException { var iwc = new IndexWriterConfig(); - iwc.setCodec(new HighDimensionLucene99Codec(embeddingService.getDimension())); + iwc.setCodec(new HighDimensionLucene912Codec(embeddingService.getDimension())); return new IndexWriter(getSharedIndexDirectory(), iwc); } diff --git a/inception/inception-dependencies/pom.xml b/inception/inception-dependencies/pom.xml index d8aff28069f..7aeaf6ff6cc 100644 --- a/inception/inception-dependencies/pom.xml +++ b/inception/inception-dependencies/pom.xml @@ -992,6 +992,21 @@ lucene-analysis-common ${lucene.version} + + org.apache.lucene + lucene-analysis-nori + ${lucene.version} + + + org.apache.lucene + lucene-analysis-kuromoji + ${lucene.version} + + + org.apache.lucene + lucene-analysis-phonetic + ${lucene.version} + org.apache.lucene lucene-queryparser @@ -1002,6 +1017,16 @@ lucene-codecs ${lucene.version} + + org.apache.lucene + lucene-suggest + ${lucene.version} + + + org.apache.lucene + lucene-test-framework + ${lucene.version} + org.apache.lucene lucene-backward-codecs diff --git a/inception/inception-external-search-solr/src/test/resources/solr/core/conf/solrconfig.xml b/inception/inception-external-search-solr/src/test/resources/solr/core/conf/solrconfig.xml index 392feec28aa..db0373971ed 100644 --- a/inception/inception-external-search-solr/src/test/resources/solr/core/conf/solrconfig.xml +++ b/inception/inception-external-search-solr/src/test/resources/solr/core/conf/solrconfig.xml @@ -16,11 +16,17 @@ limitations under the License. --> - 6.2.1 + 9.11.0 ${solr.data.dir:} - + + + single