This is an automated email from the ASF dual-hosted git repository.
ishan pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
from 3f342d4423c Update dependency org.apache.commons:commons-text to
v1.15.0 (#3933)
add 0f5b2c44000 SOLR-17927: Fix naming in vector search support (#3830)
No new revisions were added by this update.
Summary of changes:
changelog/unreleased/solr_17927_new.yml | 8 +
gradlew.bat | 252 ++++++++++-----------
settings.gradle | 2 +-
.../schema/BinaryQuantizedDenseVectorField.java | 2 +-
.../org/apache/solr/schema/DenseVectorField.java | 62 ++++-
.../schema/ScalarQuantizedDenseVectorField.java | 4 +-
.../java/org/apache/solr/search/QParserPlugin.java | 4 +-
.../AbstractVectorQParserBase.java | 2 +-
.../solr/search/{neural => vector}/KnnQParser.java | 2 +-
.../{neural => vector}/KnnQParserPlugin.java | 4 +-
.../VectorSimilarityQParser.java | 2 +-
.../VectorSimilarityQParserPlugin.java | 4 +-
.../search/{neural => vector}/package-info.java | 4 +-
.../schema-densevector-codec-hyperparameter.xml | 6 +-
.../apache/solr/schema/DenseVectorFieldTest.java | 26 ++-
.../search/{neural => vector}/KnnQParserTest.java | 4 +-
.../VectorSimilarityQParserTest.java | 2 +-
.../solr/collection1/conf/solrconfig.xml | 9 +-
solr/modules/{llm => language-models}/README.md | 2 +-
solr/modules/{llm => language-models}/build.gradle | 0
.../{llm => language-models}/gradle.lockfile | 0
.../model/SolrTextToVectorModel.java | 6 +-
.../textvectorisation/model/package-info.java | 2 +-
.../search/TextToVectorQParserPlugin.java | 10 +-
.../textvectorisation/search/package-info.java | 2 +-
.../store/TextToVectorModelException.java | 2 +-
.../store/TextToVectorModelStore.java | 4 +-
.../textvectorisation/store/package-info.java | 2 +-
.../store/rest/ManagedTextToVectorModelStore.java | 8 +-
.../textvectorisation/store/rest/package-info.java | 2 +-
.../processor/TextToVectorUpdateProcessor.java | 4 +-
.../TextToVectorUpdateProcessorFactory.java | 6 +-
.../update/processor/package-info.java | 2 +-
.../src/java/overview.html | 0
.../src/test-files/log4j2.xml | 0
.../src/test-files/modelExamples/cohere-model.json | 0
.../modelExamples/dummy-model-ambiguous.json | 2 +-
.../modelExamples/dummy-model-unsupported.json | 2 +-
.../src/test-files/modelExamples/dummy-model.json | 7 +
.../modelExamples/exception-throwing-model.json | 6 +
.../modelExamples/huggingface-model.json | 0
.../test-files/modelExamples/mistralai-model.json | 0
.../src/test-files/modelExamples/openai-model.json | 0
.../test-files/solr/collection1/conf/schema.xml | 0
.../conf/solrconfig-language-models.xml} | 14 +-
.../src/test-files/solr/solr.xml | 0
.../languagemodels/TestLanguageModelBase.java} | 10 +-
.../model/DummyEmbeddingModel.java | 2 +-
.../model/DummyEmbeddingModelTest.java | 2 +-
.../model/ExceptionThrowingEmbeddingModel.java | 2 +-
.../search/TextToVectorQParserTest.java | 8 +-
.../store/rest/TestModelManager.java | 10 +-
.../store/rest/TestModelManagerPersistence.java | 8 +-
.../TextToVectorUpdateProcessorFactoryTest.java | 12 +-
.../processor/TextToVectorUpdateProcessorTest.java | 10 +-
.../src/test-files/modelExamples/dummy-model.json | 7 -
.../modelExamples/exception-throwing-model.json | 6 -
.../pages/update-request-processors.adoc | 6 +-
.../query-guide/pages/dense-vector-search.adoc | 49 ++--
.../modules/query-guide/pages/other-parsers.adoc | 2 +-
.../modules/query-guide/pages/text-to-vector.adoc | 28 +--
.../pages/major-changes-in-solr-10.adoc | 6 +
62 files changed, 369 insertions(+), 281 deletions(-)
create mode 100644 changelog/unreleased/solr_17927_new.yml
rename solr/core/src/java/org/apache/solr/search/{neural =>
vector}/AbstractVectorQParserBase.java (99%)
rename solr/core/src/java/org/apache/solr/search/{neural =>
vector}/KnnQParser.java (99%)
rename solr/core/src/java/org/apache/solr/search/{neural =>
vector}/KnnQParserPlugin.java (93%)
rename solr/core/src/java/org/apache/solr/search/{neural =>
vector}/VectorSimilarityQParser.java (98%)
rename solr/core/src/java/org/apache/solr/search/{neural =>
vector}/VectorSimilarityQParserPlugin.java (92%)
rename solr/core/src/java/org/apache/solr/search/{neural =>
vector}/package-info.java (88%)
rename solr/core/src/test/org/apache/solr/search/{neural =>
vector}/KnnQParserTest.java (99%)
rename solr/core/src/test/org/apache/solr/search/{neural =>
vector}/VectorSimilarityQParserTest.java (99%)
rename solr/modules/{llm => language-models}/README.md (88%)
rename solr/modules/{llm => language-models}/build.gradle (100%)
rename solr/modules/{llm => language-models}/gradle.lockfile (100%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/model/SolrTextToVectorModel.java
(96%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/model/package-info.java
(93%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/search/TextToVectorQParserPlugin.java
(92%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/search/package-info.java
(93%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/store/TextToVectorModelException.java
(94%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/store/TextToVectorModelStore.java
(93%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/store/package-info.java
(92%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/store/rest/ManagedTextToVectorModelStore.java
(95%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/store/rest/package-info.java
(92%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/update/processor/TextToVectorUpdateProcessor.java
(95%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/update/processor/TextToVectorUpdateProcessorFactory.java
(94%)
rename solr/modules/{llm/src/java/org/apache/solr/llm =>
language-models/src/java/org/apache/solr/languagemodels}/textvectorisation/update/processor/package-info.java
(91%)
rename solr/modules/{llm => language-models}/src/java/overview.html (100%)
rename solr/modules/{llm => language-models}/src/test-files/log4j2.xml (100%)
rename solr/modules/{llm =>
language-models}/src/test-files/modelExamples/cohere-model.json (100%)
rename solr/modules/{llm =>
language-models}/src/test-files/modelExamples/dummy-model-ambiguous.json (53%)
rename solr/modules/{llm =>
language-models}/src/test-files/modelExamples/dummy-model-unsupported.json (53%)
create mode 100644
solr/modules/language-models/src/test-files/modelExamples/dummy-model.json
create mode 100644
solr/modules/language-models/src/test-files/modelExamples/exception-throwing-model.json
rename solr/modules/{llm =>
language-models}/src/test-files/modelExamples/huggingface-model.json (100%)
rename solr/modules/{llm =>
language-models}/src/test-files/modelExamples/mistralai-model.json (100%)
rename solr/modules/{llm =>
language-models}/src/test-files/modelExamples/openai-model.json (100%)
rename solr/modules/{llm =>
language-models}/src/test-files/solr/collection1/conf/schema.xml (100%)
rename
solr/modules/{llm/src/test-files/solr/collection1/conf/solrconfig-llm.xml =>
language-models/src/test-files/solr/collection1/conf/solrconfig-language-models.xml}
(87%)
rename solr/modules/{llm => language-models}/src/test-files/solr/solr.xml
(100%)
rename solr/modules/{llm/src/test/org/apache/solr/llm/TestLlmBase.java =>
language-models/src/test/org/apache/solr/languagemodels/TestLanguageModelBase.java}
(94%)
rename solr/modules/{llm/src/test/org/apache/solr/llm =>
language-models/src/test/org/apache/solr/languagemodels}/textvectorisation/model/DummyEmbeddingModel.java
(97%)
rename solr/modules/{llm/src/test/org/apache/solr/llm =>
language-models/src/test/org/apache/solr/languagemodels}/textvectorisation/model/DummyEmbeddingModelTest.java
(96%)
rename solr/modules/{llm/src/test/org/apache/solr/llm =>
language-models/src/test/org/apache/solr/languagemodels}/textvectorisation/model/ExceptionThrowingEmbeddingModel.java
(96%)
rename solr/modules/{llm/src/test/org/apache/solr/llm =>
language-models/src/test/org/apache/solr/languagemodels}/textvectorisation/search/TextToVectorQParserTest.java
(98%)
rename solr/modules/{llm/src/test/org/apache/solr/llm =>
language-models/src/test/org/apache/solr/languagemodels}/textvectorisation/store/rest/TestModelManager.java
(96%)
rename solr/modules/{llm/src/test/org/apache/solr/llm =>
language-models/src/test/org/apache/solr/languagemodels}/textvectorisation/store/rest/TestModelManagerPersistence.java
(94%)
rename solr/modules/{llm/src/test/org/apache/solr/llm =>
language-models/src/test/org/apache/solr/languagemodels}/textvectorisation/update/processor/TextToVectorUpdateProcessorFactoryTest.java
(94%)
rename solr/modules/{llm/src/test/org/apache/solr/llm =>
language-models/src/test/org/apache/solr/languagemodels}/textvectorisation/update/processor/TextToVectorUpdateProcessorTest.java
(94%)
delete mode 100644
solr/modules/llm/src/test-files/modelExamples/dummy-model.json
delete mode 100644
solr/modules/llm/src/test-files/modelExamples/exception-throwing-model.json