You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/07 07:49:59 UTC
[50/50] [abbrv] lucene-solr:jira/http2: merge with master
merge with master
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5d1d9201
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5d1d9201
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5d1d9201
Branch: refs/heads/jira/http2
Commit: 5d1d9201d6bbfc545814317f534188c5cdd98f38
Parents: a1f140f 0dc66c2
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Sep 7 14:48:49 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Sep 7 14:48:49 2018 +0700
----------------------------------------------------------------------
dev-tools/scripts/buildAndPushRelease.py | 54 +-
lucene/CHANGES.txt | 53 +
lucene/MIGRATE.txt | 20 +-
.../apache/lucene/collation/package-info.java | 21 +-
lucene/analysis/icu/src/java/overview.html | 21 +-
.../lucene/analysis/ko/dict/UserDictionary.java | 6 +-
.../codecs/simpletext/SimpleTextBKDWriter.java | 18 +-
lucene/common-build.xml | 3 +-
.../codecs/blocktree/BlockTreeTermsReader.java | 10 -
.../lucene/codecs/blocktree/FieldReader.java | 3 +-
.../codecs/blocktree/IntersectTermsEnum.java | 220 +--
.../blocktree/IntersectTermsEnumFrame.java | 15 -
.../codecs/blocktree/SegmentTermsEnum.java | 5 +-
.../apache/lucene/codecs/blocktree/Stats.java | 2 -
.../java/org/apache/lucene/document/Field.java | 30 +-
.../document/LatLonPointDistanceComparator.java | 7 +-
.../document/LatLonPointDistanceQuery.java | 42 +-
.../document/LatLonPointInPolygonQuery.java | 10 +-
.../document/LongDistanceFeatureQuery.java | 438 ++++++
.../org/apache/lucene/document/LongPoint.java | 26 +
.../apache/lucene/document/RangeFieldQuery.java | 38 +-
.../org/apache/lucene/document/StoredField.java | 23 +-
.../org/apache/lucene/index/CheckIndex.java | 92 +-
.../apache/lucene/index/DocumentsWriter.java | 9 +
.../index/DocumentsWriterFlushControl.java | 8 +-
.../lucene/index/FilterDirectoryReader.java | 14 +-
.../lucene/index/FrozenBufferedUpdates.java | 23 +-
.../org/apache/lucene/index/IndexWriter.java | 8 +
.../org/apache/lucene/index/PointValues.java | 6 +-
.../SoftDeletesDirectoryReaderWrapper.java | 14 +
.../index/SoftDeletesRetentionMergePolicy.java | 2 +-
.../src/java/org/apache/lucene/index/Terms.java | 8 +-
.../org/apache/lucene/index/package-info.java | 278 ++--
.../search/BlockMaxConjunctionScorer.java | 8 +-
.../org/apache/lucene/search/BooleanScorer.java | 4 +-
.../org/apache/lucene/search/BooleanWeight.java | 4 +-
.../apache/lucene/search/CachingCollector.java | 4 +-
.../apache/lucene/search/ConjunctionScorer.java | 8 +-
.../lucene/search/ConstantScoreQuery.java | 14 +-
.../lucene/search/DisjunctionMaxQuery.java | 2 +-
.../apache/lucene/search/DisjunctionScorer.java | 6 +-
.../lucene/search/DocValuesRewriteMethod.java | 2 +-
.../lucene/search/DoubleValuesSource.java | 6 +-
.../org/apache/lucene/search/FakeScorer.java | 2 +-
.../apache/lucene/search/FieldComparator.java | 10 +-
.../lucene/search/FilterLeafCollector.java | 2 +-
.../lucene/search/FilterMatchesIterator.java | 74 +
.../apache/lucene/search/FilterScorable.java | 58 +
.../org/apache/lucene/search/LRUQueryCache.java | 4 +-
.../org/apache/lucene/search/LeafCollector.java | 2 +-
.../lucene/search/LeafFieldComparator.java | 2 +-
.../apache/lucene/search/LongValuesSource.java | 2 +-
.../java/org/apache/lucene/search/Matches.java | 96 --
.../org/apache/lucene/search/MatchesUtils.java | 132 ++
.../lucene/search/MaxScoreSumPropagator.java | 2 +-
.../lucene/search/MinShouldMatchSumScorer.java | 6 +-
.../apache/lucene/search/MultiCollector.java | 9 +-
.../lucene/search/MultiCollectorManager.java | 6 +-
.../lucene/search/MultiLeafFieldComparator.java | 2 +-
.../MultiTermQueryConstantScoreWrapper.java | 2 +-
.../org/apache/lucene/search/PhraseWeight.java | 2 +-
.../apache/lucene/search/PointInSetQuery.java | 6 +-
.../apache/lucene/search/PointRangeQuery.java | 30 +-
.../search/PositiveScoresOnlyCollector.java | 4 +-
.../org/apache/lucene/search/ReqExclScorer.java | 6 +-
.../apache/lucene/search/ReqOptSumScorer.java | 10 +-
.../java/org/apache/lucene/search/Scorable.java | 86 ++
.../search/ScoreCachingWrappingScorer.java | 24 +-
.../java/org/apache/lucene/search/Scorer.java | 70 +-
.../apache/lucene/search/SimpleCollector.java | 2 +-
.../lucene/search/SimpleFieldComparator.java | 2 +-
.../org/apache/lucene/search/SynonymQuery.java | 2 +-
.../apache/lucene/search/TermInSetQuery.java | 2 +-
.../org/apache/lucene/search/TermQuery.java | 4 +-
.../apache/lucene/search/TermRangeQuery.java | 4 +
.../apache/lucene/search/TopFieldCollector.java | 45 +-
.../lucene/search/TopScoreDocCollector.java | 8 +-
.../org/apache/lucene/search/WANDScorer.java | 8 +-
.../java/org/apache/lucene/search/Weight.java | 4 +-
.../org/apache/lucene/search/package-info.java | 127 +-
.../search/similarities/package-info.java | 52 +-
.../apache/lucene/search/spans/SpanWeight.java | 3 +-
.../lucene/store/ByteArrayIndexInput.java | 107 +-
.../lucene/store/ByteBuffersDataInput.java | 323 +++++
.../lucene/store/ByteBuffersDataOutput.java | 541 +++++++
.../lucene/store/ByteBuffersDirectory.java | 274 ++++
.../lucene/store/ByteBuffersIndexInput.java | 200 +++
.../lucene/store/ByteBuffersIndexOutput.java | 171 +++
.../org/apache/lucene/store/RAMDirectory.java | 5 +
.../java/org/apache/lucene/store/RAMFile.java | 8 +-
.../org/apache/lucene/store/RAMInputStream.java | 12 +-
.../apache/lucene/store/RAMOutputStream.java | 4 +
.../apache/lucene/util/RamUsageEstimator.java | 51 +-
.../org/apache/lucene/util/StringHelper.java | 11 -
.../org/apache/lucene/util/bkd/BKDReader.java | 12 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 22 +-
.../util/bkd/MutablePointsReaderUtils.java | 8 +-
.../org/apache/lucene/util/packed/Direct16.java | 2 +-
.../org/apache/lucene/util/packed/Direct32.java | 2 +-
.../org/apache/lucene/util/packed/Direct64.java | 2 +-
.../org/apache/lucene/util/packed/Direct8.java | 2 +-
.../lucene/util/packed/Packed16ThreeBlocks.java | 2 +-
.../lucene/util/packed/Packed64SingleBlock.java | 2 +-
.../lucene/util/packed/Packed8ThreeBlocks.java | 2 +-
lucene/core/src/java/overview.html | 25 +-
.../src/test/org/apache/lucene/TestDemo.java | 69 +-
.../lucene60/TestLucene60PointsFormat.java | 10 +-
.../document/TestLongDistanceFeatureQuery.java | 350 +++++
.../index/TestFlushByRamOrCountsPolicy.java | 14 +-
.../apache/lucene/index/TestIndexSorting.java | 60 +
.../org/apache/lucene/index/TestOmitTf.java | 18 +-
.../TestSoftDeletesDirectoryReaderWrapper.java | 51 +
.../TestSoftDeletesRetentionMergePolicy.java | 27 +
.../apache/lucene/search/JustCompileSearch.java | 2 +-
.../lucene/search/MultiCollectorTest.java | 8 +-
.../org/apache/lucene/search/TestBooleanOr.java | 2 +-
.../apache/lucene/search/TestBooleanQuery.java | 4 +-
.../search/TestBooleanQueryVisitSubscorers.java | 19 +-
.../apache/lucene/search/TestConjunctions.java | 8 +-
.../lucene/search/TestConstantScoreQuery.java | 26 +-
.../lucene/search/TestDoubleValuesSource.java | 6 +-
.../lucene/search/TestElevationComparator.java | 2 +-
.../lucene/search/TestMultiCollector.java | 6 +-
.../apache/lucene/search/TestPointQueries.java | 10 +-
.../lucene/search/TestReqExclBulkScorer.java | 4 +-
.../search/TestScoreCachingWrappingScorer.java | 4 +-
.../apache/lucene/search/TestSimilarity.java | 16 +-
.../lucene/search/TestSloppyPhraseQuery.java | 14 +-
.../lucene/search/TestSubScorerFreqs.java | 22 +-
.../apache/lucene/search/TestTermScorer.java | 4 +-
.../search/TestTimeLimitingCollector.java | 2 +-
.../lucene/search/TestTopDocsCollector.java | 2 +-
.../lucene/search/TestTopFieldCollector.java | 19 +-
.../lucene/store/BaseDataOutputTestCase.java | 181 +++
.../lucene/store/TestByteBuffersDataInput.java | 206 +++
.../lucene/store/TestByteBuffersDataOutput.java | 157 +++
.../lucene/store/TestByteBuffersDirectory.java | 86 ++
.../org/apache/lucene/util/bkd/TestBKD.java | 24 +-
.../util/bkd/TestMutablePointsReaderUtils.java | 10 +-
.../lucene/facet/DrillSidewaysScorer.java | 4 +-
.../apache/lucene/facet/FacetsCollector.java | 6 +-
.../directory/DirectoryTaxonomyReader.java | 2 +-
.../taxonomy/directory/TaxonomyIndexArrays.java | 2 +-
.../facet/AssertingSubDocsAtOnceCollector.java | 11 +-
.../search/grouping/AllGroupHeadsCollector.java | 24 +-
.../search/grouping/AllGroupsCollector.java | 4 +-
.../search/grouping/BlockGroupingCollector.java | 5 +-
.../grouping/FirstPassGroupingCollector.java | 4 +-
.../search/grouping/GroupFacetCollector.java | 4 +-
.../lucene/search/grouping/GroupReducer.java | 4 +-
.../grouping/SecondPassGroupingCollector.java | 4 +-
.../search/grouping/TopGroupsCollector.java | 6 +-
.../uhighlight/AnalysisOffsetStrategy.java | 16 +-
.../search/uhighlight/FieldHighlighter.java | 5 +-
.../search/uhighlight/FieldOffsetStrategy.java | 121 +-
.../uhighlight/MemoryIndexOffsetStrategy.java | 51 +-
.../search/uhighlight/NoOpOffsetStrategy.java | 8 +-
.../lucene/search/uhighlight/OffsetsEnum.java | 216 ++-
.../OverlaySingleDocTermsLeafReader.java | 113 ++
.../lucene/search/uhighlight/Passage.java | 11 +-
.../uhighlight/PostingsOffsetStrategy.java | 24 +-
.../PostingsWithTermVectorsOffsetStrategy.java | 26 +-
.../TermVectorFilteredLeafReader.java | 11 +-
.../uhighlight/TermVectorOffsetStrategy.java | 23 +-
.../uhighlight/TokenStreamOffsetStrategy.java | 20 +-
.../lucene/search/uhighlight/UHComponents.java | 80 ++
.../search/uhighlight/UnifiedHighlighter.java | 73 +-
.../search/highlight/HighlighterPhraseTest.java | 5 +-
.../uhighlight/TestUnifiedHighlighter.java | 154 +-
.../uhighlight/TestUnifiedHighlighterMTQ.java | 2 +-
.../TestUnifiedHighlighterRanking.java | 20 +
.../TestUnifiedHighlighterStrictPhrases.java | 146 +-
.../TestUnifiedHighlighterTermVec.java | 34 +-
.../TestUnifiedHighlighterExtensibility.java | 36 +-
lucene/ivy-versions.properties | 2 +-
.../search/join/GlobalOrdinalsCollector.java | 6 +-
.../join/GlobalOrdinalsWithScoreCollector.java | 14 +-
.../org/apache/lucene/search/join/JoinUtil.java | 10 +-
.../search/join/TermsWithScoreCollector.java | 6 +-
.../search/join/ToChildBlockJoinQuery.java | 4 +-
.../search/join/ToParentBlockJoinQuery.java | 7 +-
.../apache/lucene/search/join/TestJoinUtil.java | 10 +-
.../randomizedtesting-runner-2.6.0.jar.sha1 | 1 -
.../randomizedtesting-runner-2.6.4.jar.sha1 | 1 +
.../apache/lucene/index/memory/MemoryIndex.java | 12 +-
.../lucene/document/InetAddressPoint.java | 4 +-
.../lucene/document/InetAddressRange.java | 4 +-
.../search/DiversifiedTopDocsCollector.java | 4 +-
.../lucene/search/DocValuesStatsCollector.java | 4 +-
.../search/TestInetAddressRangeQueries.java | 22 +-
.../surround/query/BooleanQueryTst.java | 10 +-
.../org/apache/lucene/search/CoveringQuery.java | 2 +-
.../apache/lucene/search/CoveringScorer.java | 6 +-
.../intervals/ConjunctionIntervalsSource.java | 113 +-
.../intervals/DifferenceIntervalsSource.java | 23 +-
.../intervals/DisjunctionIntervalsSource.java | 14 +
.../lucene/search/intervals/IntervalFilter.java | 2 +-
.../search/intervals/IntervalFunction.java | 4 +-
.../search/intervals/IntervalIterator.java | 5 +
.../search/intervals/IntervalMatches.java | 156 +++
.../lucene/search/intervals/IntervalQuery.java | 20 +
.../lucene/search/intervals/Intervals.java | 4 +-
.../search/intervals/IntervalsSource.java | 13 +
.../intervals/LowpassIntervalsSource.java | 16 +
.../MinimizingConjunctionIntervalsSource.java | 236 ++++
.../search/intervals/TermIntervalsSource.java | 66 +
.../lucene/document/TestHalfFloatPoint.java | 4 +-
.../document/TestLatLonPolygonShapeQueries.java | 2 +
.../lucene/search/intervals/TestIntervals.java | 232 ++-
.../spatial3d/Geo3DPointDistanceComparator.java | 4 +-
.../Geo3DPointOutsideDistanceComparator.java | 4 +-
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 6 +-
.../document/TopSuggestDocsCollector.java | 2 +-
.../lucene/index/AssertingLeafReader.java | 10 +-
.../lucene/index/BasePointsFormatTestCase.java | 28 +-
.../apache/lucene/index/PointsStackTracker.java | 6 +-
.../lucene/search/AssertingBulkScorer.java | 4 +-
.../lucene/search/AssertingCollector.java | 11 +-
.../lucene/search/AssertingIndexSearcher.java | 2 +-
.../lucene/search/AssertingLeafCollector.java | 13 +-
.../apache/lucene/search/AssertingScorable.java | 64 +
.../apache/lucene/search/AssertingScorer.java | 6 +-
.../lucene/search/BulkScorerWrapperScorer.java | 4 +-
.../org/apache/lucene/search/CheckHits.java | 6 +-
.../org/apache/lucene/search/QueryUtils.java | 14 +-
.../org/apache/lucene/util/LuceneTestCase.java | 2 +
solr/CHANGES.txt | 93 +-
.../stream/AnalyticsShardRequestManager.java | 2 +-
.../solr/collection1/conf/solrconfig.xml | 19 +
.../org/apache/solr/ltr/LTRScoringQuery.java | 14 +-
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 3 +-
.../solr/ltr/TestLTRReRankingPipeline.java | 6 +-
.../cloud/OverseerConfigSetMessageHandler.java | 30 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 8 +-
.../solr/cloud/api/collections/Assign.java | 30 +-
.../api/collections/CreateCollectionCmd.java | 14 +-
.../cloud/api/collections/DeleteNodeCmd.java | 4 -
.../api/collections/MaintainRoutedAliasCmd.java | 7 +-
.../cloud/api/collections/TimeRoutedAlias.java | 19 +
.../autoscaling/AutoAddReplicasPlanAction.java | 2 +-
.../cloud/autoscaling/ComputePlanAction.java | 82 +-
.../cloud/autoscaling/NodeAddedTrigger.java | 30 +-
.../solr/cloud/autoscaling/NodeLostTrigger.java | 31 +-
.../solr/cloud/autoscaling/TriggerEvent.java | 81 +-
.../cloud/autoscaling/TriggerEventQueue.java | 8 +-
.../src/java/org/apache/solr/core/SolrCore.java | 4 +-
.../org/apache/solr/core/SolrXmlConfig.java | 9 +-
.../solr/handler/HaversineMetersEvaluator.java | 59 +
.../org/apache/solr/handler/IndexFetcher.java | 2 +-
.../solr/handler/SolrDefaultStreamFactory.java | 1 +
.../org/apache/solr/handler/StreamHandler.java | 4 +
.../solr/handler/admin/ConfigSetsHandler.java | 20 +-
.../handler/admin/MetricsHistoryHandler.java | 8 +-
.../solr/handler/component/ExpandComponent.java | 6 +-
.../component/HttpShardHandlerFactory.java | 8 +-
.../PhrasesIdentificationComponent.java | 1129 +++++++++++++++
.../solr/handler/component/QueryComponent.java | 2 +-
.../response/transform/ChildDocTransformer.java | 253 ++++
.../transform/ChildDocTransformerFactory.java | 211 ++-
.../solr/response/transform/DocTransformer.java | 23 +
.../transform/RawValueTransformerFactory.java | 20 +-
.../apache/solr/schema/ManagedIndexSchema.java | 4 +-
.../solr/search/CollapsingQParserPlugin.java | 20 +-
.../apache/solr/search/DelegatingCollector.java | 8 +-
.../org/apache/solr/search/DocSetCollector.java | 4 +-
.../apache/solr/search/ExportQParserPlugin.java | 4 +-
.../solr/search/GraphTermsQParserPlugin.java | 6 +-
.../apache/solr/search/HashQParserPlugin.java | 7 +-
.../apache/solr/search/MaxScoreCollector.java | 6 +-
.../apache/solr/search/SolrIndexSearcher.java | 8 +-
.../search/join/ScoreJoinQParserPlugin.java | 2 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 35 +-
.../java/org/apache/solr/update/PeerSync.java | 2 +-
.../apache/solr/update/PeerSyncWithLeader.java | 6 +-
.../apache/solr/update/UpdateShardHandler.java | 4 +-
.../solr/update/UpdateShardHandlerConfig.java | 10 +-
.../AddSchemaFieldsUpdateProcessorFactory.java | 36 +-
.../processor/AtomicUpdateDocumentMerger.java | 4 +-
.../processor/DistributedUpdateProcessor.java | 6 +-
.../DistributedUpdateProcessorFactory.java | 2 +-
.../DocExpirationUpdateProcessorFactory.java | 9 +-
.../ParseDateFieldUpdateProcessorFactory.java | 16 +-
.../TimeRoutedAliasUpdateProcessor.java | 362 +++--
solr/core/src/test-files/log4j2.xml | 14 +-
.../solr/collection1/conf/schema-nest.xml | 65 +
.../conf/schema-phrases-identification.xml | 97 ++
.../solr/collection1/conf/schema15.xml | 3 -
...dd-schema-fields-update-processor-chains.xml | 8 +-
...lrconfig-parsing-update-processor-chains.xml | 19 +-
.../conf/solrconfig-phrases-identification.xml | 53 +
.../collection1/conf/solrconfig-schemaless.xml | 8 +-
.../configsets/_default/conf/solrconfig.xml | 8 +-
.../cloud/AssignBackwardCompatibilityTest.java | 1 +
.../org/apache/solr/cloud/DeleteShardTest.java | 2 +-
.../cloud/LeaderElectionIntegrationTest.java | 3 +-
.../solr/cloud/LeaderVoteWaitTimeoutTest.java | 2 +
.../apache/solr/cloud/MoveReplicaHDFSTest.java | 3 +-
.../apache/solr/cloud/OverseerRolesTest.java | 1 +
.../apache/solr/cloud/TestCloudConsistency.java | 1 +
...TestCloudPhrasesIdentificationComponent.java | 200 +++
.../apache/solr/cloud/TestCloudRecovery.java | 2 +-
.../solr/cloud/TestClusterProperties.java | 25 +-
.../apache/solr/cloud/TestConfigSetsAPI.java | 14 +-
.../TestStressCloudBlindAtomicUpdates.java | 2 +-
.../apache/solr/cloud/TestWithCollection.java | 6 +-
.../CollectionsAPIAsyncDistributedZkTest.java | 3 +-
.../AutoAddReplicasPlanActionTest.java | 2 +-
.../solr/cloud/autoscaling/CapturedEvent.java | 2 +
.../autoscaling/ComputePlanActionTest.java | 187 ++-
.../autoscaling/ExecutePlanActionTest.java | 2 +-
.../cloud/autoscaling/IndexSizeTriggerTest.java | 24 +-
.../MetricTriggerIntegrationTest.java | 11 +-
.../autoscaling/SearchRateTriggerTest.java | 3 +-
.../solr/cloud/autoscaling/TestPolicyCloud.java | 20 +-
.../autoscaling/TriggerEventQueueTest.java | 98 ++
.../sim/TestClusterStateProvider.java | 225 ---
.../autoscaling/sim/TestComputePlanAction.java | 358 -----
.../sim/TestDistribStateManager.java | 342 -----
.../autoscaling/sim/TestExecutePlanAction.java | 209 ---
.../sim/TestGenericDistributedQueue.java | 40 -
.../cloud/autoscaling/sim/TestLargeCluster.java | 727 ----------
.../autoscaling/sim/TestNodeAddedTrigger.java | 327 -----
.../autoscaling/sim/TestNodeLostTrigger.java | 346 -----
.../cloud/autoscaling/sim/TestPolicyCloud.java | 366 -----
.../sim/TestSimClusterStateProvider.java | 225 +++
.../sim/TestSimComputePlanAction.java | 358 +++++
.../sim/TestSimDistribStateManager.java | 342 +++++
.../sim/TestSimExecutePlanAction.java | 209 +++
.../sim/TestSimGenericDistributedQueue.java | 38 +
.../autoscaling/sim/TestSimLargeCluster.java | 728 ++++++++++
.../sim/TestSimNodeAddedTrigger.java | 327 +++++
.../autoscaling/sim/TestSimNodeLostTrigger.java | 346 +++++
.../autoscaling/sim/TestSimPolicyCloud.java | 368 +++++
.../sim/TestSimTriggerIntegration.java | 1322 ++++++++++++++++++
.../autoscaling/sim/TestTriggerIntegration.java | 1322 ------------------
.../solr/cloud/cdcr/CdcrBootstrapTest.java | 4 +-
.../apache/solr/cloud/hdfs/StressHdfsTest.java | 1 +
.../solr/cloud/rule/ImplicitSnitchTest.java | 2 +
.../apache/solr/handler/RequestLoggingTest.java | 23 +-
.../admin/SegmentsInfoRequestHandlerTest.java | 59 +-
.../admin/ZookeeperStatusHandlerTest.java | 1 +
.../component/DistributedMLTComponentTest.java | 3 +-
.../PhrasesIdentificationComponentTest.java | 796 +++++++++++
.../org/apache/solr/logging/TestLogWatcher.java | 91 +-
.../solr/metrics/SolrMetricReporterTest.java | 4 +-
.../reporters/solr/SolrCloudReportersTest.java | 2 +-
.../metrics/rrd/SolrRrdBackendFactoryTest.java | 1 +
.../transform/TestChildDocTransformer.java | 58 +-
.../TestChildDocTransformerHierarchy.java | 387 +++++
.../solr/rest/TestManagedResourceStorage.java | 3 +-
.../solr/schema/SchemaApiFailureTest.java | 2 +-
.../apache/solr/search/TestRankQueryPlugin.java | 9 +-
.../apache/solr/search/TestStressRecovery.java | 3 +
.../solr/search/stats/TestDistribIDF.java | 3 +-
.../hadoop/TestDelegationWithHadoopAuth.java | 3 +-
.../solr/servlet/HttpSolrCallGetCoreTest.java | 3 +-
.../TestDocTermOrdsUninvertLimit.java | 2 +-
.../solr/update/TestInPlaceUpdatesDistrib.java | 3 +-
.../solr/update/TestNestedUpdateProcessor.java | 14 +-
...dSchemaFieldsUpdateProcessorFactoryTest.java | 15 +
.../ParsingFieldUpdateProcessorsTest.java | 57 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 237 +++-
.../TrackingUpdateProcessorFactory.java | 136 +-
.../apache/solr/util/DateMathParserTest.java | 4 +-
solr/example/files/conf/solrconfig.xml | 8 +-
solr/licenses/junit4-ant-2.6.0.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.6.4.jar.sha1 | 1 +
.../randomizedtesting-runner-2.6.0.jar.sha1 | 1 -
.../randomizedtesting-runner-2.6.4.jar.sha1 | 1 +
solr/server/resources/log4j2-console.xml | 8 +-
solr/server/resources/log4j2.xml | 30 +-
.../configsets/_default/conf/solrconfig.xml | 8 +-
.../src/basic-authentication-plugin.adoc | 4 +-
solr/solr-ref-guide/src/cloud-screens.adoc | 2 +-
solr/solr-ref-guide/src/collections-api.adoc | 24 +-
solr/solr-ref-guide/src/configsets-api.adoc | 2 +-
solr/solr-ref-guide/src/curve-fitting.adoc | 148 +-
.../src/distributed-requests.adoc | 4 +-
solr/solr-ref-guide/src/docvalues.adoc | 10 +-
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 4 +-
solr/solr-ref-guide/src/machine-learning.adoc | 242 +++-
solr/solr-ref-guide/src/math-expressions.adoc | 10 +-
solr/solr-ref-guide/src/schemaless-mode.adoc | 8 +-
solr/solr-ref-guide/src/simulations.adoc | 15 +-
.../src/solrcloud-autoscaling-overview.adoc | 2 +-
...olrcloud-autoscaling-policy-preferences.adoc | 33 +
.../src/solrcloud-autoscaling-triggers.adoc | 382 +++--
.../src/statistical-programming.adoc | 741 ----------
solr/solr-ref-guide/src/statistics.adoc | 38 +
.../src/stream-decorator-reference.adoc | 23 +-
.../src/stream-source-reference.adoc | 32 +-
.../src/streaming-expressions.adoc | 2 +-
.../src/transforming-result-documents.adoc | 60 +-
...store-data-with-the-data-import-handler.adoc | 33 +-
solr/solr-ref-guide/src/variables.adoc | 185 ++-
.../solrj/cloud/autoscaling/Variable.java | 15 +
.../solrj/cloud/autoscaling/VariableBase.java | 14 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 8 +-
.../solr/client/solrj/impl/HttpClientUtil.java | 2 +
.../org/apache/solr/client/solrj/io/Lang.java | 6 +
.../client/solrj/io/eval/GetCacheEvaluator.java | 57 +
.../solrj/io/eval/KnnRegressionEvaluator.java | 3 +
.../solrj/io/eval/ListCacheEvaluator.java | 73 +
.../solrj/io/eval/LocationVectorsEvaluator.java | 105 ++
.../client/solrj/io/eval/PutCacheEvaluator.java | 61 +
.../solrj/io/eval/RemoveCacheEvaluator.java | 57 +
.../solr/client/solrj/io/sql/StatementImpl.java | 2 +-
.../client/solrj/io/stream/CloudSolrStream.java | 10 +-
.../io/stream/FeaturesSelectionStream.java | 2 +-
.../client/solrj/io/stream/StreamContext.java | 10 +
.../client/solrj/io/stream/TextLogitStream.java | 2 +-
.../solrj/io/stream/TimeSeriesStream.java | 2 +
.../client/solrj/io/stream/TopicStream.java | 6 +-
.../client/solrj/io/stream/TupleStream.java | 2 +-
.../solrj/request/CollectionAdminRequest.java | 14 +
.../solrj/request/ConfigSetAdminRequest.java | 5 +-
.../org/apache/solr/common/SolrDocument.java | 4 +-
.../solr/common/cloud/ClusterProperties.java | 23 +-
.../solr/common/cloud/ClusterStateUtil.java | 4 +-
.../solr/common/cloud/CompositeIdRouter.java | 2 +-
.../apache/solr/common/cloud/DocCollection.java | 9 +
.../solr/common/cloud/HashBasedRouter.java | 3 +-
.../java/org/apache/solr/common/util/Utils.java | 18 +-
.../apispec/cluster.configs.Commands.json | 2 +-
.../resources/apispec/collections.Commands.json | 4 +
.../solr/client/solrj/SolrExampleTests.java | 4 +-
.../solrj/embedded/LargeVolumeJettyTest.java | 3 +-
.../client/solrj/impl/CloudSolrClientTest.java | 2 +-
.../apache/solr/client/solrj/io/TestLang.java | 2 +-
.../solrj/io/graph/GraphExpressionTest.java | 2 +-
.../solrj/io/stream/MathExpressionTest.java | 145 +-
.../solrj/io/stream/StreamExpressionTest.java | 18 +-
.../client/solrj/io/stream/StreamingTest.java | 2 +
.../request/TestConfigSetAdminRequest.java | 2 -
.../java/org/apache/solr/util/TestHarness.java | 5 +-
435 files changed, 17326 insertions(+), 7817 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d1d9201/lucene/ivy-versions.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d1d9201/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index 4d1666b,1bb1fdb..3404bc1
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@@ -89,14 -88,15 +89,14 @@@ public class HttpShardHandlerFactory ex
false
);
- protected InstrumentedPoolingHttpClientConnectionManager clientConnectionManager;
- protected CloseableHttpClient defaultClient;
- protected InstrumentedHttpRequestExecutor httpRequestExecutor;
- private LBHttpSolrClient loadbalancer;
+ protected Http2SolrClient defaultClient;
+ protected InstrumentedHttpListenerFactory httpListenerFactory;
+ private LBHttp2SolrClient loadbalancer;
//default values:
- int soTimeout = UpdateShardHandlerConfig.DEFAULT_DISTRIBUPDATESOTIMEOUT;
- int connectionTimeout = UpdateShardHandlerConfig.DEFAULT_DISTRIBUPDATECONNTIMEOUT;
- int maxConnectionsPerHost = 20;
- int maxConnections = 10000;
+ int soTimeout = HttpClientUtil.DEFAULT_SO_TIMEOUT;
+ int connectionTimeout = HttpClientUtil.DEFAULT_CONNECT_TIMEOUT;
+ int maxConnectionsPerHost = HttpClientUtil.DEFAULT_MAXCONNECTIONSPERHOST;
+ int maxConnections = HttpClientUtil.DEFAULT_MAXCONNECTIONS;
int corePoolSize = 0;
int maximumPoolSize = Integer.MAX_VALUE;
int keepAliveTime = 5;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d1d9201/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d1d9201/solr/core/src/java/org/apache/solr/update/PeerSync.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d1d9201/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
index d1a8083,bc013bb..ff3d9d1
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@@ -81,12 -78,15 +81,12 @@@ public class UpdateShardHandler impleme
private final Set<String> metricNames = ConcurrentHashMap.newKeySet();
private MetricRegistry registry;
- private int socketTimeout = UpdateShardHandlerConfig.DEFAULT_DISTRIBUPDATESOTIMEOUT;
- private int connectionTimeout = UpdateShardHandlerConfig.DEFAULT_DISTRIBUPDATECONNTIMEOUT;
+ private int socketTimeout = HttpClientUtil.DEFAULT_SO_TIMEOUT;
+ private int connectionTimeout = HttpClientUtil.DEFAULT_CONNECT_TIMEOUT;
public UpdateShardHandler(UpdateShardHandlerConfig cfg) {
- updateOnlyConnectionManager = new InstrumentedPoolingHttpClientConnectionManager(HttpClientUtil.getSchemaRegisteryProvider().getSchemaRegistry());
defaultConnectionManager = new InstrumentedPoolingHttpClientConnectionManager(HttpClientUtil.getSchemaRegisteryProvider().getSchemaRegistry());
if (cfg != null ) {
- updateOnlyConnectionManager.setMaxTotal(cfg.getMaxUpdateConnections());
- updateOnlyConnectionManager.setDefaultMaxPerRoute(cfg.getMaxUpdateConnectionsPerHost());
defaultConnectionManager.setMaxTotal(cfg.getMaxUpdateConnections());
defaultConnectionManager.setDefaultMaxPerRoute(cfg.getMaxUpdateConnectionsPerHost());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d1d9201/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d1d9201/solr/core/src/java/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d1d9201/solr/core/src/test-files/log4j2.xml
----------------------------------------------------------------------
diff --cc solr/core/src/test-files/log4j2.xml
index 612cfe8,5447843..0240fcb
--- a/solr/core/src/test-files/log4j2.xml
+++ b/solr/core/src/test-files/log4j2.xml
@@@ -27,14 -27,13 +27,14 @@@
</Console>
</Appenders>
<Loggers>
- <Logger name="org.apache.zookeeper" level="WARN"/>
- <Logger name="org.apache.hadoop" level="WARN"/>
- <Logger name="org.apache.directory" level="WARN"/>
- <Logger name="org.apache.solr.hadoop" level="INFO"/>
- <Logger name="org.eclipse.jetty" level="INFO"/>
+ <AsyncLogger name="org.apache.zookeeper" level="WARN"/>
+ <AsyncLogger name="org.apache.hadoop" level="WARN"/>
+ <AsyncLogger name="org.apache.directory" level="WARN"/>
+ <AsyncLogger name="org.apache.solr.hadoop" level="INFO"/>
++ <AsyncLogger name="org.eclipse.jetty" level="INFO"/>
- <Root level="INFO">
+ <AsyncRoot level="INFO">
<AppenderRef ref="STDERR"/>
- </Root>
+ </AsyncRoot>
</Loggers>
</Configuration>