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/09/17 10:34:13 UTC
[lucene-solr] branch jira/solr-14749 updated (9e4745c -> 54f8677)
This is an automated email from the ASF dual-hosted git repository.
ab pushed a change to branch jira/solr-14749
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 9e4745c SOLR-14749: More javadoc, bug fixes & tests.
add 27a14fe Revert "SOLR-14151: Bug fixes (#1815)"
add a8099d6 Merge branch 'master' of github.com:apache/lucene-solr
add 5edd4b2 SOLR-14725 update batchSize parameter docs for update() and delete() stream expressions (#1729)
add bc0b29e SOLR-14789: Rename docker tests task, adding missing credit in CHANGES (#1871)
add fceab76 Make sure to test normal scorers with asserting wrappers. (#1834)
add 97a4af6 LUCENE-9510: Don't pull a merge instance when flushing stored fields out-of-order. (#1872)
add 7d62cad SOLR-14862: Update RefGuide page for support fied types (#1865)
add f655d97 LUCENE-9516: Remove DocConsumer and IndexingChain from Lucene (#1867)
add 58d1360 SOLR-10471: update default zk session timeout in bin/solr* scripts
add 3134f10 LUCENE-9488 Update release process to work with gradle (#1860)
add 9b9b0a6 Fix corrupted umlaut characters. This was introduced back in 2009...
add 7b8e72e SOLR-14871 Use Annotations for v2 APIs in/cluster path (#1878)
add 6b87cfb Merge branch 'master' of github.com:apache/lucene-solr
add 93094ef LUCENE-9510: Don't compress temporary stored fields and term vectors when index sorting is enabled. (#1874)
add ad71bee LUCENE-9525: Better handle small documents with Lucene87StoredFieldsFormat. (#1876)
add bc0c9ff SOLR-14799: JWT authentication plugin only requires sub claim when principalClaim=sub
add c63684f Revert "SOLR-14799: JWT authentication plugin only requires sub claim when principalClaim=sub"
add 2202246 SOLR-14799: JWT authentication plugin only requires sub claim when principalClaim=sub
add a0404a7 SOLR-14799: add CHANGES entry
add c7d234c SOLR-14613: Autoscaling replacement using placement plugins
add e5d3e4d Merge branch 'master' of github.com:apache/lucene-solr
add 5bc7fb2 SOLR-14871: remove unused test
add cbb1659 Revert "Revert "SOLR-14151: Bug fixes (#1815)""
add 4f344cb LUCENE-9530: cleaned up javacc gradle generation scripts. (#1883)
add 515608a SOLR-14151: fixed the classloading issue
new 54f8677 Merge branch 'master' into jira/solr-14749
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-tools/scripts/buildAndPushRelease.py | 33 +-
dev-tools/scripts/releaseWizard.py | 23 +-
dev-tools/scripts/releaseWizard.yaml | 73 ++-
dev-tools/scripts/scriptutil.py | 11 -
gradle/generation/javacc.gradle | 584 ++++++++++-----------
lucene/CHANGES.txt | 11 +-
.../codecs/lucene87/BugfixDeflater_JDK8252739.java | 13 +-
.../DeflateWithPresetDictCompressionMode.java | 22 +-
.../lucene87/LZ4WithPresetDictCompressionMode.java | 26 +-
.../lucene87/Lucene87StoredFieldsFormat.java | 31 +-
.../lucene/index/DocumentsWriterPerThread.java | 38 +-
...efaultIndexingChain.java => IndexingChain.java} | 17 +-
.../apache/lucene/index/LiveIndexWriterConfig.java | 13 -
.../lucene/index/SortingStoredFieldsConsumer.java | 62 ++-
.../lucene/index/SortingTermVectorsConsumer.java | 22 +-
.../org/apache/lucene/index/TestIndexWriter.java | 2 +-
.../apache/lucene/index/TestIndexWriterConfig.java | 17 -
.../lucene/index/TestIndexWriterWithThreads.java | 2 +-
.../org/apache/lucene/facet/TestDrillSideways.java | 18 +-
.../lucene/facet/range/TestRangeFacetCounts.java | 5 +-
.../lucene/queryparser/classic/CharStream.java | 2 +-
.../lucene/queryparser/classic/ParseException.java | 2 +-
.../classic/QueryParserTokenManager.java | 18 +-
.../apache/lucene/queryparser/classic/Token.java | 2 +-
.../lucene/queryparser/classic/TokenMgrError.java | 2 +-
.../flexible/standard/parser/CharStream.java | 2 +-
.../flexible/standard/parser/ParseException.java | 48 +-
.../parser/StandardSyntaxParserTokenManager.java | 27 +-
.../flexible/standard/parser/Token.java | 2 +-
.../flexible/standard/parser/TokenMgrError.java | 2 +-
.../queryparser/surround/parser/CharStream.java | 2 +-
.../surround/parser/ParseException.java | 2 +-
.../queryparser/surround/parser/QueryParser.java | 2 +
.../surround/parser/QueryParserTokenManager.java | 19 +-
.../lucene/queryparser/surround/parser/Token.java | 2 +-
.../queryparser/surround/parser/TokenMgrError.java | 2 +-
.../flexible/standard/TestQPHelper.java | 8 +-
.../DeflateWithPresetCompressingCodec.java | 2 +-
.../compressing/LZ4WithPresetCompressingCodec.java | 2 +-
.../org/apache/lucene/search/AssertingWeight.java | 13 +-
lucene/version.properties | 10 +
solr/CHANGES.txt | 7 +-
solr/bin/solr | 2 +-
solr/bin/solr.cmd | 2 +-
solr/bin/solr.in.cmd | 2 +-
solr/bin/solr.in.sh | 2 +-
.../src/java/org/apache/solr/api/AnnotatedApi.java | 12 +-
.../src/java/org/apache/solr/api/PayloadObj.java | 4 +-
.../apache/solr/cloud/api/collections/Assign.java | 64 +--
.../cloud/api/collections/CreateCollectionCmd.java | 3 +-
.../solr/cloud/api/collections/ReplaceNodeCmd.java | 3 +-
.../solr/cloud/api/collections/RestoreCmd.java | 3 +-
.../solr/cloud/api/collections/SplitShardCmd.java | 3 +-
.../src/java/org/apache/solr/cluster/Cluster.java | 50 ++
.../src/java/org/apache/solr/cluster/Node.java | 23 +-
.../src/java/org/apache/solr/cluster/Replica.java | 37 +-
.../src/java/org/apache/solr/cluster/Shard.java | 60 +++
.../org/apache/solr/cluster/SolrCollection.java | 78 +++
.../java/org/apache/solr/cluster/package-info.java | 28 +
.../solr/cluster/placement/AttributeFetcher.java | 85 +++
.../solr/cluster/placement/AttributeValues.java | 55 ++
.../solr/cluster/placement/PlacementException.java | 48 ++
.../solr/cluster/placement/PlacementPlan.java | 43 ++
.../cluster/placement/PlacementPlanFactory.java | 51 ++
.../solr/cluster/placement/PlacementPlugin.java | 51 ++
.../cluster/placement/PlacementPluginConfig.java | 115 ++++
.../cluster/placement/PlacementPluginFactory.java | 25 +-
.../solr/cluster/placement/PlacementRequest.java | 64 +++
.../solr/cluster/placement/ReplicaPlacement.java | 56 ++
.../placement/impl/AttributeFetcherImpl.java | 228 ++++++++
.../placement/impl/AttributeValuesImpl.java | 114 ++++
.../placement/impl/PlacementPlanFactoryImpl.java | 29 +-
.../cluster/placement/impl/PlacementPlanImpl.java | 35 +-
.../impl/PlacementPluginAssignStrategy.java | 68 +++
.../placement/impl/PlacementPluginConfigImpl.java | 204 +++++++
.../placement/impl/PlacementRequestImpl.java | 100 ++++
.../placement/impl/ReplicaPlacementImpl.java | 83 +++
.../impl/SimpleClusterAbstractionsImpl.java | 392 ++++++++++++++
.../solr/cluster/placement/impl/package-info.java | 24 +-
.../solr/cluster/placement/package-info.java | 40 ++
.../SamplePluginAffinityReplicaPlacement.java | 509 ++++++++++++++++++
.../plugins/SamplePluginMinimizeCores.java | 138 +++++
.../plugins/SamplePluginRandomPlacement.java | 88 ++++
.../cluster/placement/plugins/package-info.java | 23 +-
.../java/org/apache/solr/core/CoreContainer.java | 4 +
.../org/apache/solr/core/SolrResourceLoader.java | 111 +++-
.../java/org/apache/solr/handler/ClusterAPI.java | 198 +++++++
.../org/apache/solr/handler/SolrConfigHandler.java | 2 +-
.../solr/handler/admin/CollectionHandlerApi.java | 53 --
.../solr/handler/admin/CollectionsHandler.java | 63 ++-
.../java/org/apache/solr/parser/CharStream.java | 2 +-
.../org/apache/solr/parser/ParseException.java | 2 +-
.../solr/parser/QueryParserTokenManager.java | 17 +-
.../src/java/org/apache/solr/parser/Token.java | 2 +-
.../java/org/apache/solr/parser/TokenMgrError.java | 2 +-
.../java/org/apache/solr/schema/IndexSchema.java | 2 +-
.../org/apache/solr/schema/ManagedIndexSchema.java | 5 +-
.../java/org/apache/solr/schema/SchemaManager.java | 10 +-
.../org/apache/solr/security/JWTAuthPlugin.java | 8 +-
.../runtimecode/payload-component.jar.bin | Bin 0 -> 17815 bytes
.../solr/handler/admin/TestCollectionAPIs.java | 10 +
.../src/test/org/apache/solr/pkg/TestPackages.java | 21 +-
.../apache/solr/security/JWTAuthPluginTest.java | 18 +-
solr/docker/build.gradle | 2 +-
.../src/field-types-included-with-solr.adoc | 62 ++-
solr/solr-ref-guide/src/other-parsers.adoc | 11 +
.../src/stream-decorator-reference.adoc | 6 +-
.../client/solrj/request/CollectionApiMapping.java | 31 +-
.../solrj/request/beans/ClusterPropInfo.java | 72 +++
.../solr/common/params/DefaultSolrParams.java | 2 +-
.../apache/solr/common/util/JsonSchemaCreator.java | 14 +-
.../java/org/apache/solr/common/util/Utils.java | 2 +-
.../src/resources/apispec/cluster.Commands.json | 146 ------
.../apispec/cluster.commandstatus.delete.json | 10 -
.../resources/apispec/cluster.commandstatus.json | 20 -
solr/solrj/src/resources/apispec/cluster.json | 14 -
.../apache/solr/common/util/JsonValidatorTest.java | 8 -
117 files changed, 4037 insertions(+), 1138 deletions(-)
rename lucene/core/src/java/org/apache/lucene/index/{DefaultIndexingChain.java => IndexingChain.java} (98%)
create mode 100644 lucene/version.properties
create mode 100644 solr/core/src/java/org/apache/solr/cluster/Cluster.java
copy lucene/core/src/java/org/apache/lucene/index/DocConsumer.java => solr/core/src/java/org/apache/solr/cluster/Node.java (56%)
copy lucene/core/src/java/org/apache/lucene/index/DocConsumer.java => solr/core/src/java/org/apache/solr/cluster/Replica.java (56%)
create mode 100644 solr/core/src/java/org/apache/solr/cluster/Shard.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/SolrCollection.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/package-info.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/AttributeFetcher.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/AttributeValues.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementException.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementPlan.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementPlanFactory.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementPlugin.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementPluginConfig.java
copy lucene/core/src/java/org/apache/lucene/index/DocConsumer.java => solr/core/src/java/org/apache/solr/cluster/placement/PlacementPluginFactory.java (55%)
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/PlacementRequest.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/ReplicaPlacement.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeFetcherImpl.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/AttributeValuesImpl.java
copy lucene/core/src/java/org/apache/lucene/index/DocConsumer.java => solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPlanFactoryImpl.java (51%)
copy lucene/core/src/java/org/apache/lucene/index/DocConsumer.java => solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPlanImpl.java (52%)
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPluginAssignStrategy.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPluginConfigImpl.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementRequestImpl.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/ReplicaPlacementImpl.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/SimpleClusterAbstractionsImpl.java
copy lucene/core/src/java/org/apache/lucene/index/DocConsumer.java => solr/core/src/java/org/apache/solr/cluster/placement/impl/package-info.java (56%)
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/package-info.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/SamplePluginAffinityReplicaPlacement.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/SamplePluginMinimizeCores.java
create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/SamplePluginRandomPlacement.java
rename lucene/core/src/java/org/apache/lucene/index/DocConsumer.java => solr/core/src/java/org/apache/solr/cluster/placement/plugins/package-info.java (56%)
create mode 100644 solr/core/src/java/org/apache/solr/handler/ClusterAPI.java
create mode 100644 solr/core/src/test-files/runtimecode/payload-component.jar.bin
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/ClusterPropInfo.java
delete mode 100644 solr/solrj/src/resources/apispec/cluster.Commands.json
delete mode 100644 solr/solrj/src/resources/apispec/cluster.commandstatus.delete.json
delete mode 100644 solr/solrj/src/resources/apispec/cluster.commandstatus.json
delete mode 100644 solr/solrj/src/resources/apispec/cluster.json
[lucene-solr] 01/01: Merge branch 'master' into jira/solr-14749
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14749
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 54f86777c3c130c363053f22edfa14395a83d9ba
Merge: 9e4745c 515608a
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Sep 17 12:33:53 2020 +0200
Merge branch 'master' into jira/solr-14749
dev-tools/scripts/buildAndPushRelease.py | 33 +-
dev-tools/scripts/releaseWizard.py | 23 +-
dev-tools/scripts/releaseWizard.yaml | 73 ++-
dev-tools/scripts/scriptutil.py | 11 -
gradle/generation/javacc.gradle | 584 ++++++++++-----------
lucene/CHANGES.txt | 11 +-
.../codecs/lucene87/BugfixDeflater_JDK8252739.java | 13 +-
.../DeflateWithPresetDictCompressionMode.java | 22 +-
.../lucene87/LZ4WithPresetDictCompressionMode.java | 26 +-
.../lucene87/Lucene87StoredFieldsFormat.java | 31 +-
.../lucene/index/DocumentsWriterPerThread.java | 38 +-
...efaultIndexingChain.java => IndexingChain.java} | 17 +-
.../apache/lucene/index/LiveIndexWriterConfig.java | 13 -
.../lucene/index/SortingStoredFieldsConsumer.java | 62 ++-
.../lucene/index/SortingTermVectorsConsumer.java | 22 +-
.../org/apache/lucene/index/TestIndexWriter.java | 2 +-
.../apache/lucene/index/TestIndexWriterConfig.java | 17 -
.../lucene/index/TestIndexWriterWithThreads.java | 2 +-
.../org/apache/lucene/facet/TestDrillSideways.java | 18 +-
.../lucene/facet/range/TestRangeFacetCounts.java | 5 +-
.../lucene/queryparser/classic/CharStream.java | 2 +-
.../lucene/queryparser/classic/ParseException.java | 2 +-
.../classic/QueryParserTokenManager.java | 18 +-
.../apache/lucene/queryparser/classic/Token.java | 2 +-
.../lucene/queryparser/classic/TokenMgrError.java | 2 +-
.../flexible/standard/parser/CharStream.java | 2 +-
.../flexible/standard/parser/ParseException.java | 48 +-
.../parser/StandardSyntaxParserTokenManager.java | 27 +-
.../flexible/standard/parser/Token.java | 2 +-
.../flexible/standard/parser/TokenMgrError.java | 2 +-
.../queryparser/surround/parser/CharStream.java | 2 +-
.../surround/parser/ParseException.java | 2 +-
.../queryparser/surround/parser/QueryParser.java | 2 +
.../surround/parser/QueryParserTokenManager.java | 19 +-
.../lucene/queryparser/surround/parser/Token.java | 2 +-
.../queryparser/surround/parser/TokenMgrError.java | 2 +-
.../flexible/standard/TestQPHelper.java | 8 +-
.../DeflateWithPresetCompressingCodec.java | 2 +-
.../compressing/LZ4WithPresetCompressingCodec.java | 2 +-
.../org/apache/lucene/search/AssertingWeight.java | 13 +-
lucene/version.properties | 10 +
solr/CHANGES.txt | 7 +-
solr/bin/solr | 2 +-
solr/bin/solr.cmd | 2 +-
solr/bin/solr.in.cmd | 2 +-
solr/bin/solr.in.sh | 2 +-
.../src/java/org/apache/solr/api/AnnotatedApi.java | 12 +-
.../src/java/org/apache/solr/api/PayloadObj.java | 4 +-
.../apache/solr/cloud/api/collections/Assign.java | 64 +--
.../cloud/api/collections/CreateCollectionCmd.java | 3 +-
.../solr/cloud/api/collections/ReplaceNodeCmd.java | 3 +-
.../solr/cloud/api/collections/RestoreCmd.java | 3 +-
.../solr/cloud/api/collections/SplitShardCmd.java | 3 +-
.../src/java/org/apache/solr/cluster/Cluster.java | 50 ++
.../src/java/org/apache/solr/cluster/Node.java | 23 +-
.../src/java/org/apache/solr/cluster/Replica.java | 37 +-
.../src/java/org/apache/solr/cluster/Shard.java | 60 +++
.../org/apache/solr/cluster/SolrCollection.java | 78 +++
.../java/org/apache/solr/cluster/package-info.java | 28 +
.../solr/cluster/placement/AttributeFetcher.java | 85 +++
.../solr/cluster/placement/AttributeValues.java | 55 ++
.../solr/cluster/placement/PlacementException.java | 48 ++
.../solr/cluster/placement/PlacementPlan.java | 43 ++
.../cluster/placement/PlacementPlanFactory.java | 51 ++
.../solr/cluster/placement/PlacementPlugin.java | 51 ++
.../cluster/placement/PlacementPluginConfig.java | 115 ++++
.../cluster/placement/PlacementPluginFactory.java | 25 +-
.../solr/cluster/placement/PlacementRequest.java | 64 +++
.../solr/cluster/placement/ReplicaPlacement.java | 56 ++
.../placement/impl/AttributeFetcherImpl.java | 228 ++++++++
.../placement/impl/AttributeValuesImpl.java | 114 ++++
.../placement/impl/PlacementPlanFactoryImpl.java | 29 +-
.../cluster/placement/impl/PlacementPlanImpl.java | 35 +-
.../impl/PlacementPluginAssignStrategy.java | 68 +++
.../placement/impl/PlacementPluginConfigImpl.java | 204 +++++++
.../placement/impl/PlacementRequestImpl.java | 100 ++++
.../placement/impl/ReplicaPlacementImpl.java | 83 +++
.../impl/SimpleClusterAbstractionsImpl.java | 392 ++++++++++++++
.../solr/cluster/placement/impl/package-info.java | 24 +-
.../solr/cluster/placement/package-info.java | 40 ++
.../SamplePluginAffinityReplicaPlacement.java | 509 ++++++++++++++++++
.../plugins/SamplePluginMinimizeCores.java | 138 +++++
.../plugins/SamplePluginRandomPlacement.java | 88 ++++
.../cluster/placement/plugins/package-info.java | 23 +-
.../java/org/apache/solr/core/CoreContainer.java | 4 +
.../org/apache/solr/core/SolrResourceLoader.java | 111 +++-
.../java/org/apache/solr/handler/ClusterAPI.java | 198 +++++++
.../org/apache/solr/handler/SolrConfigHandler.java | 2 +-
.../solr/handler/admin/CollectionHandlerApi.java | 53 --
.../solr/handler/admin/CollectionsHandler.java | 63 ++-
.../java/org/apache/solr/parser/CharStream.java | 2 +-
.../org/apache/solr/parser/ParseException.java | 2 +-
.../solr/parser/QueryParserTokenManager.java | 17 +-
.../src/java/org/apache/solr/parser/Token.java | 2 +-
.../java/org/apache/solr/parser/TokenMgrError.java | 2 +-
.../java/org/apache/solr/schema/IndexSchema.java | 2 +-
.../org/apache/solr/schema/ManagedIndexSchema.java | 5 +-
.../java/org/apache/solr/schema/SchemaManager.java | 10 +-
.../org/apache/solr/security/JWTAuthPlugin.java | 8 +-
.../runtimecode/payload-component.jar.bin | Bin 0 -> 17815 bytes
.../solr/handler/admin/TestCollectionAPIs.java | 10 +
.../src/test/org/apache/solr/pkg/TestPackages.java | 21 +-
.../apache/solr/security/JWTAuthPluginTest.java | 18 +-
solr/docker/build.gradle | 2 +-
.../src/field-types-included-with-solr.adoc | 62 ++-
solr/solr-ref-guide/src/other-parsers.adoc | 11 +
.../src/stream-decorator-reference.adoc | 6 +-
.../client/solrj/request/CollectionApiMapping.java | 31 +-
.../solrj/request/beans/ClusterPropInfo.java | 72 +++
.../solr/common/params/DefaultSolrParams.java | 2 +-
.../apache/solr/common/util/JsonSchemaCreator.java | 14 +-
.../java/org/apache/solr/common/util/Utils.java | 2 +-
.../src/resources/apispec/cluster.Commands.json | 146 ------
.../apispec/cluster.commandstatus.delete.json | 10 -
.../resources/apispec/cluster.commandstatus.json | 20 -
solr/solrj/src/resources/apispec/cluster.json | 14 -
.../apache/solr/common/util/JsonValidatorTest.java | 8 -
117 files changed, 4037 insertions(+), 1138 deletions(-)