Skip to content

Commit

Permalink
#5078 - Upgrade dependencies
Browse files Browse the repository at this point in the history
- Fix solr test
reckart committed Jan 12, 2025
1 parent 28048c7 commit e5a48b6
Showing 5 changed files with 40 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -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);
Original file line number Diff line number Diff line change
@@ -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));
}

Original file line number Diff line number Diff line change
@@ -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);
}

25 changes: 25 additions & 0 deletions inception/inception-dependencies/pom.xml
Original file line number Diff line number Diff line change
@@ -992,6 +992,21 @@
<artifactId>lucene-analysis-common</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analysis-nori</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analysis-kuromoji</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analysis-phonetic</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
@@ -1002,6 +1017,16 @@
<artifactId>lucene-codecs</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-suggest</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-backward-codecs</artifactId>
Original file line number Diff line number Diff line change
@@ -16,11 +16,17 @@
limitations under the License.
-->
<config>
<luceneMatchVersion>6.2.1</luceneMatchVersion>
<luceneMatchVersion>9.11.0</luceneMatchVersion>

<dataDir>${solr.data.dir:}</dataDir>

<schemaFactory class="ClassicIndexSchemaFactory"/>
<schemaFactory class="ClassicIndexSchemaFactory" />
<!--
codecFactory is required because Solr 9.7.0 default tries to instantiate Lucene99 codec which
has been moved to a different package in Lucene 9.12.1. Note that the LuceneDefaultCodecFactory
is not schema-aware - but for our test this is not a problem
-->
<codecFactory class="solr.LuceneDefaultCodecFactory" />

<indexConfig>
<lockType>single</lockType>

0 comments on commit e5a48b6

Please sign in to comment.