Allow existing legacy indexes but prevent new ones

Author: rnewson

nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java

@@ -16,13 +16,20 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotEmpty;
 import java.util.Map;
 
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class IndexDefinition {
 
-    private int luceneVersion = 9; // Legacy version if not set.
+    public static final int LATEST_LUCENE_VERSION = 10;
+    public static final int LEGACY_LUCENE_VERSION = 9;
+
+    @Max(LATEST_LUCENE_VERSION)
+    @Min(LEGACY_LUCENE_VERSION)
+    private int luceneVersion = LEGACY_LUCENE_VERSION; // Legacy version if not set.
 
     @NotEmpty
     private String defaultAnalyzer;

nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java

@@ -37,13 +37,16 @@
 import org.apache.couchdb.nouveau.lucene.LuceneAnalyzerFactory;
 import org.apache.couchdb.nouveau.lucene.LuceneIndex;
 import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.IndexWriterConfig.OpenMode;
 import org.apache.lucene.misc.store.DirectIODirectory;
 import org.apache.lucene.search.SearcherFactory;
 import org.apache.lucene.search.SearcherManager;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.Version;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -218,7 +221,6 @@ public void create(final String name, IndexDefinition indexDefinition) throws IO
             assertSame(indexDefinition, loadIndexDefinition(name));
             return;
         }
-
         final Lock lock = this.createLock.writeLock(name);
         lock.lock();
         try {
@@ -393,9 +395,15 @@ private Index load(final String name) throws IOException {
         final Path path = indexPath(name);
         final IndexDefinition indexDefinition = loadIndexDefinition(name);
         final Analyzer analyzer = LuceneAnalyzerFactory.fromDefinition(indexDefinition);
-        final Directory dir = new DirectIODirectory(
-                FSDirectory.open(path.resolve(Integer.toString(indexDefinition.getLuceneVersion()))));
+        final int luceneVersion = indexDefinition.getLuceneVersion();
+        final Directory dir = new DirectIODirectory(FSDirectory.open(path.resolve(Integer.toString(luceneVersion))));
         final IndexWriterConfig config = new IndexWriterConfig(analyzer);
+        if (luceneVersion != Version.LATEST.major) {
+            config.setOpenMode(OpenMode.APPEND);
+        }
+        if (luceneVersion == IndexDefinition.LEGACY_LUCENE_VERSION) {
+            config.setCodec(new Lucene912Codec());
+        }
         config.setUseCompoundFile(false);
         final IndexWriter writer = new IndexWriter(dir, config);
         final long updateSeq = getSeq(writer, "update_seq");

nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java

@@ -27,6 +27,7 @@
 import org.apache.couchdb.nouveau.api.IndexDefinition;
 import org.apache.couchdb.nouveau.api.SearchRequest;
 import org.apache.couchdb.nouveau.lucene.ParallelSearcherFactory;
+import org.apache.lucene.util.Version;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -61,8 +62,7 @@ public void cleanup() throws Exception {
 
     @Test
     public void managerReturnsUsableIndex() throws Exception {
-        final IndexDefinition indexDefinition = new IndexDefinition();
-        indexDefinition.setDefaultAnalyzer("standard");
+        final IndexDefinition indexDefinition = new IndexDefinition(Version.LATEST.major, "standard", null);
         manager.create("foo", indexDefinition);
         var searchRequest = new SearchRequest();
         searchRequest.setQuery("*:*");
@@ -72,8 +72,7 @@ public void managerReturnsUsableIndex() throws Exception {
 
     @Test
     public void managerReopensAClosedIndex() throws Exception {
-        final IndexDefinition indexDefinition = new IndexDefinition();
-        indexDefinition.setDefaultAnalyzer("standard");
+        final IndexDefinition indexDefinition = new IndexDefinition(Version.LATEST.major, "standard", null);
 
         manager.create("bar", indexDefinition);
 
@@ -90,8 +89,7 @@ public void managerReopensAClosedIndex() throws Exception {
 
     @Test
     public void deleteAllRemovesIndexByName() throws Exception {
-        final IndexDefinition indexDefinition = new IndexDefinition();
-        indexDefinition.setDefaultAnalyzer("standard");
+        final IndexDefinition indexDefinition = new IndexDefinition(Version.LATEST.major, "standard", null);
 
         assertThat(countIndexes()).isEqualTo(0);
         manager.create("bar", indexDefinition);
@@ -102,8 +100,7 @@ public void deleteAllRemovesIndexByName() throws Exception {
 
     @Test
     public void deleteAllRemovesIndexByPath() throws Exception {
-        final IndexDefinition indexDefinition = new IndexDefinition();
-        indexDefinition.setDefaultAnalyzer("standard");
+        final IndexDefinition indexDefinition = new IndexDefinition(Version.LATEST.major, "standard", null);
 
         assertThat(countIndexes()).isEqualTo(0);
         manager.create("foo/bar", indexDefinition);
@@ -114,8 +111,7 @@ public void deleteAllRemovesIndexByPath() throws Exception {
 
     @Test
     public void deleteAllRemovesIndexByGlob() throws Exception {
-        final IndexDefinition indexDefinition = new IndexDefinition();
-        indexDefinition.setDefaultAnalyzer("standard");
+        final IndexDefinition indexDefinition = new IndexDefinition(Version.LATEST.major, "standard", null);
 
         assertThat(countIndexes()).isEqualTo(0);
         manager.create("foo/bar", indexDefinition);
@@ -126,8 +122,7 @@ public void deleteAllRemovesIndexByGlob() throws Exception {
 
     @Test
     public void deleteAllRemovesIndexByGlobExceptExclusions() throws Exception {
-        final IndexDefinition indexDefinition = new IndexDefinition();
-        indexDefinition.setDefaultAnalyzer("standard");
+        final IndexDefinition indexDefinition = new IndexDefinition(Version.LATEST.major, "standard", null);
 
         assertThat(countIndexes()).isEqualTo(0);
         manager.create("foo/bar", indexDefinition);

nouveau/src/test/java/org/apache/couchdb/nouveau/lucene/LuceneIndexTest.java

@@ -42,13 +42,14 @@
 import org.apache.lucene.search.SearcherManager;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.Version;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 public class LuceneIndexTest {
 
     protected final Index setup(final Path path) throws IOException {
-        final IndexDefinition indexDefinition = new IndexDefinition();
+        final IndexDefinition indexDefinition = new IndexDefinition(Version.LATEST.major, "standard", null);
         indexDefinition.setDefaultAnalyzer("standard");
         final Analyzer analyzer = LuceneAnalyzerFactory.fromDefinition(indexDefinition);
         final Directory dir = new DirectIODirectory(FSDirectory.open(path));