You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2023/01/29 15:15:03 UTC
[couchdb] 02/02: remove ugly attempt at versioning
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch import-nouveau-multilucene
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit b660e50dbde6657f49b212b93f8aa05a1813e4f6
Author: Robert Newson <rn...@apache.org>
AuthorDate: Sun Jan 29 15:13:59 2023 +0000
remove ugly attempt at versioning
---
.../apache/couchdb/nouveau/api/AnalyzeRequest.java | 11 +----------
.../apache/couchdb/nouveau/api/IndexDefinition.java | 14 ++------------
.../apache/couchdb/nouveau/api/LuceneVersion.java | 20 --------------------
.../couchdb/nouveau/health/AnalyzeHealthCheck.java | 3 +--
.../nouveau/health/IndexManagerHealthCheck.java | 4 +---
.../couchdb/nouveau/resources/AnalyzeResource.java | 1 +
.../org/apache/couchdb/nouveau/IntegrationTest.java | 3 +--
.../couchdb/nouveau/core/IndexManagerTest.java | 3 +--
src/nouveau/include/nouveau.hrl | 1 -
src/nouveau/src/nouveau_api.erl | 2 +-
src/nouveau/src/nouveau_index_updater.erl | 1 -
src/nouveau/src/nouveau_util.erl | 7 +------
12 files changed, 10 insertions(+), 60 deletions(-)
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java
index 58f1e941e..13e83ae32 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java
@@ -23,9 +23,6 @@ import io.dropwizard.jackson.JsonSnakeCase;
@JsonSnakeCase
public class AnalyzeRequest {
- @NotNull
- private LuceneVersion luceneVersion;
-
@NotEmpty
private String analyzer;
@@ -36,17 +33,11 @@ public class AnalyzeRequest {
// Jackson deserialization
}
- public AnalyzeRequest(final LuceneVersion luceneVersion, final String analyzer, final String text) {
- this.luceneVersion = luceneVersion;
+ public AnalyzeRequest(final String analyzer, final String text) {
this.analyzer = analyzer;
this.text = text;
}
- @JsonProperty
- public LuceneVersion getLuceneVersion() {
- return luceneVersion;
- }
-
@JsonProperty
public String getAnalyzer() {
return analyzer;
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java
index 61b8f08ab..221dc9f46 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java
@@ -16,7 +16,6 @@ package org.apache.couchdb.nouveau.api;
import java.util.Map;
import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,9 +24,6 @@ import io.dropwizard.jackson.JsonSnakeCase;
@JsonSnakeCase
public class IndexDefinition {
- @NotNull
- private LuceneVersion luceneVersion;
-
@NotEmpty
private String defaultAnalyzer;
@@ -37,17 +33,11 @@ public class IndexDefinition {
// Jackson deserialization
}
- public IndexDefinition(final LuceneVersion luceneVersion, final String defaultAnalyzer, final Map<String, String> fieldAnalyzers) {
- this.luceneVersion = luceneVersion;
+ public IndexDefinition(final String defaultAnalyzer, final Map<String, String> fieldAnalyzers) {
this.defaultAnalyzer = defaultAnalyzer;
this.fieldAnalyzers = fieldAnalyzers;
}
- @JsonProperty
- public LuceneVersion getLuceneVersion() {
- return luceneVersion;
- }
-
@JsonProperty
public String getDefaultAnalyzer() {
return defaultAnalyzer;
@@ -72,7 +62,7 @@ public class IndexDefinition {
@Override
public String toString() {
- return "IndexDefinition [luceneVersion=" + luceneVersion + ", defaultAnalyzer=" + defaultAnalyzer +
+ return "IndexDefinition [defaultAnalyzer=" + defaultAnalyzer +
", fieldAnalyzers=" + fieldAnalyzers + "]";
}
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/LuceneVersion.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/LuceneVersion.java
deleted file mode 100644
index 55da30fcf..000000000
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/LuceneVersion.java
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.couchdb.nouveau.api;
-
-public enum LuceneVersion {
-
- LUCENE_9;
-
-}
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java
index a4c56cdd7..75d402b43 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java
@@ -18,7 +18,6 @@ import java.util.List;
import org.apache.couchdb.nouveau.api.AnalyzeRequest;
import org.apache.couchdb.nouveau.api.AnalyzeResponse;
-import static org.apache.couchdb.nouveau.api.LuceneVersion.*;
import org.apache.couchdb.nouveau.resources.AnalyzeResource;
import com.codahale.metrics.health.HealthCheck;
@@ -32,7 +31,7 @@ public class AnalyzeHealthCheck extends HealthCheck {
@Override
protected Result check() throws Exception {
- final AnalyzeRequest request = new AnalyzeRequest(LUCENE_9, "standard", "hello there");
+ final AnalyzeRequest request = new AnalyzeRequest("standard", "hello there");
final AnalyzeResponse response = analyzeResource.analyzeText(request);
final List<String> expected = Arrays.asList("hello", "there");
final List<String> actual = response.getTokens();
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java
index 315111534..2c4271cab 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java
@@ -13,8 +13,6 @@
package org.apache.couchdb.nouveau.health;
-import static org.apache.couchdb.nouveau.api.LuceneVersion.LUCENE_9;
-
import java.io.IOException;
import java.util.Collections;
@@ -42,7 +40,7 @@ public class IndexManagerHealthCheck extends HealthCheck {
// Ignored, index might not exist yet.
}
- indexManager.create(name, new IndexDefinition(LUCENE_9, "standard", null));
+ indexManager.create(name, new IndexDefinition("standard", null));
final Index index = indexManager.acquire(name);
final DocumentUpdateRequest request = new DocumentUpdateRequest(1, null, Collections.emptyList());
index.update("foo", request);
diff --git a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
index 60e8c8ca3..e2850bd58 100644
--- a/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
+++ b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
@@ -22,6 +22,7 @@ import javax.validation.constraints.NotNull;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java
index 214eef4f9..6595cc8b7 100644
--- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java
+++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java
@@ -13,7 +13,6 @@
package org.apache.couchdb.nouveau;
-import static org.apache.couchdb.nouveau.api.LuceneVersion.LUCENE_9;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
@@ -54,7 +53,7 @@ public class IntegrationTest {
public void indexTest() throws Exception{
final String url = "http://localhost:" + APP.getLocalPort();
final String indexName = "foo";
- final IndexDefinition indexDefinition = new IndexDefinition(LUCENE_9, "standard", null);
+ final IndexDefinition indexDefinition = new IndexDefinition("standard", null);
// Clean up.
Response response =
diff --git a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java
index 64081d5c0..9d7ff7f77 100644
--- a/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java
+++ b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java
@@ -16,7 +16,6 @@ package org.apache.couchdb.nouveau.core;
import java.nio.file.Path;
import org.apache.couchdb.nouveau.api.IndexDefinition;
-import static org.apache.couchdb.nouveau.api.LuceneVersion.*;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -56,7 +55,7 @@ public class IndexManagerTest {
@Test
public void testCreate() throws Exception {
- final IndexDefinition def = new IndexDefinition(LUCENE_9, "standard", null);
+ final IndexDefinition def = new IndexDefinition("standard", null);
manager.create("foo", def);
}
diff --git a/src/nouveau/include/nouveau.hrl b/src/nouveau/include/nouveau.hrl
index 83865b312..e50cd45d3 100644
--- a/src/nouveau/include/nouveau.hrl
+++ b/src/nouveau/include/nouveau.hrl
@@ -14,7 +14,6 @@
-record(index, {
dbname,
ddoc_id,
- lucene_version,
default_analyzer,
field_analyzers,
def,
diff --git a/src/nouveau/src/nouveau_api.erl b/src/nouveau/src/nouveau_api.erl
index a3527ff59..55e294ee6 100644
--- a/src/nouveau/src/nouveau_api.erl
+++ b/src/nouveau/src/nouveau_api.erl
@@ -32,7 +32,7 @@
analyze(Text, Analyzer) when
is_binary(Text), is_binary(Analyzer)
->
- ReqBody = {[{<<"lucene_version">>, <<"LUCENE_9">>}, {<<"text">>, Text}, {<<"analyzer">>, Analyzer}]},
+ ReqBody = {[{<<"text">>, Text}, {<<"analyzer">>, Analyzer}]},
Resp = send_if_enabled(
nouveau_util:nouveau_url() ++ "/analyze", [?JSON_CONTENT_TYPE], post, jiffy:encode(ReqBody)
),
diff --git a/src/nouveau/src/nouveau_index_updater.erl b/src/nouveau/src/nouveau_index_updater.erl
index 184b978d7..b56ee9155 100644
--- a/src/nouveau/src/nouveau_index_updater.erl
+++ b/src/nouveau/src/nouveau_index_updater.erl
@@ -128,7 +128,6 @@ get_index_seq(#index{} = Index) ->
index_definition(#index{} = Index) ->
#{
- <<"lucene_version">> => Index#index.lucene_version,
<<"default_analyzer">> => Index#index.default_analyzer,
<<"field_analyzers">> => Index#index.field_analyzers
}.
diff --git a/src/nouveau/src/nouveau_util.erl b/src/nouveau/src/nouveau_util.erl
index 9408b3ba1..ddfdc86de 100644
--- a/src/nouveau/src/nouveau_util.erl
+++ b/src/nouveau/src/nouveau_util.erl
@@ -63,10 +63,6 @@ design_doc_to_index(DbName, #doc{id = Id, body = {Fields}}, IndexName) ->
false ->
{error, {not_found, <<IndexName/binary, " not found.">>}};
{IndexName, {Index}} ->
- DefaultLuceneVersion = config:get("nouveau", "default_lucene_version", "LUCENE_9"),
- LuceneVersion = couch_util:get_value(
- <<"lucene_version">>, Index, ?l2b(DefaultLuceneVersion)
- ),
DefaultAnalyzer = couch_util:get_value(<<"default_analyzer">>, Index, <<"standard">>),
FieldAnalyzers = couch_util:get_value(<<"field_analyzers">>, Index, #{}),
case couch_util:get_value(<<"index">>, Index) of
@@ -78,14 +74,13 @@ design_doc_to_index(DbName, #doc{id = Id, body = {Fields}}, IndexName) ->
crypto:hash(
sha256,
term_to_binary(
- {LuceneVersion, DefaultAnalyzer, FieldAnalyzers, Def}
+ {DefaultAnalyzer, FieldAnalyzers, Def}
)
)
)
),
{ok, #index{
dbname = DbName,
- lucene_version = LuceneVersion,
default_analyzer = DefaultAnalyzer,
field_analyzers = FieldAnalyzers,
ddoc_id = Id,