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/03/03 19:08:00 UTC
[couchdb] branch import-nouveau updated (65cf09cd9 -> 8423c9dc7)
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a change to branch import-nouveau
in repository https://gitbox.apache.org/repos/asf/couchdb.git
from 65cf09cd9 enable-preview not needed
add 8423c9dc7 Reorganise to cleanly support lucene major release differences
No new revisions were added by this update.
Summary of changes:
.../nouveau/api/document/DoubleDocValuesField.java | 40 ----
.../couchdb/nouveau/api/document/DoubleField.java | 48 -----
.../couchdb/nouveau/api/document/DoublePoint.java | 41 ----
.../apache/couchdb/nouveau/api/document/Field.java | 51 -----
.../nouveau/api/document/SortedDocValuesField.java | 40 ----
.../api/document/SortedSetDocValuesField.java | 40 ----
.../nouveau/api/document/StoredDoubleField.java | 39 ----
.../nouveau/api/document/StoredStringField.java | 39 ----
.../couchdb/nouveau/api/document/StringField.java | 51 -----
.../couchdb/nouveau/api/document/TextField.java | 46 -----
.../apache/couchdb/nouveau/core/LuceneBundle.java | 9 -
.../nouveau/api/DocumentUpdateRequestTest.java | 64 ------
java/nouveau/{api => base}/pom.xml | 4 +-
.../org/apache/couchdb/nouveau/LuceneBundle.java} | 14 +-
.../java/org/apache/couchdb/nouveau/api/After.java | 0
.../apache/couchdb/nouveau/api/AnalyzeRequest.java | 0
.../couchdb/nouveau/api/AnalyzeResponse.java | 0
.../couchdb/nouveau/api/DocumentDeleteRequest.java | 22 ---
.../couchdb/nouveau/api/DocumentUpdateRequest.java | 44 +----
.../apache/couchdb/nouveau/api/DoubleRange.java | 0
.../couchdb/nouveau/api/IndexDefinition.java | 0
.../org/apache/couchdb/nouveau/api/IndexInfo.java | 14 +-
.../java/org/apache/couchdb/nouveau/api/Range.java | 0
.../org/apache/couchdb/nouveau/api/SearchHit.java | 10 +-
.../apache/couchdb/nouveau/api/SearchRequest.java | 0
.../apache/couchdb/nouveau/api/SearchResults.java | 8 +-
.../org/apache/couchdb/nouveau/core/IOUtils.java | 0
.../org/apache/couchdb/nouveau/core/Index.java | 10 +-
.../apache/couchdb/nouveau/core/IndexLoader.java} | 14 +-
.../apache/couchdb/nouveau/core/IndexManager.java | 47 +++--
.../nouveau/core/UpdatesOutOfOrderException.java | 0
.../nouveau/core/ser/AfterDeserializer.java | 0
.../couchdb/nouveau/core/ser/AfterSerializer.java | 0
.../nouveau/resources/BaseAnalyzeResource.java} | 24 +--
.../nouveau/resources/BaseIndexResource.java} | 46 +++--
.../couchdb/nouveau/api/SearchRequestTest.java | 13 ++
.../resources/fixtures/DocumentUpdateRequest.json | 8 +-
.../src/test/resources/fixtures/SearchRequest.json | 0
java/nouveau/lucene4/pom.xml | 9 +-
.../couchdb/nouveau/core/lucene4/Lucene4.java | 99 ----------
.../nouveau/core/lucene4/Lucene4Bundle.java | 23 ---
.../couchdb/nouveau/lucene4/Lucene4Bundle.java | 45 +++++
.../lucene4/core/IndexableFieldDeserializer.java | 82 ++++++++
.../lucene4/core/IndexableFieldSerializer.java | 59 ++++++
.../core}/Lucene4AnalyzerFactory.java | 4 +-
.../lucene4 => lucene4/core}/Lucene4Index.java | 93 ++-------
.../nouveau/lucene4/core/Lucene4Module.java | 35 ++++
.../core}/Lucene4QueryParser.java | 2 +-
.../core}/ParallelSearcherFactory.java | 4 +-
.../lucene4 => lucene4/core}/PerFieldAnalyzer.java | 2 +-
.../nouveau/lucene4/core/QueryDeserializer.java | 41 ++++
.../{core/lucene4 => lucene4/core}/Utils.java | 6 +-
.../nouveau/lucene4/resources/AnalyzeResource.java | 62 ++++++
.../nouveau/lucene4/resources/IndexResource.java | 68 +++++++
.../services/io.dropwizard.ConfiguredBundle | 2 +-
.../core}/Lucene4AnalyzerFactoryTest.java | 2 +-
java/nouveau/lucene9/pom.xml | 9 +-
.../couchdb/nouveau/core/lucene9/Lucene9.java | 105 ----------
.../nouveau/core/lucene9/Lucene9Bundle.java | 23 ---
.../couchdb/nouveau/lucene9/Lucene9Bundle.java | 45 +++++
.../lucene9/core/IndexableFieldDeserializer.java | 101 ++++++++++
.../lucene9/core/IndexableFieldSerializer.java | 59 ++++++
.../core}/Lucene9AnalyzerFactory.java | 4 +-
.../lucene9 => lucene9/core}/Lucene9Index.java | 121 +++---------
.../nouveau/lucene9/core/Lucene9Module.java} | 20 +-
.../core}/Lucene9QueryParser.java | 2 +-
.../core}/NumericRangeQueryProcessor.java | 2 +-
.../core}/ParallelSearcherFactory.java | 4 +-
.../nouveau/lucene9/resources/AnalyzeResource.java | 62 ++++++
.../nouveau/lucene9/resources/IndexResource.java | 73 +++++++
.../services/io.dropwizard.ConfiguredBundle | 2 +-
.../core}/Lucene9AnalyzerFactoryTest.java | 2 +-
java/nouveau/pom.xml | 2 +-
java/nouveau/server/README.md | 8 +-
java/nouveau/server/nouveau.yaml | 4 -
java/nouveau/server/pom.xml | 6 +-
.../apache/couchdb/nouveau/NouveauApplication.java | 102 ++++------
.../nouveau/NouveauApplicationConfiguration.java | 28 +--
.../couchdb/nouveau/health/AnalyzeHealthCheck.java | 45 -----
.../nouveau/health/IndexManagerHealthCheck.java | 52 -----
.../apache/couchdb/nouveau/IntegrationTest.java | 142 -------------
.../couchdb/nouveau/core/IndexManagerTest.java | 76 -------
.../nouveau/core/ser/SerializationTest.java | 156 ---------------
share/server/loop.js | 15 +-
share/server/nouveau.js | 219 ++++++++++++++-------
src/mango/src/mango_native_proc.erl | 18 +-
src/nouveau/src/nouveau_api.erl | 64 +++---
src/nouveau/src/nouveau_index_updater.erl | 15 +-
src/nouveau/src/nouveau_rpc.erl | 2 +-
89 files changed, 1187 insertions(+), 1825 deletions(-)
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/api/document/DoubleDocValuesField.java
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/api/document/DoubleField.java
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/api/document/DoublePoint.java
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/api/document/Field.java
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/api/document/SortedDocValuesField.java
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/api/document/SortedSetDocValuesField.java
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/api/document/StoredDoubleField.java
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/api/document/StoredStringField.java
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/api/document/StringField.java
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/api/document/TextField.java
delete mode 100644 java/nouveau/api/src/main/java/org/apache/couchdb/nouveau/core/LuceneBundle.java
delete mode 100644 java/nouveau/api/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java
rename java/nouveau/{api => base}/pom.xml (95%)
copy java/nouveau/{api/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java => base/src/main/java/org/apache/couchdb/nouveau/LuceneBundle.java} (62%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/After.java (100%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java (100%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeResponse.java (100%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java (67%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java (55%)
copy java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/DoubleRange.java (100%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java (100%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/IndexInfo.java (80%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/Range.java (100%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java (87%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java (100%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java (92%)
rename java/nouveau/{server => base}/src/main/java/org/apache/couchdb/nouveau/core/IOUtils.java (100%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/core/Index.java (91%)
rename java/nouveau/{api/src/main/java/org/apache/couchdb/nouveau/core/Lucene.java => base/src/main/java/org/apache/couchdb/nouveau/core/IndexLoader.java} (65%)
rename java/nouveau/{server => base}/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java (90%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java (100%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/core/ser/AfterDeserializer.java (100%)
rename java/nouveau/{api => base}/src/main/java/org/apache/couchdb/nouveau/core/ser/AfterSerializer.java (100%)
rename java/nouveau/{server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java => base/src/main/java/org/apache/couchdb/nouveau/resources/BaseAnalyzeResource.java} (54%)
rename java/nouveau/{server/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java => base/src/main/java/org/apache/couchdb/nouveau/resources/BaseIndexResource.java} (62%)
rename java/nouveau/{api => base}/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java (72%)
rename java/nouveau/{api => base}/src/test/resources/fixtures/DocumentUpdateRequest.json (73%)
rename java/nouveau/{api => base}/src/test/resources/fixtures/SearchRequest.json (100%)
delete mode 100644 java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/core/lucene4/Lucene4.java
delete mode 100644 java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/core/lucene4/Lucene4Bundle.java
create mode 100644 java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/Lucene4Bundle.java
create mode 100644 java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/core/IndexableFieldDeserializer.java
create mode 100644 java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/core/IndexableFieldSerializer.java
rename java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/{core/lucene4 => lucene4/core}/Lucene4AnalyzerFactory.java (98%)
rename java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/{core/lucene4 => lucene4/core}/Lucene4Index.java (75%)
create mode 100644 java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/core/Lucene4Module.java
rename java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/{core/lucene4 => lucene4/core}/Lucene4QueryParser.java (99%)
rename java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/{core/lucene4 => lucene4/core}/ParallelSearcherFactory.java (90%)
rename java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/{core/lucene4 => lucene4/core}/PerFieldAnalyzer.java (96%)
create mode 100644 java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/core/QueryDeserializer.java
rename java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/{core/lucene4 => lucene4/core}/Utils.java (87%)
create mode 100644 java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/resources/AnalyzeResource.java
create mode 100644 java/nouveau/lucene4/src/main/java/org/apache/couchdb/nouveau/lucene4/resources/IndexResource.java
rename java/nouveau/lucene4/src/test/java/org/apache/couchdb/nouveau/{core/lucene4 => lucene4/core}/Lucene4AnalyzerFactoryTest.java (99%)
delete mode 100644 java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/core/lucene9/Lucene9.java
delete mode 100644 java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/core/lucene9/Lucene9Bundle.java
create mode 100644 java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/lucene9/Lucene9Bundle.java
create mode 100644 java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/lucene9/core/IndexableFieldDeserializer.java
create mode 100644 java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/lucene9/core/IndexableFieldSerializer.java
rename java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/{core/lucene9 => lucene9/core}/Lucene9AnalyzerFactory.java (98%)
rename java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/{core/lucene9 => lucene9/core}/Lucene9Index.java (69%)
rename java/nouveau/{api/src/main/java/org/apache/couchdb/nouveau/api/DoubleRange.java => lucene9/src/main/java/org/apache/couchdb/nouveau/lucene9/core/Lucene9Module.java} (52%)
rename java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/{core/lucene9 => lucene9/core}/Lucene9QueryParser.java (99%)
rename java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/{core/lucene9 => lucene9/core}/NumericRangeQueryProcessor.java (98%)
rename java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/{core/lucene9 => lucene9/core}/ParallelSearcherFactory.java (90%)
create mode 100644 java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/lucene9/resources/AnalyzeResource.java
create mode 100644 java/nouveau/lucene9/src/main/java/org/apache/couchdb/nouveau/lucene9/resources/IndexResource.java
rename java/nouveau/lucene9/src/test/java/org/apache/couchdb/nouveau/{core/lucene9 => lucene9/core}/Lucene9AnalyzerFactoryTest.java (99%)
delete mode 100644 java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java
delete mode 100644 java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java
delete mode 100644 java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java
delete mode 100644 java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java
delete mode 100644 java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/SerializationTest.java