You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2020/09/29 06:19:54 UTC
[lucene-solr] 03/04: Merge branch 'branch_8x' of
github.com:apache/lucene-solr into branch_8x
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit bea14ec3d8bfd59be431bbd8f7b0f303d2fe5aee
Merge: f3cd2e3 f521906
Author: noblepaul <no...@gmail.com>
AuthorDate: Tue Sep 29 16:06:27 2020 +1000
Merge branch 'branch_8x' of github.com:apache/lucene-solr into branch_8x
dev-tools/maven/pom.xml.template | 2 +-
lucene/CHANGES.txt | 25 +-
lucene/common-build.xml | 2 +-
.../org/apache/lucene/document/ShapeQuery.java | 95 +++-
.../apache/lucene/index/BinaryDocValuesWriter.java | 70 ++-
.../lucene/index/DocumentsWriterFlushControl.java | 2 +-
.../lucene/index/DocumentsWriterPerThread.java | 6 +-
.../org/apache/lucene/index/NormValuesWriter.java | 2 +-
.../lucene/index/NumericDocValuesWriter.java | 14 +-
.../lucene/index/SortedNumericDocValuesWriter.java | 82 ++--
.../lucene/index/SortedSetDocValuesWriter.java | 98 ++---
.../apache/lucene/index/SortingCodecReader.java | 168 ++++----
.../src/java/org/apache/lucene/search/Weight.java | 6 +-
.../lucene/search/comparators/DocComparator.java | 10 +-
.../search/comparators/NumericComparator.java | 8 +-
.../apache/lucene/store/ByteBuffersDataOutput.java | 10 +-
.../lucene/index/TestSortingCodecReader.java | 8 +-
.../search/TestFieldSortOptimizationSkipping.java | 87 +++-
.../lucene/store/TestByteBuffersDataOutput.java | 42 ++
.../lucene/facet/taxonomy/TaxonomyFacetLabels.java | 195 +++++++++
.../org/apache/lucene/facet/FacetTestCase.java | 42 +-
.../facet/taxonomy/TestTaxonomyFacetCounts.java | 44 +-
.../facet/taxonomy/TestTaxonomyFacetLabels.java | 195 +++++++++
lucene/ivy-versions.properties | 2 +-
.../search/join/ToParentBlockJoinSortField.java | 2 -
solr/CHANGES.txt | 26 +-
solr/bin/solr | 9 +-
solr/bin/solr.cmd | 4 +
solr/bin/solr.in.sh | 10 +-
.../apache/solr/api/CustomContainerPlugins.java | 24 +-
.../cloud/OverseerConfigSetMessageHandler.java | 24 +-
.../java/org/apache/solr/cloud/ZkController.java | 28 +-
.../cloud/api/collections/CreateCollectionCmd.java | 15 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 4 +-
.../solr/cloud/autoscaling/ActionContext.java | 4 +-
.../autoscaling/AutoAddReplicasPlanAction.java | 2 +
.../apache/solr/cloud/autoscaling/AutoScaling.java | 5 +
.../solr/cloud/autoscaling/AutoScalingHandler.java | 4 +-
.../solr/cloud/autoscaling/ComputePlanAction.java | 2 +
.../solr/cloud/autoscaling/ExecutePlanAction.java | 2 +
.../cloud/autoscaling/HttpTriggerListener.java | 2 +
.../autoscaling/InactiveMarkersPlanAction.java | 2 +
.../cloud/autoscaling/InactiveShardPlanAction.java | 2 +
.../solr/cloud/autoscaling/IndexSizeTrigger.java | 2 +-
.../solr/cloud/autoscaling/LoggingListener.java | 2 +
.../solr/cloud/autoscaling/MetricTrigger.java | 4 +
.../solr/cloud/autoscaling/NodeAddedTrigger.java | 2 +
.../solr/cloud/autoscaling/NodeLostTrigger.java | 2 +
.../cloud/autoscaling/OverseerTriggerThread.java | 2 +
.../solr/cloud/autoscaling/ScheduledTrigger.java | 2 +
.../solr/cloud/autoscaling/ScheduledTriggers.java | 4 +-
.../solr/cloud/autoscaling/SearchRateTrigger.java | 2 +
.../solr/cloud/autoscaling/SystemLogListener.java | 2 +
.../solr/cloud/autoscaling/TriggerAction.java | 2 +
.../solr/cloud/autoscaling/TriggerActionBase.java | 2 +
.../cloud/autoscaling/TriggerActionException.java | 2 +
.../apache/solr/cloud/autoscaling/TriggerBase.java | 2 +
.../solr/cloud/autoscaling/TriggerEvent.java | 2 +
.../solr/cloud/autoscaling/TriggerEventQueue.java | 1 +
.../solr/cloud/autoscaling/TriggerListener.java | 2 +
.../cloud/autoscaling/TriggerListenerBase.java | 2 +
.../solr/cloud/autoscaling/TriggerUtils.java | 1 +
.../autoscaling/TriggerValidationException.java | 2 +
.../solr/cloud/autoscaling/package-info.java | 4 +-
.../solr/cloud/autoscaling/sim/ActionError.java | 2 +
.../cloud/autoscaling/sim/FakeDocIterator.java | 2 +
.../autoscaling/sim/GenericDistributedQueue.java | 2 +
.../sim/GenericDistributedQueueFactory.java | 2 +
.../solr/cloud/autoscaling/sim/LiveNodesSet.java | 2 +
.../sim/NoopDistributedQueueFactory.java | 2 +
.../cloud/autoscaling/sim/SimCloudManager.java | 2 +
.../autoscaling/sim/SimClusterStateProvider.java | 2 +
.../autoscaling/sim/SimDistribStateManager.java | 2 +
.../sim/SimDistributedQueueFactory.java | 2 +
.../autoscaling/sim/SimNodeStateProvider.java | 2 +
.../solr/cloud/autoscaling/sim/SimScenario.java | 2 +
.../solr/cloud/autoscaling/sim/SimUtils.java | 2 +
.../autoscaling/sim/SnapshotCloudManager.java | 2 +
.../sim/SnapshotClusterStateProvider.java | 2 +
.../sim/SnapshotDistribStateManager.java | 2 +
.../autoscaling/sim/SnapshotNodeStateProvider.java | 2 +
.../solr/cloud/autoscaling/sim/package-info.java | 1 +
.../java/org/apache/solr/core/CoreContainer.java | 8 +-
.../org/apache/solr/core/SolrResourceLoader.java | 91 ++--
.../java/org/apache/solr/handler/ClusterAPI.java | 80 +++-
.../org/apache/solr/handler/CollectionsAPI.java | 63 +++
.../handler/admin/AutoscalingHistoryHandler.java | 2 +
.../solr/handler/admin/CollectionsHandler.java | 2 +-
.../solr/handler/admin/ConfigSetsHandler.java | 151 +++++--
.../solr/handler/admin/ConfigSetsHandlerApi.java | 93 ----
.../src/java/org/apache/solr/pkg/PackageAPI.java | 46 +-
.../java/org/apache/solr/pkg/PackageLoader.java | 8 +
.../apache/solr/request/macro/MacroExpander.java | 35 +-
.../schema/AbstractSpatialPrefixTreeFieldType.java | 67 +++
.../org/apache/solr/schema/ManagedIndexSchema.java | 3 +
.../java/org/apache/solr/schema/SchemaManager.java | 8 +
.../org/apache/solr/search/FunctionQParser.java | 14 +-
.../distance/GeoDistValueSourceParser.java | 68 +--
.../apache/solr/search/stats/ExactStatsCache.java | 6 +
.../apache/solr/servlet/SolrDispatchFilter.java | 2 +-
.../apache/solr/servlet/SolrRequestParsers.java | 18 +-
.../MyPatternReplaceCharFilterFactory.java} | 15 +-
.../runtimecode/MyTextField.java} | 10 +-
.../runtimecode/MyWhitespaceTokenizerFactory.java} | 14 +-
.../runtimecode/payload-component.jar.bin | Bin 0 -> 17815 bytes
.../test-files/runtimecode/schema-plugins.jar.bin | Bin 6814 -> 1461 bytes
.../bad-schema-daterangefield-instance-options.xml | 35 ++
.../bad-schema-daterangefield-type-options.xml | 35 ++
.../solr/configsets/schema-package/conf/schema.xml | 50 +++
.../configsets/schema-package/conf/solrconfig.xml | 51 +++
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 480 ++++++++++++++-------
.../test/org/apache/solr/cloud/ZkFailoverTest.java | 35 +-
.../solr/handler/admin/TestApiFramework.java | 41 +-
.../solr/handler/admin/TestCollectionAPIs.java | 4 +-
.../apache/solr/handler/admin/TestConfigsApi.java | 19 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 189 ++++----
.../solr/request/macro/TestMacroExpander.java | 56 ++-
.../org/apache/solr/schema/BadIndexSchemaTest.java | 5 +
.../org/apache/solr/schema/DateRangeFieldTest.java | 4 +
.../solr/schema/SpatialRPTFieldTypeTest.java | 3 +-
.../org/apache/solr/search/TestSolr4Spatial2.java | 78 +++-
.../solr/search/stats/TestExactStatsCache.java | 74 +++-
solr/licenses/zookeeper-3.6.1.jar.sha1 | 1 -
solr/licenses/zookeeper-3.6.2.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.6.1.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.6.2.jar.sha1 | 1 +
solr/solr-ref-guide/src/configsets-api.adoc | 8 +-
.../src/the-query-elevation-component.adoc | 3 +-
.../cloud/autoscaling/AddReplicaSuggester.java | 4 +
.../cloud/autoscaling/AlreadyExistsException.java | 1 +
.../solrj/cloud/autoscaling/AutoScalingConfig.java | 2 +
.../cloud/autoscaling/BadVersionException.java | 1 +
.../solr/client/solrj/cloud/autoscaling/Cell.java | 1 +
.../client/solrj/cloud/autoscaling/Clause.java | 2 +
.../solrj/cloud/autoscaling/ComputedType.java | 4 +
.../client/solrj/cloud/autoscaling/Condition.java | 4 +
.../solrj/cloud/autoscaling/CoresVariable.java | 4 +
.../cloud/autoscaling/DelegatingCloudManager.java | 2 +
.../DelegatingClusterStateProvider.java | 2 +
.../autoscaling/DelegatingDistribStateManager.java | 4 +
.../autoscaling/DelegatingNodeStateProvider.java | 2 +
.../cloud/autoscaling/DeleteNodeSuggester.java | 2 +
.../cloud/autoscaling/DeleteReplicaSuggester.java | 2 +
.../solrj/cloud/autoscaling/FreeDiskVariable.java | 4 +
.../cloud/autoscaling/MoveReplicaSuggester.java | 4 +
.../solrj/cloud/autoscaling/NodeVariable.java | 4 +
.../solrj/cloud/autoscaling/NoneSuggester.java | 4 +
.../solrj/cloud/autoscaling/NotEmptyException.java | 1 +
.../client/solrj/cloud/autoscaling/Operand.java | 5 +-
.../client/solrj/cloud/autoscaling/Policy.java | 6 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 4 +
.../client/solrj/cloud/autoscaling/Preference.java | 4 +
.../client/solrj/cloud/autoscaling/RangeVal.java | 4 +
.../solrj/cloud/autoscaling/ReplicaCount.java | 4 +
.../solrj/cloud/autoscaling/ReplicaInfo.java | 4 +
.../solrj/cloud/autoscaling/ReplicaVariable.java | 4 +
.../solr/client/solrj/cloud/autoscaling/Row.java | 2 +
.../solrj/cloud/autoscaling/SealedClause.java | 2 +
.../cloud/autoscaling/SplitShardSuggester.java | 2 +
.../client/solrj/cloud/autoscaling/Suggester.java | 5 +-
.../client/solrj/cloud/autoscaling/Suggestion.java | 4 +
.../autoscaling/TriggerEventProcessorStage.java | 2 +
.../solrj/cloud/autoscaling/TriggerEventType.java | 2 +
.../cloud/autoscaling/UnsupportedSuggester.java | 2 +
.../client/solrj/cloud/autoscaling/Variable.java | 2 +
.../solrj/cloud/autoscaling/VariableBase.java | 4 +
.../solrj/cloud/autoscaling/VersionedData.java | 2 +
.../client/solrj/cloud/autoscaling/Violation.java | 4 +
.../cloud/autoscaling/WithCollectionVariable.java | 2 +
.../solrj/cloud/autoscaling/package-info.java | 2 +
.../client/solrj/impl/BaseCloudSolrClient.java | 8 +-
.../client/solrj/request/CollectionApiMapping.java | 85 ----
.../solrj/request/beans/ClusterPropInfo.java | 2 +-
.../beans/CreateConfigInfo.java} | 25 +-
.../java/org/apache/solr/common/MapWriterMap.java | 4 +-
.../solr/common/params/AutoScalingParams.java | 2 +
.../apache/solr/common/params/ConfigSetParams.java | 2 +
.../apispec/cluster.configs.Commands.json | 34 --
.../resources/apispec/cluster.configs.delete.json | 12 -
.../src/resources/apispec/cluster.configs.json | 12 -
.../solrj/src/resources/apispec/cluster.nodes.json | 12 -
.../apispec/collections.collection.delete.json | 13 -
solr/solrj/src/resources/apispec/collections.json | 13 -
.../apache/solr/common/util/JsonValidatorTest.java | 1 -
.../solr/common/util/TestZkMaintenanceUtils.java | 60 +++
.../apache/solr/cloud/MiniSolrCloudCluster.java | 9 +-
186 files changed, 2732 insertions(+), 1133 deletions(-)
diff --cc solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
index 2b4314f,f4ae860..b22ba69
--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
@@@ -1338,10 -1338,13 +1338,13 @@@ public final class ManagedIndexSchema e
TokenFilterFactory[] filters = chain.getTokenFilterFactories();
for (TokenFilterFactory next : filters) {
if (next instanceof ResourceLoaderAware) {
+ SolrResourceLoader.CURRENT_AWARE.set((ResourceLoaderAware) next);
try {
- ((ResourceLoaderAware) next).inform(loader);
+ ((ResourceLoaderAware) next).inform(resourceLoader);
} catch (IOException e) {
throw new SolrException(ErrorCode.SERVER_ERROR, e);
+ } finally {
+ SolrResourceLoader.CURRENT_AWARE.remove();
}
}
}