You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2019/10/08 18:39:49 UTC
[lucene-solr] 01/01: Merge branch 'master' into jira/solr-13350
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr-13350
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 41eeee9e8de18ae56234ca1bc91bab8772b6afe1
Merge: fec884a 2e1a470
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Tue Oct 8 20:26:51 2019 +0530
Merge branch 'master' into jira/solr-13350
dev-tools/maven/README.maven | 8 +-
dev-tools/maven/pom.xml.template | 22 +-
dev-tools/maven/solr/pom.xml.template | 10 +-
lucene/CHANGES.txt | 46 ++
lucene/common-build.xml | 20 +-
.../lucene/codecs/blocktree/SegmentTermsEnum.java | 4 +
.../org/apache/lucene/document/FeatureField.java | 2 +-
.../lucene/document/LatLonPointDistanceQuery.java | 2 +-
.../lucene/document/LatLonPointInPolygonQuery.java | 2 +-
.../java/org/apache/lucene/document/LongPoint.java | 2 +-
.../apache/lucene/document/RangeFieldQuery.java | 2 +-
.../java/org/apache/lucene/index/PointValues.java | 28 +-
.../apache/lucene/search/BottomValueChecker.java | 52 ++
.../org/apache/lucene/search/IndexSearcher.java | 22 +-
.../org/apache/lucene/search/PointRangeQuery.java | 2 +-
.../apache/lucene/search/TopScoreDocCollector.java | 50 +-
.../src/java/org/apache/lucene/util/Version.java | 7 +
.../codecs/lucene60/TestLucene60PointsFormat.java | 310 +++++---
.../apache/lucene/document/TestFeatureSort.java | 2 +-
.../lucene/search/TestIndexOrDocValuesQuery.java | 67 ++
.../apache/lucene/search/TestIndexSearcher.java | 82 +++
.../apache/lucene/search/TestLRUQueryCache.java | 36 +-
.../apache/lucene/search/TestTopDocsCollector.java | 52 +-
.../org/apache/lucene/util/fst/TestFstDirect.java | 1 -
lucene/default-nested-ivy-settings.xml | 2 +-
lucene/ivy-versions.properties | 3 +-
.../luke/models/overview/OverviewTestBase.java | 6 +-
.../apache/lucene/queries/mlt/MoreLikeThis.java | 6 +-
.../lucene/queries/mlt/TestMoreLikeThis.java | 59 ++
.../apache/lucene/queryparser/xml/CoreParser.java | 35 +-
.../lucene/queryparser/xml/TestCoreParser.java | 6 +-
.../document/LatLonShapeBoundingBoxQuery.java | 3 +
.../org/apache/lucene/document/ShapeQuery.java | 2 +-
.../lucene/document/XYShapeBoundingBoxQuery.java | 3 +
.../java/org/apache/lucene/geo/Rectangle2D.java | 77 +-
.../org/apache/lucene/search/MultiRangeQuery.java | 2 +-
.../org/apache/lucene/geo/TestRectangle2D.java | 58 +-
.../org/apache/lucene/util/LuceneTestCase.java | 152 ++--
.../org/apache/lucene/util/TestExpectThrows.java | 155 ++++
solr/CHANGES.txt | 125 +++-
solr/bin/solr | 24 +-
solr/bin/solr.in.cmd | 2 +
solr/bin/solr.in.sh | 2 +
solr/cloud-dev/clean.sh | 20 -
solr/cloud-dev/cli-test-solrcloud-start.sh | 53 --
solr/cloud-dev/cloud.sh | 383 ++++++++++
solr/cloud-dev/control.sh | 37 -
solr/cloud-dev/example1.sh | 26 -
solr/cloud-dev/example2.sh | 36 -
solr/cloud-dev/example3.sh | 35 -
solr/cloud-dev/functions.sh | 77 --
solr/cloud-dev/solrcloud-start-existing.sh | 39 -
solr/cloud-dev/solrcloud-start.sh | 74 --
solr/cloud-dev/stop.sh | 64 --
.../exporter/SolrExporterIntegrationTest.java | 1 +
.../prometheus/exporter/SolrExporterTestBase.java | 2 +-
solr/core/ivy.xml | 1 -
.../src/java/org/apache/solr/api/AnnotatedApi.java | 275 ++++++++
solr/core/src/java/org/apache/solr/api/ApiBag.java | 26 +-
.../org/apache/solr/api/Command.java} | 30 +-
.../org/apache/solr/api/EndPoint.java} | 29 +-
.../client/solrj/embedded/EmbeddedSolrServer.java | 101 ++-
.../client/solrj/embedded/JettySolrRunner.java | 4 +-
.../org/apache/solr/cloud/ReplicateFromLeader.java | 2 +-
.../autoscaling/InactiveMarkersPlanAction.java | 11 +-
.../solr/cloud/autoscaling/IndexSizeTrigger.java | 2 +-
.../solr/cloud/autoscaling/NodeAddedTrigger.java | 16 +
.../solr/cloud/autoscaling/NodeLostTrigger.java | 21 +-
.../cloud/autoscaling/OverseerTriggerThread.java | 30 +-
.../java/org/apache/solr/core/BlobRepository.java | 190 +----
.../java/org/apache/solr/core/CoreContainer.java | 24 +-
.../java/org/apache/solr/core/MemClassLoader.java | 25 +-
.../java/org/apache/solr/core/PackageManager.java | 370 ----------
.../src/java/org/apache/solr/core/PluginBag.java | 323 ++++++---
.../src/java/org/apache/solr/core/PluginInfo.java | 79 +--
.../src/java/org/apache/solr/core/RuntimeLib.java | 227 ------
.../src/java/org/apache/solr/core/SolrConfig.java | 61 +-
.../src/java/org/apache/solr/core/SolrCore.java | 58 +-
.../org/apache/solr/core/SolrResourceLoader.java | 41 +-
.../apache/solr/filestore/DistribPackageStore.java | 495 +++++++++++++
.../org/apache/solr/filestore/PackageStore.java | 122 ++++
.../org/apache/solr/filestore/PackageStoreAPI.java | 273 +++++++
.../apache/solr/handler/ReplicationHandler.java | 2 +-
.../apache/solr/handler/RequestHandlerBase.java | 10 +-
.../org/apache/solr/handler/SolrConfigHandler.java | 574 +++++++--------
.../solr/handler/admin/CollectionHandlerApi.java | 313 +--------
.../solr/handler/admin/CollectionsHandler.java | 2 +-
.../solr/handler/component/DebugComponent.java | 12 +-
.../solr/handler/component/QueryComponent.java | 13 +-
.../handler/component/QueryElevationComponent.java | 2 +-
.../solr/handler/component/ResponseBuilder.java | 14 -
.../solr/handler/component/SuggestComponent.java | 2 +-
.../org/apache/solr/metrics/SolrMetricManager.java | 17 +-
.../apache/solr/metrics/SolrMetricProducer.java | 14 +-
.../solr/metrics/reporters/SolrJmxReporter.java | 2 +-
.../metrics/reporters/jmx/JmxMetricsReporter.java | 4 -
.../org/apache/solr/request/IntervalFacets.java | 2 +-
.../org/apache/solr/request/json/ObjectUtil.java | 8 +-
.../org/apache/solr/request/json/RequestUtil.java | 2 +
.../org/apache/solr/response/SchemaXmlWriter.java | 2 +
.../solr/rest/schema/FieldTypeXmlAdapter.java | 5 +-
.../src/java/org/apache/solr/schema/BoolField.java | 6 +-
.../apache/solr/schema/FieldTypePluginLoader.java | 5 +-
.../java/org/apache/solr/schema/IndexSchema.java | 104 ++-
.../org/apache/solr/schema/ManagedIndexSchema.java | 40 +-
.../java/org/apache/solr/schema/SchemaManager.java | 1 +
.../java/org/apache/solr/search/CacheConfig.java | 192 +++--
.../java/org/apache/solr/search/CaffeineCache.java | 367 ++++++++++
.../java/org/apache/solr/search/FastLRUCache.java | 149 ++--
.../src/java/org/apache/solr/search/LFUCache.java | 6 +-
.../src/java/org/apache/solr/search/LRUCache.java | 11 +-
.../src/java/org/apache/solr/search/SolrCache.java | 28 +-
.../org/apache/solr/search/SolrCacheHolder.java | 82 +--
.../apache/solr/search/SolrDocumentFetcher.java | 3 +-
.../org/apache/solr/search/SolrIndexSearcher.java | 45 +-
.../solr/search/facet/FacetFieldProcessor.java | 12 +-
.../org/apache/solr/search/facet/FacetRange.java | 279 +++++++-
.../org/apache/solr/search/facet/FacetRequest.java | 109 ++-
.../solr/search/stats/ExactSharedStatsCache.java | 24 +-
.../apache/solr/search/stats/ExactStatsCache.java | 184 ++---
.../apache/solr/search/stats/LRUStatsCache.java | 166 ++++-
.../apache/solr/search/stats/LocalStatsCache.java | 31 +-
.../apache/solr/search/stats/LocalStatsSource.java | 6 +-
.../org/apache/solr/search/stats/StatsCache.java | 196 +++++-
.../org/apache/solr/search/stats/StatsUtil.java | 239 +++++--
.../org/apache/solr/search/stats/TermStats.java | 4 +-
.../apache/solr/security/AuthenticationPlugin.java | 17 +-
.../solr/security/PermissionNameProvider.java | 5 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 12 +-
.../apache/solr/servlet/SolrRequestParsers.java | 4 +-
.../processor/AtomicUpdateDocumentMerger.java | 6 +-
.../processor/UpdateRequestProcessorChain.java | 16 +-
.../org/apache/solr/util/ConcurrentLFUCache.java | 119 ++--
.../org/apache/solr/util/ConcurrentLRUCache.java | 63 +-
.../src/java/org/apache/solr/util/CryptoKeys.java | 29 +-
.../src/java/org/apache/solr/util/JmxUtil.java | 9 +-
.../src/test-files/cryptokeys/priv_key2048.pem | 27 -
.../core/src/test-files/cryptokeys/pub_key2048.der | Bin 294 -> 0 bytes
solr/core/src/test-files/runtimecode/cache.jar.bin | Bin 820 -> 0 bytes
.../src/test-files/runtimecode/cache_v2.jar.bin | Bin 818 -> 0 bytes
solr/core/src/test-files/runtimecode/sig.txt | 10 +-
.../solr/collection1/conf/schema-tiny.xml | 2 +
.../test-files/solr/collection1/conf/schema.xml | 30 +
.../configsets/cloud-dynamic/conf/solrconfig.xml | 2 +
.../test/org/apache/solr/SolrTestCaseJ4Test.java | 22 +
.../apache/solr/cloud/TestBaseStatsCacheCloud.java | 221 ++++++
.../apache/solr/cloud/TestClusterProperties.java | 6 +-
.../test/org/apache/solr/cloud/TestCryptoKeys.java | 2 +-
.../cloud/TestExactSharedStatsCacheCloud.java} | 25 +-
.../solr/cloud/TestExactStatsCacheCloud.java} | 27 +-
.../apache/solr/cloud/TestLRUStatsCacheCloud.java} | 25 +-
.../solr/cloud/TestLocalStatsCacheCloud.java | 46 ++
.../AutoAddReplicasIntegrationTest.java | 332 +++++++--
.../autoscaling/NodeMarkersRegistrationTest.java | 23 +-
.../autoscaling/sim/TestSimTriggerIntegration.java | 133 ++--
.../solr/core/BlobRepositoryMockingTest.java | 22 +-
.../org/apache/solr/core/ResourceLoaderTest.java | 19 +
.../org/apache/solr/core/TestDynamicLoading.java | 10 +-
.../apache/solr/core/TestDynamicLoadingUrl.java | 8 +-
.../apache/solr/core/TestSolrConfigHandler.java | 6 +-
.../solr/filestore/TestDistribPackageStore.java | 250 +++++++
.../solr/handler/TestContainerReqHandler.java | 782 ---------------------
.../solr/handler/admin/MetricsHandlerTest.java | 22 +-
.../solr/handler/admin/TestApiFramework.java | 136 +++-
.../solr/handler/component/DebugComponentTest.java | 4 +-
.../apache/solr/rest/schema/TestBulkSchemaAPI.java | 25 +-
.../org/apache/solr/search/TestCaffeineCache.java | 285 ++++++++
.../org/apache/solr/search/TestFastLRUCache.java | 108 ++-
.../test/org/apache/solr/search/TestLFUCache.java | 6 +-
.../solr/search/facet/RangeFacetCloudTest.java | 164 ++++-
.../solr/search/facet/TestJsonFacetRefinement.java | 36 +-
.../apache/solr/search/facet/TestJsonFacets.java | 285 +++++++-
.../apache/solr/search/json/TestJsonRequest.java | 12 +-
.../solr/search/stats/TestDefaultStatsCache.java | 1 +
.../solr/security/BasicAuthIntegrationTest.java | 4 +-
.../solr/store/blockcache/BlockCacheTest.java | 85 ++-
.../AbstractAtomicUpdatesMultivalueTestBase.java | 428 +++++++++++
.../solr/update/processor/AtomicUpdatesTest.java | 108 ++-
.../JavaBinAtomicUpdateMultivalueTest.java} | 19 +-
.../apache/solr/update/processor/RuntimeUrp.java | 2 +-
.../processor/XMLAtomicUpdateMultivalueTest.java} | 19 +-
.../test/org/apache/solr/util/TestExportTool.java | 5 +-
solr/licenses/caffeine-2.4.0.jar.sha1 | 1 -
solr/licenses/caffeine-2.8.0.jar.sha1 | 1 +
solr/licenses/commons-beanutils-1.9.3.jar.sha1 | 1 -
solr/licenses/commons-beanutils-LICENSE-ASL.txt | 202 ------
solr/licenses/commons-beanutils-NOTICE.txt | 5 -
solr/server/etc/jetty-ssl.xml | 1 +
.../adding-custom-plugins-in-solrcloud-mode.adoc | 16 +-
solr/solr-ref-guide/src/enabling-ssl.adoc | 6 +-
solr/solr-ref-guide/src/json-facet-api.adoc | 90 +++
solr/solr-ref-guide/src/ping.adoc | 11 +-
.../src/query-settings-in-solrconfig.adoc | 11 +-
.../src/rule-based-authorization-plugin.adoc | 243 ++++---
solr/solr-ref-guide/src/shard-management.adoc | 29 +
.../src/solr-system-requirements.adoc | 2 +-
.../src/solrcloud-autoscaling-triggers.adoc | 44 ++
.../src/taking-solr-to-production.adoc | 23 +-
.../org/apache/solr/client/solrj/SolrClient.java | 16 +
.../solr/client/solrj/impl/HttpSolrClient.java | 2 +-
.../java/org/apache/solr/client/solrj/io/Lang.java | 4 +-
.../client/solrj/io/eval/CorrelationEvaluator.java | 25 +
.../solrj/io/eval/CosineDistanceEvaluator.java | 60 ++
.../solrj/io/eval/CosineSimilarityEvaluator.java | 6 +-
.../client/solrj/io/eval/CovarianceEvaluator.java | 6 +-
.../client/solrj/io/eval/DerivativeEvaluator.java | 14 +-
.../client/solrj/io/eval/DistanceEvaluator.java | 6 +-
.../client/solrj/io/eval/FuzzyKmeansEvaluator.java | 6 +
.../client/solrj/io/eval/IntegrateEvaluator.java | 52 +-
.../client/solrj/io/eval/NormalizeEvaluator.java | 5 +-
.../solrj/io/eval/NormalizeSumEvaluator.java | 5 +-
.../client/solrj/io/eval/TopFeaturesEvaluator.java | 22 +-
...NormalizeEvaluator.java => TruncEvaluator.java} | 40 +-
.../solr/client/solrj/io/eval/UnitEvaluator.java | 2 +-
.../solr/client/solrj/io/stream/ZplotStream.java | 97 ++-
.../client/solrj/request/CollectionApiMapping.java | 17 -
.../solr/client/solrj/request/V2Request.java | 39 +-
.../client/solrj/request/json/TermsFacetMap.java | 7 +-
.../solrj/response/json/NestableJsonFacet.java | 25 +-
.../solr/common/cloud/ClusterProperties.java | 14 +-
.../apache/solr/common/cloud/ZkStateReader.java | 90 +--
.../apache/solr/common/params/CommonParams.java | 3 +-
.../org/apache/solr/common/params/ShardParams.java | 5 +-
.../apache/solr/common/util/CommandOperation.java | 9 +-
.../org/apache/solr/common/util/ExecutorUtil.java | 1 -
.../java/org/apache/solr/common/util/PathTrie.java | 44 +-
.../java/org/apache/solr/common/util/StrUtils.java | 208 +++---
.../java/org/apache/solr/common/util/Utils.java | 365 ++++++----
.../apache/solr/common/util/ValidatingJsonMap.java | 3 +-
.../src/resources/apispec/cluster.Commands.json | 41 --
.../cluster.Commands.runtimelib.properties.json | 23 -
...nfig.Commands.addRequestHandler.properties.json | 2 +-
.../apispec/core.config.Commands.generic.json | 2 +-
solr/solrj/src/resources/apispec/core.config.json | 3 +-
.../solrj/src/resources/apispec/node.blob.GET.json | 11 -
solr/solrj/src/resources/apispec/node.ext.json | 13 -
.../ref_guide_examples/JsonRequestApiTest.java | 26 +-
.../solrj/embedded/MergeIndexesEmbeddedTest.java | 2 +-
.../client/solrj/embedded/TestSolrProperties.java | 6 +-
.../client/solrj/impl/CloudSolrClientTest.java | 13 +
.../org/apache/solr/client/solrj/io/TestLang.java | 4 +-
.../client/solrj/io/stream/MathExpressionTest.java | 289 ++++++--
.../solr/client/solrj/request/SchemaTest.java | 8 +-
.../solr/client/solrj/request/TestCoreAdmin.java | 2 +-
...irectJsonQueryRequestFacetingEmbeddedTest.java} | 208 +++---
...ectJsonQueryRequestFacetingIntegrationTest.java | 4 +-
.../JsonQueryRequestFacetingIntegrationTest.java | 4 +-
.../solrj/request/json/TermsFacetMapTest.java | 15 +-
.../solrj/response/NestableJsonFacetTest.java | 85 +++
.../org/apache/solr/common/util/TestPathTrie.java | 13 +
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 48 +-
.../solr/cloud/AbstractFullDistribZkTestBase.java | 4 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
.../org/apache/solr/cloud/SolrCloudTestCase.java | 25 +-
.../org/apache/solr/util/TestSSLTestConfig.java | 17 +
255 files changed, 9863 insertions(+), 5480 deletions(-)