You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/10/26 11:50:09 UTC
[lucene-solr] 01/02: Merge branch 'master' into jira/solr-14749-api
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14749-api
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 1bb91ff3d32565b93faf3c6e209aafd84a262be2
Merge: 738b302 4bf2541
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Oct 26 12:32:35 2020 +0100
Merge branch 'master' into jira/solr-14749-api
.gitignore | 64 ++++-----
lucene/CHANGES.txt | 3 +
.../simpletext/SimpleTextFieldInfosFormat.java | 16 +--
.../codecs/simpletext/SimpleTextVectorReader.java | 14 +-
.../codecs/simpletext/SimpleTextVectorWriter.java | 2 +-
.../codecs/uniformsplit/TestBlockWriter.java | 2 +-
.../sharedterms/TestSTBlockReader.java | 2 +-
.../org/apache/lucene/codecs/VectorWriter.java | 20 +--
.../codecs/lucene50/Lucene50FieldInfosFormat.java | 2 +-
.../codecs/lucene60/Lucene60FieldInfosFormat.java | 2 +-
.../codecs/lucene90/Lucene90FieldInfosFormat.java | 15 +-
.../codecs/lucene90/Lucene90VectorReader.java | 24 ++--
.../codecs/lucene90/Lucene90VectorWriter.java | 2 +-
.../java/org/apache/lucene/document/FieldType.java | 12 +-
.../org/apache/lucene/document/VectorField.java | 26 ++--
.../lucene/index/ExitableDirectoryReader.java | 26 ++--
.../java/org/apache/lucene/index/FieldInfo.java | 28 ++--
.../java/org/apache/lucene/index/FieldInfos.java | 38 ++---
.../java/org/apache/lucene/index/IndexWriter.java | 6 +-
.../apache/lucene/index/IndexableFieldType.java | 4 +-
.../org/apache/lucene/index/IndexingChain.java | 6 +-
.../org/apache/lucene/index/ReadersAndUpdates.java | 2 +-
.../java/org/apache/lucene/index/VectorValues.java | 109 +++------------
.../apache/lucene/index/VectorValuesWriter.java | 20 +--
.../java/org/apache/lucene/util/VectorUtil.java | 74 ++++++++++
.../lucene/index/TestExitableDirectoryReader.java | 75 ++++++++--
.../apache/lucene/index/TestIndexableField.java | 4 +-
.../lucene/index/TestPendingSoftDeletes.java | 2 +-
.../org/apache/lucene/index/TestVectorValues.java | 154 +++++++++++----------
.../org/apache/lucene/util/TestVectorUtil.java | 83 +++++++++++
.../search/highlight/TermVectorLeafReader.java | 2 +-
.../apache/lucene/index/memory/MemoryIndex.java | 4 +-
.../lucene/index/BaseIndexFileFormatTestCase.java | 2 +-
.../apache/lucene/index/MismatchedLeafReader.java | 2 +-
.../apache/lucene/index/RandomPostingsTester.java | 4 +-
solr/.gitignore | 5 +-
solr/CHANGES.txt | 25 ++++
.../java/org/apache/solr/cloud/ZkController.java | 37 ++++-
.../solr/cluster/events/impl/package-info.java | 7 +-
.../org/apache/solr/core/ClusterSingletons.java | 6 +-
.../java/org/apache/solr/core/CoreContainer.java | 35 +++--
.../java/org/apache/solr/schema/SchemaField.java | 4 +-
.../solr/search/CollapsingQParserPlugin.java | 2 +-
.../src/java/org/apache/solr/search/Insanity.java | 2 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 67 +++++----
.../apache/solr/uninverting/UninvertingReader.java | 2 +-
.../java/org/apache/solr/update/SolrCoreState.java | 75 +++++++++-
...Test.java => TestConfigSetsAPIShareSchema.java} | 2 +-
.../solr/search/facet/TestJsonFacetRefinement.java | 12 +-
.../apache/solr/search/facet/TestJsonFacets.java | 6 +-
.../solr/search/facet/TestJsonRangeFacets.java | 10 +-
solr/docker/build.gradle | 20 ++-
solr/solr-ref-guide/src/configsets-api.adoc | 14 ++
solr/solr-ref-guide/src/distributed-requests.adoc | 4 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 8 +-
55 files changed, 748 insertions(+), 446 deletions(-)
diff --cc solr/core/src/java/org/apache/solr/cluster/events/impl/package-info.java
index 2c115b6,0000000..4eb6bf6
mode 100644,000000..100644
--- a/solr/core/src/java/org/apache/solr/cluster/events/impl/package-info.java
+++ b/solr/core/src/java/org/apache/solr/cluster/events/impl/package-info.java
@@@ -1,23 -1,0 +1,18 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
-
- /**
- * Default implementation of {@link org.apache.solr.cluster.events.ClusterEventProducer}.
- */
- package org.apache.solr.cluster.events.impl;
-
+
++description = 'Lucene HTML documentation'