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 2017/10/31 14:02:31 UTC
[49/50] [abbrv] lucene-solr:jira/solr-11285-sim: Merge branch
'master' into jira/solr-11285-sim
Merge branch 'master' into jira/solr-11285-sim
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/75b2a888
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/75b2a888
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/75b2a888
Branch: refs/heads/jira/solr-11285-sim
Commit: 75b2a888de720bc8ef44543d72b936e467ee8ece
Parents: 92e5a6c 487f676
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Oct 31 14:05:59 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Oct 31 14:05:59 2017 +0100
----------------------------------------------------------------------
.gitignore | 1 +
README.md | 8 +
dev-tools/doap/lucene.rdf | 36 +
dev-tools/doap/solr.rdf | 36 +
.../lucene/analysis/common/pom.xml.template | 2 +-
.../maven/lucene/analysis/icu/pom.xml.template | 2 +-
.../lucene/analysis/kuromoji/pom.xml.template | 2 +-
.../lucene/analysis/morfologik/pom.xml.template | 2 +-
.../lucene/analysis/phonetic/pom.xml.template | 2 +-
.../maven/lucene/analysis/pom.xml.template | 2 +-
.../lucene/analysis/smartcn/pom.xml.template | 2 +-
.../lucene/analysis/stempel/pom.xml.template | 2 +-
.../maven/lucene/analysis/uima/pom.xml.template | 2 +-
.../lucene/backward-codecs/pom.xml.template | 15 +-
.../maven/lucene/benchmark/pom.xml.template | 2 +-
.../lucene/classification/pom.xml.template | 2 +-
dev-tools/maven/lucene/codecs/pom.xml.template | 2 +-
.../lucene/codecs/src/java/pom.xml.template | 2 +-
.../lucene/codecs/src/test/pom.xml.template | 2 +-
dev-tools/maven/lucene/core/pom.xml.template | 2 +-
.../maven/lucene/core/src/java/pom.xml.template | 2 +-
.../maven/lucene/core/src/test/pom.xml.template | 2 +-
dev-tools/maven/lucene/demo/pom.xml.template | 2 +-
.../maven/lucene/expressions/pom.xml.template | 2 +-
dev-tools/maven/lucene/facet/pom.xml.template | 2 +-
.../maven/lucene/grouping/pom.xml.template | 2 +-
.../maven/lucene/highlighter/pom.xml.template | 2 +-
dev-tools/maven/lucene/join/pom.xml.template | 2 +-
dev-tools/maven/lucene/memory/pom.xml.template | 2 +-
dev-tools/maven/lucene/misc/pom.xml.template | 2 +-
dev-tools/maven/lucene/pom.xml.template | 2 +-
dev-tools/maven/lucene/queries/pom.xml.template | 2 +-
.../maven/lucene/queryparser/pom.xml.template | 2 +-
.../maven/lucene/replicator/pom.xml.template | 2 +-
dev-tools/maven/lucene/sandbox/pom.xml.template | 2 +-
.../lucene/spatial-extras/pom.xml.template | 11 +-
dev-tools/maven/lucene/spatial/pom.xml.template | 2 +-
.../maven/lucene/spatial3d/pom.xml.template | 15 +-
dev-tools/maven/lucene/suggest/pom.xml.template | 2 +-
.../lucene/test-framework/pom.xml.template | 2 +-
dev-tools/maven/pom.xml.template | 9 +-
.../contrib/analysis-extras/pom.xml.template | 2 +-
.../solr/contrib/analytics/pom.xml.template | 2 +-
.../solr/contrib/clustering/pom.xml.template | 2 +-
.../dataimporthandler-extras/pom.xml.template | 2 +-
.../contrib/dataimporthandler/pom.xml.template | 2 +-
.../solr/contrib/extraction/pom.xml.template | 2 +-
.../maven/solr/contrib/langid/pom.xml.template | 2 +-
.../maven/solr/contrib/ltr/pom.xml.template | 2 +-
dev-tools/maven/solr/contrib/pom.xml.template | 2 +-
.../maven/solr/contrib/uima/pom.xml.template | 2 +-
.../solr/contrib/velocity/pom.xml.template | 2 +-
dev-tools/maven/solr/core/pom.xml.template | 2 +-
.../maven/solr/core/src/java/pom.xml.template | 2 +-
.../maven/solr/core/src/test/pom.xml.template | 9 +-
dev-tools/maven/solr/pom.xml.template | 2 +-
dev-tools/maven/solr/solrj/pom.xml.template | 2 +-
.../maven/solr/solrj/src/java/pom.xml.template | 2 +-
.../maven/solr/solrj/src/test/pom.xml.template | 2 +-
.../maven/solr/test-framework/pom.xml.template | 2 +-
dev-tools/scripts/addBackcompatIndexes.py | 73 +-
dev-tools/scripts/buildAndPushRelease.py | 13 +-
dev-tools/scripts/checkJavadocLinks.py | 2 +-
.../scripts/write.stage.maven.build.xml.pl | 1 -
lucene/CHANGES.txt | 137 +
lucene/JRE_VERSION_MIGRATION.txt | 2 +-
.../analysis/bg/BulgarianStemFilterFactory.java | 1 +
.../bn/BengaliNormalizationFilterFactory.java | 1 +
.../analysis/bn/BengaliStemFilterFactory.java | 1 +
.../analysis/cjk/CJKBigramFilterFactory.java | 1 +
.../analysis/cjk/CJKWidthFilterFactory.java | 1 +
.../ckb/SoraniNormalizationFilterFactory.java | 1 +
.../analysis/ckb/SoraniStemFilterFactory.java | 1 +
...phenationCompoundWordTokenFilterFactory.java | 1 +
.../core/DecimalDigitFilterFactory.java | 1 +
.../core/FlattenGraphFilterFactory.java | 1 +
.../analysis/core/TypeTokenFilterFactory.java | 1 +
.../analysis/core/UpperCaseFilterFactory.java | 1 +
.../analysis/cz/CzechStemFilterFactory.java | 1 +
.../de/GermanLightStemFilterFactory.java | 1 +
.../de/GermanMinimalStemFilterFactory.java | 1 +
.../de/GermanNormalizationFilterFactory.java | 1 +
.../analysis/el/GreekStemFilterFactory.java | 1 +
.../en/EnglishMinimalStemFilterFactory.java | 1 +
.../en/EnglishPossessiveFilterFactory.java | 1 +
.../lucene/analysis/en/KStemFilterFactory.java | 1 +
.../es/SpanishLightStemFilterFactory.java | 1 +
.../fi/FinnishLightStemFilterFactory.java | 1 +
.../fr/FrenchLightStemFilterFactory.java | 1 +
.../fr/FrenchMinimalStemFilterFactory.java | 1 +
.../ga/IrishLowerCaseFilterFactory.java | 1 +
.../gl/GalicianMinimalStemFilterFactory.java | 1 +
.../analysis/gl/GalicianStemFilterFactory.java | 1 +
.../hi/HindiNormalizationFilterFactory.java | 1 +
.../analysis/hi/HindiStemFilterFactory.java | 1 +
.../hu/HungarianLightStemFilterFactory.java | 1 +
.../hunspell/HunspellStemFilterFactory.java | 1 +
.../id/IndonesianStemFilterFactory.java | 1 +
.../in/IndicNormalizationFilterFactory.java | 1 +
.../it/ItalianLightStemFilterFactory.java | 1 +
.../analysis/lv/LatvianStemFilterFactory.java | 1 +
.../analysis/minhash/MinHashFilterFactory.java | 1 +
.../CodepointCountFilterFactory.java | 1 +
.../DateRecognizerFilterFactory.java | 1 +
...elimitedTermFrequencyTokenFilterFactory.java | 3 +-
.../miscellaneous/FingerprintFilterFactory.java | 1 +
.../FixBrokenOffsetsFilterFactory.java | 1 +
.../KeywordMarkerFilterFactory.java | 1 +
.../KeywordRepeatFilterFactory.java | 1 +
.../LimitTokenCountFilterFactory.java | 1 +
.../LimitTokenOffsetFilterFactory.java | 1 +
.../LimitTokenPositionFilterFactory.java | 1 +
.../ScandinavianFoldingFilterFactory.java | 1 +
.../ScandinavianNormalizationFilterFactory.java | 1 +
.../StemmerOverrideFilterFactory.java | 1 +
.../TruncateTokenFilterFactory.java | 1 +
.../WordDelimiterGraphFilterFactory.java | 1 +
.../no/NorwegianLightStemFilterFactory.java | 1 +
.../no/NorwegianMinimalStemFilterFactory.java | 1 +
.../PatternCaptureGroupFilterFactory.java | 1 +
.../DelimitedPayloadTokenFilterFactory.java | 2 +-
.../pt/PortugueseLightStemFilterFactory.java | 1 +
.../pt/PortugueseMinimalStemFilterFactory.java | 1 +
.../pt/PortugueseStemFilterFactory.java | 1 +
.../ru/RussianLightStemFilterFactory.java | 1 +
.../sr/SerbianNormalizationFilterFactory.java | 1 +
.../analysis/standard/ASCIITLD.jflex-macro | 1213 +-
.../analysis/standard/ClassicFilterFactory.java | 1 +
.../standard/UAX29URLEmailTokenizerImpl.java | 38779 ++++++++++++++---
.../sv/SwedishLightStemFilterFactory.java | 1 +
.../synonym/SynonymGraphFilterFactory.java | 1 +
.../analysis/tr/ApostropheFilterFactory.java | 3 +-
.../tr/TurkishLowerCaseFilterFactory.java | 1 +
.../analysis/icu/ICUFoldingFilterFactory.java | 1 +
.../icu/ICUNormalizer2FilterFactory.java | 1 +
.../analysis/icu/ICUTransformFilterFactory.java | 1 +
.../ja/JapaneseBaseFormFilterFactory.java | 1 +
.../ja/JapaneseKatakanaStemFilterFactory.java | 1 +
.../ja/JapaneseNumberFilterFactory.java | 1 +
.../JapanesePartOfSpeechStopFilterFactory.java | 1 +
.../ja/JapaneseReadingFormFilterFactory.java | 1 +
.../morfologik/MorfologikFilterFactory.java | 1 +
.../phonetic/BeiderMorseFilterFactory.java | 1 +
.../DaitchMokotoffSoundexFilterFactory.java | 1 +
.../stempel/StempelPolishStemFilterFactory.java | 1 +
.../index/TestBackwardsCompatibility.java | 61 +-
.../org/apache/lucene/index/dvupdates.7.0.0.zip | Bin 0 -> 13401 bytes
.../org/apache/lucene/index/empty.7.0.0.zip | Bin 0 -> 375 bytes
.../org/apache/lucene/index/index.7.0.0-cfs.zip | Bin 0 -> 15594 bytes
.../apache/lucene/index/index.7.0.0-nocfs.zip | Bin 0 -> 15586 bytes
.../org/apache/lucene/index/index.7.0.1-cfs.zip | Bin 0 -> 15597 bytes
.../apache/lucene/index/index.7.0.1-nocfs.zip | Bin 0 -> 18335 bytes
.../org/apache/lucene/index/index.7.1.0-cfs.zip | Bin 0 -> 15612 bytes
.../apache/lucene/index/index.7.1.0-nocfs.zip | Bin 0 -> 15609 bytes
.../org/apache/lucene/index/moreterms.7.0.0.zip | Bin 0 -> 175822 bytes
.../org/apache/lucene/index/sorted.7.0.0.zip | Bin 0 -> 74558 bytes
.../org/apache/lucene/index/sorted.7.0.1.zip | Bin 0 -> 176238 bytes
.../org/apache/lucene/index/sorted.7.1.0.zip | Bin 0 -> 81963 bytes
.../lucene/index/unsupported.5.5.5-cfs.zip | Bin 0 -> 13695 bytes
.../lucene/index/unsupported.5.5.5-nocfs.zip | Bin 0 -> 13686 bytes
.../lucene/index/unsupported.6.6.2-cfs.zip | Bin 0 -> 15823 bytes
.../lucene/index/unsupported.6.6.2-nocfs.zip | Bin 0 -> 15820 bytes
.../KNearestNeighborDocumentClassifier.java | 1 +
.../classification/ClassificationTestBase.java | 1 +
lucene/common-build.xml | 14 +-
.../org/apache/lucene/index/CheckIndex.java | 4 +-
.../org/apache/lucene/index/FieldInfos.java | 22 +-
.../apache/lucene/index/IndexFileDeleter.java | 4 +-
.../org/apache/lucene/index/IndexWriter.java | 25 +-
.../org/apache/lucene/index/SegmentInfos.java | 17 +-
.../lucene/index/SimpleMergedSegmentWarmer.java | 6 +-
.../lucene/search/CollectionStatistics.java | 69 +-
.../org/apache/lucene/search/IndexSearcher.java | 24 +-
.../apache/lucene/search/MultiPhraseQuery.java | 11 +-
.../lucene/search/NormsFieldExistsQuery.java | 80 +
.../org/apache/lucene/search/PhraseQuery.java | 12 +-
.../org/apache/lucene/search/SynonymQuery.java | 27 +-
.../org/apache/lucene/search/TermQuery.java | 15 +-
.../apache/lucene/search/TermStatistics.java | 37 +-
.../lucene/search/similarities/AfterEffect.java | 10 +-
.../search/similarities/AfterEffectB.java | 8 +-
.../search/similarities/AfterEffectL.java | 8 +-
.../lucene/search/similarities/Axiomatic.java | 28 +-
.../search/similarities/AxiomaticF1EXP.java | 20 +-
.../search/similarities/AxiomaticF1LOG.java | 20 +-
.../search/similarities/AxiomaticF2EXP.java | 18 +-
.../search/similarities/AxiomaticF2LOG.java | 18 +-
.../search/similarities/AxiomaticF3EXP.java | 24 +-
.../search/similarities/AxiomaticF3LOG.java | 24 +-
.../search/similarities/BM25Similarity.java | 120 +-
.../lucene/search/similarities/BasicModel.java | 6 +-
.../search/similarities/BasicModelBE.java | 4 +-
.../lucene/search/similarities/BasicModelD.java | 6 +-
.../lucene/search/similarities/BasicModelG.java | 4 +-
.../search/similarities/BasicModelIF.java | 4 +-
.../search/similarities/BasicModelIn.java | 8 +-
.../search/similarities/BasicModelIne.java | 4 +-
.../lucene/search/similarities/BasicModelP.java | 8 +-
.../lucene/search/similarities/BasicStats.java | 12 +-
.../search/similarities/BooleanSimilarity.java | 2 +-
.../search/similarities/ClassicSimilarity.java | 4 +-
.../search/similarities/DFISimilarity.java | 8 +-
.../search/similarities/DFRSimilarity.java | 10 +-
.../search/similarities/Distribution.java | 8 +-
.../search/similarities/DistributionLL.java | 4 +-
.../search/similarities/DistributionSPL.java | 8 +-
.../search/similarities/IBSimilarity.java | 8 +-
.../search/similarities/Independence.java | 2 +-
.../similarities/IndependenceChiSquared.java | 2 +-
.../similarities/IndependenceSaturated.java | 2 +-
.../similarities/IndependenceStandardized.java | 4 +-
.../similarities/LMDirichletSimilarity.java | 18 +-
.../similarities/LMJelinekMercerSimilarity.java | 20 +-
.../search/similarities/LMSimilarity.java | 20 +-
.../search/similarities/Normalization.java | 16 +-
.../search/similarities/NormalizationH1.java | 8 +-
.../search/similarities/NormalizationH2.java | 8 +-
.../search/similarities/NormalizationH3.java | 5 +-
.../search/similarities/NormalizationZ.java | 9 +-
.../search/similarities/SimilarityBase.java | 28 +-
.../search/similarities/TFIDFSimilarity.java | 37 +-
.../search/similarities/package-info.java | 2 +-
.../apache/lucene/search/spans/SpanWeight.java | 15 +-
.../java/org/apache/lucene/util/Version.java | 14 +
.../index/TestDemoParallelLeafReader.java | 19 +-
.../lucene/index/TestIndexWriterReader.java | 44 +-
.../lucene/search/TestIntRangeFieldQueries.java | 2 +-
.../search/TestNormsFieldExistsQuery.java | 197 +
.../search/similarities/AxiomaticTestCase.java | 90 +
.../search/similarities/BasicModelTestCase.java | 124 +
.../similarities/DistributionTestCase.java | 119 +
.../search/similarities/TestAxiomaticF1EXP.java | 30 +
.../search/similarities/TestAxiomaticF1LOG.java | 30 +
.../search/similarities/TestAxiomaticF2EXP.java | 26 +
.../search/similarities/TestAxiomaticF2LOG.java | 26 +
.../search/similarities/TestAxiomaticF3EXP.java | 31 +
.../search/similarities/TestAxiomaticF3LOG.java | 31 +
.../search/similarities/TestBM25Similarity.java | 61 +-
.../search/similarities/TestBasicModelBE.java | 30 +
.../search/similarities/TestBasicModelD.java | 30 +
.../search/similarities/TestBasicModelG.java | 26 +
.../search/similarities/TestBasicModelIF.java | 26 +
.../search/similarities/TestBasicModelIn.java | 26 +
.../search/similarities/TestBasicModelIne.java | 26 +
.../search/similarities/TestBasicModelP.java | 30 +
.../similarities/TestBooleanSimilarity.java | 9 +-
.../similarities/TestClassicSimilarity.java | 12 +-
.../search/similarities/TestDistributionLL.java | 26 +
.../similarities/TestDistributionSPL.java | 30 +
.../TestIndependenceChiSquared.java | 28 +
.../similarities/TestIndependenceSaturated.java | 28 +
.../TestIndependenceStandardized.java | 28 +
.../similarities/TestLMDirichletSimilarity.java | 49 +
.../TestLMJelinekMercerSimilarity.java | 44 +
.../search/similarities/TestSimilarity2.java | 5 +-
.../search/similarities/TestSimilarityBase.java | 14 +-
.../apache/lucene/facet/range/DoubleRange.java | 2 +-
.../apache/lucene/facet/range/LongRange.java | 2 +-
.../directory/DirectoryTaxonomyReader.java | 58 +-
.../directory/DirectoryTaxonomyWriter.java | 17 +-
.../taxonomy/directory/TaxonomyIndexArrays.java | 40 +-
.../taxonomy/writercache/CategoryPathUtils.java | 81 -
.../writercache/Cl2oTaxonomyWriterCache.java | 98 -
.../taxonomy/writercache/CollisionMap.java | 235 -
.../writercache/CompactLabelToOrdinal.java | 467 -
.../writercache/UTF8TaxonomyWriterCache.java | 158 +
.../TestConcurrentFacetedIndexing.java | 8 +-
.../directory/TestDirectoryTaxonomyReader.java | 34 +-
.../directory/TestDirectoryTaxonomyWriter.java | 12 +-
.../writercache/TestCompactLabelToOrdinal.java | 137 -
.../TestUTF8TaxonomyWriterCache.java | 120 +
lucene/ivy-versions.properties | 31 +-
.../lucene/search/join/TestBlockJoin.java | 2 +-
lucene/licenses/commons-compress-1.11.jar.sha1 | 1 -
lucene/licenses/commons-compress-1.14.jar.sha1 | 1 +
.../morfologik-ukrainian-search-3.7.5.jar.sha1 | 1 -
.../morfologik-ukrainian-search-3.7.6.jar.sha1 | 1 -
.../morfologik-ukrainian-search-3.9.0.jar.sha1 | 1 +
.../apache/lucene/queries/mlt/MoreLikeThis.java | 16 +-
.../lucene/queryparser/xml/CoreParser.java | 65 +-
.../queryparser/xml/DOCTYPE_TermQuery.xml | 19 +
.../lucene/queryparser/xml/ENTITY_TermQuery.xml | 23 +
.../lucene/queryparser/xml/TestCoreParser.java | 13 +
.../nrt/PreCopyMergedSegmentWarmer.java | 4 +-
.../document/FloatPointNearestNeighbor.java | 383 +
.../lucene/document/LatLonBoundingBox.java | 231 +
.../org/apache/lucene/document/LatLonPoint.java | 3 +-
.../lucene/search/TermAutomatonQuery.java | 13 +-
.../document/TestFloatPointNearestNeighbor.java | 239 +
.../search/TestLatLonBoundingBoxQueries.java | 299 +
.../lucene/search/TestTermAutomatonQuery.java | 60 +
lucene/site/xsl/index.xsl | 2 +-
lucene/spatial-extras/build.xml | 9 +
.../spatial/spatial4j/Geo3dBinaryCodec.java | 130 +
.../spatial/spatial4j/Geo3dCircleShape.java | 82 +
.../spatial4j/Geo3dDistanceCalculator.java | 154 +
.../spatial/spatial4j/Geo3dPointShape.java | 78 +
.../spatial/spatial4j/Geo3dRectangleShape.java | 163 +
.../lucene/spatial/spatial4j/Geo3dShape.java | 169 +-
.../spatial/spatial4j/Geo3dShapeFactory.java | 396 +
.../spatial4j/Geo3dSpatialContextFactory.java | 94 +
.../apache/lucene/spatial/SpatialArgsTest.java | 12 +-
.../lucene/spatial/spatial4j/Geo3dRptTest.java | 193 +-
.../Geo3dShapeRectRelationTestCase.java | 20 +-
.../Geo3dShapeSphereModelRectRelationTest.java | 29 +-
.../Geo3dShapeWGS84ModelRectRelationTest.java | 21 +
.../apache/lucene/spatial3d/geom/Bounded.java | 35 +
.../lucene/spatial3d/geom/GeoCircleFactory.java | 16 +
.../lucene/spatial3d/geom/GeoExactCircle.java | 373 +
.../apache/lucene/spatial3d/geom/GeoShape.java | 10 +-
.../lucene/spatial3d/geom/PlanetModel.java | 61 +-
.../lucene/spatial3d/geom/StandardObjects.java | 1 +
.../lucene/spatial3d/geom/GeoCircleTest.java | 83 +
.../geom/RandomGeo3dShapeGenerator.java | 148 +-
.../analyzing/SuggestStopFilterFactory.java | 1 +
.../java/org/apache/lucene/geo/GeoTestUtil.java | 5 +
.../index/BaseSegmentInfoFormatTestCase.java | 3 +-
.../ThreadedIndexingAndSearchingTestCase.java | 42 +-
.../search/BaseRangeFieldQueryTestCase.java | 10 +-
.../org/apache/lucene/search/CheckHits.java | 35 +-
.../lucene/search/ShardSearchingTestBase.java | 42 +-
.../similarities/AssertingSimilarity.java | 152 +
.../similarities/BaseSimilarityTestCase.java | 473 +
.../util/TestRuleSetupAndRestoreClassEnv.java | 3 +-
.../java/org/apache/lucene/util/TestUtil.java | 2 +-
solr/CHANGES.txt | 299 +-
solr/NOTICE.txt | 5 +-
solr/README.txt | 4 +-
solr/bin/solr | 4 +
solr/bin/solr.in.cmd | 3 +
solr/bin/solr.in.sh | 3 +
solr/build.xml | 29 +-
solr/common-build.xml | 9 +-
.../solr/analytics/AnalyticsRequestParser.java | 26 -
.../solr/analytics/ExpressionFactory.java | 136 +-
.../function/field/AnalyticsField.java | 5 +
.../function/mapping/BottomFunction.java | 4 +-
.../function/mapping/CompareFunction.java | 614 -
.../function/mapping/ComparisonFunction.java | 318 +
.../function/mapping/ConcatFunction.java | 95 +-
.../function/mapping/DateMathFunction.java | 8 +-
.../function/mapping/DateParseFunction.java | 24 +-
.../DecimalNumericConversionFunction.java | 271 +
.../function/mapping/EqualFunction.java | 238 +
.../function/mapping/ExistsFunction.java | 123 +
.../function/mapping/FillMissingFunction.java | 5 +-
.../function/mapping/FilterFunction.java | 3 +-
.../analytics/function/mapping/IfFunction.java | 3 +-
.../function/mapping/JoinFunction.java | 57 -
.../function/mapping/LogicFunction.java | 2 +-
.../mapping/NumericConvertFunction.java | 256 -
.../function/mapping/RemoveFunction.java | 39 +-
.../function/mapping/ReplaceFunction.java | 65 +-
.../analytics/function/mapping/TopFunction.java | 4 +-
.../function/reduction/DocCountFunction.java | 2 +-
.../function/reduction/MeanFunction.java | 97 +
.../function/reduction/OrdinalFunction.java | 44 +-
.../function/reduction/PercentileFunction.java | 16 +-
.../function/reduction/SumFunction.java | 2 +-
.../reduction/data/SortedListCollector.java | 25 +-
.../plugin/AnalyticsStatisticsCollector.java | 104 -
.../solr/analytics/util/OldAnalyticsParams.java | 3 +-
.../solr/analytics/util/OrdinalCalculator.java | 5 +-
.../solr/analytics/value/AnalyticsValue.java | 6 +-
.../analytics/value/AnalyticsValueStream.java | 17 +
.../solr/analytics/value/BooleanValue.java | 8 +
.../analytics/value/BooleanValueStream.java | 4 +
.../apache/solr/analytics/value/DateValue.java | 11 +-
.../solr/analytics/value/DateValueStream.java | 6 +-
.../solr/analytics/value/DoubleValue.java | 8 +
.../solr/analytics/value/DoubleValueStream.java | 4 +
.../apache/solr/analytics/value/FloatValue.java | 8 +
.../solr/analytics/value/FloatValueStream.java | 4 +
.../apache/solr/analytics/value/IntValue.java | 8 +
.../solr/analytics/value/IntValueStream.java | 4 +
.../apache/solr/analytics/value/LongValue.java | 8 +
.../solr/analytics/value/LongValueStream.java | 4 +
.../solr/analytics/value/StringValue.java | 8 +
.../solr/analytics/value/StringValueStream.java | 4 +
.../analytics/value/constant/ConstantValue.java | 73 +-
.../test-files/solr/analytics/expressions.txt | 65 -
.../test-files/solr/analytics/facetSorting.txt | 4 -
.../solr/analytics/fieldFacetExtras.txt | 66 -
.../test-files/solr/analytics/fieldFacets.txt | 132 -
.../src/test-files/solr/analytics/functions.txt | 57 -
.../solr/analytics/legacy/expressions.txt | 65 +
.../solr/analytics/legacy/facetSorting.txt | 4 +
.../solr/analytics/legacy/fieldFacetExtras.txt | 66 +
.../solr/analytics/legacy/fieldFacets.txt | 132 +
.../solr/analytics/legacy/functions.txt | 57 +
.../solr/analytics/legacy/noFacets.txt | 74 +
.../solr/analytics/legacy/queryFacets.txt | 27 +
.../solr/analytics/legacy/rangeFacets.txt | 161 +
.../src/test-files/solr/analytics/noFacets.txt | 74 -
.../test-files/solr/analytics/queryFacets.txt | 27 -
.../test-files/solr/analytics/rangeFacets.txt | 161 -
.../solr/collection1/conf/schema-analytics.xml | 123 +-
.../configsets/cloud-analytics/conf/schema.xml | 66 +-
.../AbstractAnalyticsStatsCloudTest.java | 187 -
.../analytics/AbstractAnalyticsStatsTest.java | 235 -
.../solr/analytics/ExpressionFactoryTest.java | 249 +
.../apache/solr/analytics/NoFacetCloudTest.java | 557 -
.../org/apache/solr/analytics/NoFacetTest.java | 536 +-
.../solr/analytics/OverallAnalyticsTest.java | 320 +
.../solr/analytics/SolrAnalyticsTestCase.java | 349 +
.../analytics/expression/ExpressionTest.java | 201 -
.../solr/analytics/expression/FunctionTest.java | 221 -
.../facet/AbstractAnalyticsFacetCloudTest.java | 284 -
.../facet/AbstractAnalyticsFacetTest.java | 343 -
.../solr/analytics/facet/FacetSortingTest.java | 53 -
.../analytics/facet/FieldFacetCloudTest.java | 1212 -
.../facet/FieldFacetExtrasCloudTest.java | 253 -
.../analytics/facet/FieldFacetExtrasTest.java | 170 -
.../solr/analytics/facet/FieldFacetTest.java | 1065 -
.../solr/analytics/facet/PivotFacetTest.java | 230 +
.../analytics/facet/QueryFacetCloudTest.java | 159 -
.../solr/analytics/facet/QueryFacetTest.java | 150 +-
.../analytics/facet/RangeFacetCloudTest.java | 588 -
.../solr/analytics/facet/RangeFacetTest.java | 620 +-
.../facet/SolrAnalyticsFacetTestCase.java | 80 +
.../solr/analytics/facet/ValueFacetTest.java | 433 +
.../field/AbstractAnalyticsFieldTest.java | 299 +
.../function/field/BooleanFieldsTest.java | 71 +
.../function/field/DateFieldsTest.java | 108 +
.../function/field/DoubleFieldsTest.java | 108 +
.../function/field/FloatFieldsTest.java | 108 +
.../analytics/function/field/IntFieldsTest.java | 108 +
.../function/field/LongFieldsTest.java | 108 +
.../function/field/StringFieldsTest.java | 71 +
.../mapping/AbsoluteValueFunctionTest.java | 267 +
.../function/mapping/AddFunctionTest.java | 156 +
.../function/mapping/AndFunctionTest.java | 192 +
.../function/mapping/BottomFunctionTest.java | 406 +
.../function/mapping/CeilingFunctionTest.java | 180 +
.../function/mapping/ConcatFunctionTest.java | 317 +
.../function/mapping/DateMathFunctionTest.java | 127 +
.../function/mapping/DateParseFunctionTest.java | 245 +
.../function/mapping/DivideFunctionTest.java | 128 +
.../function/mapping/EqualFunctionTest.java | 530 +
.../function/mapping/ExistsFunctionTest.java | 74 +
.../mapping/FillMissingFunctionTest.java | 717 +
.../function/mapping/FilterFunctionTest.java | 1035 +
.../function/mapping/FloorFunctionTest.java | 180 +
.../function/mapping/GTEFunctionTest.java | 290 +
.../function/mapping/GTFunctionTest.java | 290 +
.../function/mapping/IfFunctionTest.java | 994 +
.../function/mapping/LTEFunctionTest.java | 290 +
.../function/mapping/LTFunctionTest.java | 290 +
.../function/mapping/LogFunctionTest.java | 186 +
.../function/mapping/MultFunctionTest.java | 155 +
.../function/mapping/NegateFunctionTest.java | 327 +
.../function/mapping/OrFunctionTest.java | 192 +
.../function/mapping/PowerFunctionTest.java | 128 +
.../function/mapping/RemoveFunctionTest.java | 849 +
.../function/mapping/ReplaceFunctionTest.java | 990 +
.../function/mapping/RoundFunctionTest.java | 180 +
.../mapping/StringCastFunctionTest.java | 87 +
.../function/mapping/SubtractFunctionTest.java | 128 +
.../function/mapping/TopFunctionTest.java | 406 +
.../LegacyAbstractAnalyticsCloudTest.java | 167 +
.../legacy/LegacyAbstractAnalyticsTest.java | 234 +
.../legacy/LegacyNoFacetCloudTest.java | 551 +
.../analytics/legacy/LegacyNoFacetTest.java | 450 +
.../legacy/expression/LegacyExpressionTest.java | 201 +
.../legacy/expression/LegacyFunctionTest.java | 221 +
.../LegacyAbstractAnalyticsFacetCloudTest.java | 194 +
.../facet/LegacyAbstractAnalyticsFacetTest.java | 342 +
.../legacy/facet/LegacyFacetSortingTest.java | 53 +
.../legacy/facet/LegacyFieldFacetCloudTest.java | 1212 +
.../facet/LegacyFieldFacetExtrasCloudTest.java | 253 +
.../facet/LegacyFieldFacetExtrasTest.java | 170 +
.../legacy/facet/LegacyFieldFacetTest.java | 1065 +
.../legacy/facet/LegacyQueryFacetCloudTest.java | 159 +
.../legacy/facet/LegacyQueryFacetTest.java | 124 +
.../legacy/facet/LegacyRangeFacetCloudTest.java | 588 +
.../legacy/facet/LegacyRangeFacetTest.java | 417 +
.../value/CastingAnalyticsValueTest.java | 56 +
.../value/CastingBooleanValueStreamTest.java | 79 +
.../value/CastingBooleanValueTest.java | 159 +
.../value/CastingDateValueStreamTest.java | 111 +
.../analytics/value/CastingDateValueTest.java | 172 +
.../value/CastingDoubleValueStreamTest.java | 79 +
.../analytics/value/CastingDoubleValueTest.java | 159 +
.../value/CastingFloatValueStreamTest.java | 102 +
.../analytics/value/CastingFloatValueTest.java | 198 +
.../value/CastingIntValueStreamTest.java | 148 +
.../analytics/value/CastingIntValueTest.java | 276 +
.../value/CastingLongValueStreamTest.java | 102 +
.../analytics/value/CastingLongValueTest.java | 198 +
.../value/CastingStringValueStreamTest.java | 56 +
.../analytics/value/CastingStringValueTest.java | 120 +
.../solr/analytics/value/ConstantValueTest.java | 368 +
.../solr/analytics/value/FillableTestValue.java | 641 +
.../solr/collection1/conf/solrconfig.xml | 25 -
.../handler/dataimport/TikaEntityProcessor.java | 4 +
.../src/test-files/dihextras/test_vsdx.vsdx | Bin 0 -> 44426 bytes
.../dataimport/TestTikaEntityProcessor.java | 22 +
solr/contrib/extraction/ivy.xml | 6 +-
.../solr/collection1/conf/solrconfig.xml | 18 -
solr/contrib/ltr/README.md | 2 +-
.../apache/solr/ltr/feature/SolrFeature.java | 2 +-
.../solr/collection1/conf/solrconfig-ltr.xml | 2 +-
.../collection1/conf/solrconfig-ltr_Th10_10.xml | 2 +-
.../collection1/conf/solrconfig-multiseg.xml | 2 +-
.../UIMAUpdateRequestProcessorFactory.java | 2 +-
.../uima/solr/collection1/conf/solrconfig.xml | 25 -
.../uima/uima-tokenizers-solrconfig.xml | 27 +-
solr/core/build.xml | 3 +-
.../java/org/apache/solr/api/V2HttpCall.java | 36 +-
.../apache/solr/cloud/ActiveReplicaWatcher.java | 170 +
.../org/apache/solr/cloud/AddReplicaCmd.java | 24 +-
.../src/java/org/apache/solr/cloud/Assign.java | 2 +-
.../org/apache/solr/cloud/CreateAliasCmd.java | 52 +-
.../apache/solr/cloud/CreateCollectionCmd.java | 7 +-
.../org/apache/solr/cloud/CreateShardCmd.java | 11 +-
.../org/apache/solr/cloud/DeleteAliasCmd.java | 24 +-
.../org/apache/solr/cloud/ElectionContext.java | 39 +-
.../solr/cloud/LeaderRecoveryWatcher.java | 88 +
.../org/apache/solr/cloud/MoveReplicaCmd.java | 29 +-
.../java/org/apache/solr/cloud/Overseer.java | 163 +-
.../cloud/OverseerCollectionMessageHandler.java | 13 +-
.../solr/cloud/OverseerNodePrioritizer.java | 1 -
.../org/apache/solr/cloud/RecoveryStrategy.java | 8 +-
.../org/apache/solr/cloud/ReplaceNodeCmd.java | 100 +-
.../apache/solr/cloud/ReplicateFromLeader.java | 7 +-
.../org/apache/solr/cloud/SplitShardCmd.java | 8 +-
.../org/apache/solr/cloud/ZkController.java | 54 +-
.../apache/solr/cloud/ZkDistributedQueue.java | 69 +
.../solr/cloud/ZkDistributedQueueFactory.java | 43 +
.../autoscaling/AutoAddReplicasPlanAction.java | 7 +-
.../solr/cloud/autoscaling/AutoScaling.java | 8 +-
.../cloud/autoscaling/AutoScalingHandler.java | 61 +-
.../cloud/autoscaling/ComputePlanAction.java | 66 +-
.../cloud/autoscaling/ExecutePlanAction.java | 12 +-
.../cloud/autoscaling/NodeAddedTrigger.java | 18 +-
.../solr/cloud/autoscaling/NodeLostTrigger.java | 2 +-
.../autoscaling/OverseerTriggerThread.java | 9 +-
.../cloud/autoscaling/ScheduledTriggers.java | 51 +-
.../cloud/autoscaling/SearchRateTrigger.java | 265 +
.../solr/cloud/autoscaling/TriggerAction.java | 2 +-
.../solr/cloud/autoscaling/TriggerBase.java | 8 +-
.../solr/cloud/autoscaling/TriggerEvent.java | 9 +-
.../cloud/autoscaling/TriggerEventQueue.java | 25 +-
.../autoscaling/ZkDistributedQueueFactory.java | 4 +-
.../solr/cloud/overseer/ZkStateWriter.java | 107 +-
.../org/apache/solr/core/CoreContainer.java | 56 +-
.../apache/solr/core/RunExecutableListener.java | 148 -
.../java/org/apache/solr/core/SolrCores.java | 17 +-
.../org/apache/solr/core/SolrXmlConfig.java | 3 +-
.../apache/solr/handler/CalciteJDBCStream.java | 1 +
.../apache/solr/handler/CdcrRequestHandler.java | 9 +-
.../org/apache/solr/handler/ClassifyStream.java | 3 +-
.../org/apache/solr/handler/GraphHandler.java | 3 +
.../org/apache/solr/handler/IndexFetcher.java | 23 +-
.../apache/solr/handler/ReplicationHandler.java | 35 +-
.../org/apache/solr/handler/StreamHandler.java | 84 +-
.../admin/AutoscalingHistoryHandler.java | 32 +-
.../solr/handler/admin/ClusterStatus.java | 34 +-
.../solr/handler/admin/CollectionsHandler.java | 16 +-
.../solr/handler/admin/MetricsHandler.java | 11 +-
.../solr/handler/admin/PrepRecoveryOp.java | 33 -
.../org/apache/solr/handler/sql/SolrSchema.java | 6 +-
.../solr/highlight/UnifiedSolrHighlighter.java | 18 +-
.../solr/index/SlowCompositeReaderWrapper.java | 16 +-
.../solr/metrics/SolrCoreMetricManager.java | 30 +-
.../apache/solr/metrics/SolrMetricManager.java | 54 +-
.../metrics/reporters/SolrGraphiteReporter.java | 12 +-
.../reporters/solr/SolrClusterReporter.java | 15 +-
.../reporters/solr/SolrShardReporter.java | 13 +-
.../solr/request/RegexBytesRefFilter.java | 46 +
.../org/apache/solr/request/SimpleFacets.java | 44 +-
.../solr/response/RetrieveFieldsOptimizer.java | 6 +-
.../analysis/BaseManagedTokenFilterFactory.java | 1 +
.../analysis/ManagedStopFilterFactory.java | 1 +
.../analysis/ManagedSynonymFilterFactory.java | 1 +
.../ManagedSynonymGraphFilterFactory.java | 1 +
.../solr/schema/AbstractSpatialFieldType.java | 5 +
.../apache/solr/schema/ExternalFileField.java | 1 -
.../solr/search/FloatPayloadValueSource.java | 12 +-
.../org/apache/solr/search/SolrCoreParser.java | 8 +
.../apache/solr/search/SolrDocumentFetcher.java | 279 +-
.../apache/solr/search/XmlQParserPlugin.java | 34 +
.../apache/solr/search/facet/FacetField.java | 3 +-
.../search/join/ScoreJoinQParserPlugin.java | 30 +-
.../solr/search/stats/CollectionStats.java | 3 +
.../solr/search/stats/ExactStatsCache.java | 7 +-
.../org/apache/solr/search/stats/TermStats.java | 3 +
.../org/apache/solr/servlet/HttpSolrCall.java | 250 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 2 +-
.../solr/update/DirectUpdateHandler2.java | 9 +-
.../java/org/apache/solr/update/UpdateLog.java | 12 +-
...tractDefaultValueUpdateProcessorFactory.java | 1 +
.../AddSchemaFieldsUpdateProcessorFactory.java | 1 +
.../processor/AtomicUpdateProcessorFactory.java | 3 +-
.../processor/CdcrUpdateProcessorFactory.java | 1 +
.../ClassificationUpdateProcessorFactory.java | 1 +
.../ClassificationUpdateProcessorParams.java | 2 +-
.../CloneFieldUpdateProcessorFactory.java | 1 +
.../ConcatFieldUpdateProcessorFactory.java | 1 +
.../CountFieldValuesUpdateProcessorFactory.java | 1 +
.../DefaultValueUpdateProcessorFactory.java | 1 +
.../processor/DistributedUpdateProcessor.java | 308 +-
.../DistributedUpdateProcessorFactory.java | 1 +
...BasedVersionConstraintsProcessorFactory.java | 1 +
.../DocExpirationUpdateProcessorFactory.java | 1 +
.../FieldLengthUpdateProcessorFactory.java | 1 +
.../FieldMutatingUpdateProcessorFactory.java | 1 +
...FieldNameMutatingUpdateProcessorFactory.java | 1 +
.../FieldValueSubsetUpdateProcessorFactory.java | 1 +
.../FirstFieldValueUpdateProcessorFactory.java | 1 +
.../HTMLStripFieldUpdateProcessorFactory.java | 1 +
...oreCommitOptimizeUpdateProcessorFactory.java | 1 +
.../IgnoreFieldUpdateProcessorFactory.java | 1 +
.../LastFieldValueUpdateProcessorFactory.java | 1 +
.../MaxFieldValueUpdateProcessorFactory.java | 1 +
.../MinFieldValueUpdateProcessorFactory.java | 1 +
.../NoOpDistributingUpdateProcessorFactory.java | 1 +
...ParseBooleanFieldUpdateProcessorFactory.java | 1 +
.../ParseDateFieldUpdateProcessorFactory.java | 1 +
.../ParseDoubleFieldUpdateProcessorFactory.java | 1 +
.../ParseFloatFieldUpdateProcessorFactory.java | 1 +
.../ParseIntFieldUpdateProcessorFactory.java | 1 +
.../ParseLongFieldUpdateProcessorFactory.java | 1 +
...ParseNumericFieldUpdateProcessorFactory.java | 1 +
.../PreAnalyzedUpdateProcessorFactory.java | 1 +
.../processor/RegexReplaceProcessorFactory.java | 1 +
.../processor/RegexpBoostProcessorFactory.java | 1 +
.../RemoveBlankFieldUpdateProcessorFactory.java | 1 +
.../processor/SimpleUpdateProcessorFactory.java | 1 +
.../SkipExistingDocumentsProcessorFactory.java | 1 +
.../StatelessScriptUpdateProcessorFactory.java | 1 +
.../TemplateUpdateProcessorFactory.java | 1 +
.../TimestampUpdateProcessorFactory.java | 1 +
.../TolerantUpdateProcessorFactory.java | 1 +
.../TrimFieldUpdateProcessorFactory.java | 1 +
.../TruncateFieldUpdateProcessorFactory.java | 1 +
.../processor/URLClassifyProcessorFactory.java | 1 +
.../processor/UUIDUpdateProcessorFactory.java | 1 +
.../UniqFieldsUpdateProcessorFactory.java | 1 +
.../processor/UpdateRequestProcessor.java | 1 +
.../src/java/org/apache/solr/util/IdUtils.java | 16 +
.../java/org/apache/solr/util/NumberUtils.java | 8 +-
.../solr/collection1/conf/schema-spatial.xml | 7 +
.../solr/collection1/conf/schema_latest.xml | 5 +-
.../conf/solrconfig-analytics-query.xml | 17 -
.../conf/solrconfig-collapseqparser.xml | 17 -
.../collection1/conf/solrconfig-elevate.xml | 17 -
.../conf/solrconfig-plugcollector.xml | 16 -
.../collection1/conf/solrconfig-spatial.xml | 6 +
.../solr/collection1/conf/solrconfig.xml | 17 -
.../configsets/_default/conf/managed-schema | 5 +-
.../configsets/_default/conf/solrconfig.xml | 23 -
.../solr/configsets/backcompat/conf/schema.xml | 22 +
.../configsets/backcompat/conf/solrconfig.xml | 43 +
.../with-run-executable-listener/managed-schema | 25 -
.../with-run-executable-listener/solrconfig.xml | 69 -
.../test-files/solr/solr-graphitereporter.xml | 2 +-
.../backcompat/TestLuceneIndexBackCompat.java | 96 +
.../org/apache/solr/cloud/AddReplicaTest.java | 119 +
.../apache/solr/cloud/AliasIntegrationTest.java | 149 +-
.../cloud/AssignBackwardCompatibilityTest.java | 27 +-
.../apache/solr/cloud/CdcrBootstrapTest.java | 83 +-
.../cloud/CollectionsAPIDistributedZkTest.java | 16 +-
.../org/apache/solr/cloud/DeleteShardTest.java | 1 -
.../cloud/DistribJoinFromCollectionTest.java | 9 +-
.../apache/solr/cloud/DistributedQueueTest.java | 4 +-
.../org/apache/solr/cloud/ForceLeaderTest.java | 2 +-
.../solr/cloud/HealthCheckHandlerTest.java | 58 +-
.../cloud/LeaderElectionContextKeyTest.java | 69 +-
.../org/apache/solr/cloud/MoveReplicaTest.java | 122 +-
...verseerCollectionConfigSetProcessorTest.java | 12 +-
.../org/apache/solr/cloud/OverseerTest.java | 137 +-
.../org/apache/solr/cloud/ReplaceNodeTest.java | 45 +-
.../cloud/TestCloudJSONFacetJoinDomain.java | 191 +-
.../apache/solr/cloud/TestConfigSetsAPI.java | 12 -
.../cloud/TestRandomRequestDistribution.java | 4 +-
.../solr/cloud/TestSkipOverseerOperations.java | 125 +
.../org/apache/solr/cloud/TestTlogReplica.java | 73 +-
.../org/apache/solr/cloud/ZkSolrClientTest.java | 13 +-
.../AutoAddReplicasIntegrationTest.java | 6 +-
.../AutoAddReplicasPlanActionTest.java | 4 +-
.../autoscaling/AutoScalingHandlerTest.java | 26 +-
.../autoscaling/ComputePlanActionTest.java | 39 +-
.../autoscaling/ExecutePlanActionTest.java | 46 +-
.../autoscaling/SearchRateTriggerTest.java | 191 +
.../autoscaling/SystemLogListenerTest.java | 1 +
.../solr/cloud/autoscaling/TestPolicyCloud.java | 52 +-
.../autoscaling/TriggerIntegrationTest.java | 85 +-
.../solr/cloud/overseer/ZkStateReaderTest.java | 9 +-
.../solr/cloud/overseer/ZkStateWriterTest.java | 109 +-
.../common/cloud/ZkStateReaderAccessor.java | 36 +
.../handler/BinaryUpdateRequestHandlerTest.java | 11 +-
.../admin/AutoscalingHistoryHandlerTest.java | 50 +-
.../solr/handler/admin/MetricsHandlerTest.java | 9 +
.../highlight/TestUnifiedSolrHighlighter.java | 3 +
.../solr/metrics/SolrCoreMetricManagerTest.java | 2 +-
.../solr/metrics/SolrMetricManagerTest.java | 6 +-
.../metrics/reporters/SolrJmxReporterTest.java | 8 +-
.../reporters/solr/SolrShardReporterTest.java | 3 +-
.../solr/request/RegexBytesRefFilterTest.java | 34 +
.../apache/solr/request/SimpleFacetsTest.java | 30 +
.../solr/schema/SpatialRPTFieldTypeTest.java | 12 +-
.../apache/solr/search/TestSolr4Spatial2.java | 40 +-
.../solr/search/function/TestFunctionQuery.java | 56 +-
.../org/apache/solr/update/AutoCommitTest.java | 390 -
.../apache/solr/update/HardAutoCommitTest.java | 137 -
.../apache/solr/update/SoftAutoCommitTest.java | 103 +-
.../org/apache/solr/util/NumberUtilsTest.java | 40 +
solr/example/README.txt | 4 +-
.../example-DIH/solr/db/conf/managed-schema | 5 +-
.../example-DIH/solr/db/conf/solrconfig.xml | 23 -
.../example-DIH/solr/mail/conf/managed-schema | 5 +-
.../example-DIH/solr/mail/conf/solrconfig.xml | 23 -
.../example-DIH/solr/solr/conf/managed-schema | 5 +-
.../example-DIH/solr/solr/conf/solrconfig.xml | 23 -
solr/example/files/conf/solrconfig.xml | 23 -
.../asciidoctor-ant-1.6.0-alpha.3.jar.sha1 | 1 -
.../asciidoctor-ant-1.6.0-alpha.5.jar.sha1 | 1 +
solr/licenses/commons-collections4-4.1.jar.sha1 | 1 +
.../commons-collections4-LICENSE-ASL.txt | 202 +
solr/licenses/commons-collections4-NOTICE.txt | 5 +
solr/licenses/commons-compress-1.11.jar.sha1 | 1 -
solr/licenses/commons-compress-1.14.jar.sha1 | 1 +
solr/licenses/curvesapi-1.04.jar.sha1 | 1 +
solr/licenses/curvesapi-LICENSE-BSD_LIKE.txt | 28 +
solr/licenses/curvesapi-NOTICE.txt | 2 +
solr/licenses/fontbox-2.0.1.jar.sha1 | 1 -
solr/licenses/fontbox-2.0.6.jar.sha1 | 1 +
solr/licenses/jackcess-2.1.3.jar.sha1 | 1 -
solr/licenses/jackcess-2.1.8.jar.sha1 | 1 +
solr/licenses/jempbox-1.8.12.jar.sha1 | 1 -
solr/licenses/jempbox-1.8.13.jar.sha1 | 1 +
solr/licenses/jmatio-1.0.jar.sha1 | 1 -
solr/licenses/jmatio-1.2.jar.sha1 | 1 +
solr/licenses/metadata-extractor-2.8.1.jar.sha1 | 1 -
solr/licenses/metadata-extractor-2.9.1.jar.sha1 | 1 +
solr/licenses/pdfbox-2.0.1.jar.sha1 | 1 -
solr/licenses/pdfbox-2.0.6.jar.sha1 | 1 +
solr/licenses/pdfbox-tools-2.0.1.jar.sha1 | 1 -
solr/licenses/pdfbox-tools-2.0.6.jar.sha1 | 1 +
solr/licenses/poi-3.15-beta1.jar.sha1 | 1 -
solr/licenses/poi-3.17-beta1.jar.sha1 | 1 +
solr/licenses/poi-ooxml-3.15-beta1.jar.sha1 | 1 -
solr/licenses/poi-ooxml-3.17-beta1.jar.sha1 | 1 +
.../poi-ooxml-schemas-3.15-beta1.jar.sha1 | 1 -
.../poi-ooxml-schemas-3.17-beta1.jar.sha1 | 1 +
.../licenses/poi-scratchpad-3.15-beta1.jar.sha1 | 1 -
.../licenses/poi-scratchpad-3.17-beta1.jar.sha1 | 1 +
solr/licenses/rome-1.0.jar.sha1 | 1 -
solr/licenses/rome-1.5.1.jar.sha1 | 1 +
solr/licenses/tika-core-1.13.jar.sha1 | 1 -
solr/licenses/tika-core-1.16.jar.sha1 | 1 +
solr/licenses/tika-java7-1.13.jar.sha1 | 1 -
solr/licenses/tika-java7-1.16.jar.sha1 | 1 +
solr/licenses/tika-parsers-1.13.jar.sha1 | 1 -
solr/licenses/tika-parsers-1.16.jar.sha1 | 1 +
solr/licenses/tika-xmp-1.13.jar.sha1 | 1 -
solr/licenses/tika-xmp-1.16.jar.sha1 | 1 +
solr/licenses/xz-1.5.jar.sha1 | 1 -
solr/licenses/xz-1.6.jar.sha1 | 1 +
solr/server/solr/README.txt | 6 +-
.../configsets/_default/conf/managed-schema | 5 +-
.../configsets/_default/conf/solrconfig.xml | 23 -
.../conf/managed-schema | 5 +-
.../conf/solrconfig.xml | 23 -
solr/site/index.xsl | 3 +-
solr/site/quickstart.mdtext | 612 -
solr/solr-ref-guide/build.xml | 5 +
solr/solr-ref-guide/src/_includes/head.html | 2 +-
solr/solr-ref-guide/src/_includes/sidebar.html | 6 +-
solr/solr-ref-guide/src/_layouts/default.html | 4 +-
solr/solr-ref-guide/src/_layouts/page.html | 9 +-
.../solr-ref-guide/src/_layouts/page_print.html | 2 +-
solr/solr-ref-guide/src/a-quick-overview.adoc | 2 -
solr/solr-ref-guide/src/about-filters.adoc | 2 -
solr/solr-ref-guide/src/about-this-guide.adoc | 6 +-
solr/solr-ref-guide/src/about-tokenizers.adoc | 6 +-
...adding-custom-plugins-in-solrcloud-mode.adoc | 2 -
solr/solr-ref-guide/src/analysis-screen.adoc | 2 -
solr/solr-ref-guide/src/analyzers.adoc | 4 +-
...uthentication-and-authorization-plugins.adoc | 2 -
.../src/basic-authentication-plugin.adoc | 6 +-
solr/solr-ref-guide/src/blob-store-api.adoc | 7 +-
solr/solr-ref-guide/src/blockjoin-faceting.adoc | 2 -
.../solr-ref-guide/src/charfilterfactories.adoc | 2 -
.../src/choosing-an-output-format.adoc | 2 -
solr/solr-ref-guide/src/client-api-lineup.adoc | 2 -
solr/solr-ref-guide/src/client-apis.adoc | 2 -
solr/solr-ref-guide/src/cloud-screens.adoc | 2 -
solr/solr-ref-guide/src/codec-factory.adoc | 2 -
.../src/collapse-and-expand-results.adoc | 24 +-
.../src/collection-specific-tools.adoc | 2 -
solr/solr-ref-guide/src/collections-api.adoc | 69 +-
.../src/collections-core-admin.adoc | 2 -
.../combining-distribution-and-replication.adoc | 2 -
.../src/command-line-utilities.adoc | 8 +-
.../src/common-query-parameters.adoc | 8 +-
solr/solr-ref-guide/src/config-api.adoc | 14 +-
solr/solr-ref-guide/src/config-sets.adoc | 2 -
solr/solr-ref-guide/src/configsets-api.adoc | 13 +-
solr/solr-ref-guide/src/configuration-apis.adoc | 2 -
.../solr-ref-guide/src/configuring-logging.adoc | 6 +-
.../src/configuring-solrconfig-xml.adoc | 2 -
solr/solr-ref-guide/src/content-streams.adoc | 2 -
solr/solr-ref-guide/src/copying-fields.adoc | 4 +-
.../solr-ref-guide/src/core-specific-tools.adoc | 2 -
solr/solr-ref-guide/src/coreadmin-api.adoc | 6 +-
.../src/cross-data-center-replication-cdcr.adoc | 2 -
solr/solr-ref-guide/src/css/ref-guide.css | 2 +-
...adir-and-directoryfactory-in-solrconfig.adoc | 4 +-
solr/solr-ref-guide/src/dataimport-screen.adoc | 2 -
solr/solr-ref-guide/src/de-duplication.adoc | 2 -
.../src/defining-core-properties.adoc | 2 -
solr/solr-ref-guide/src/defining-fields.adoc | 2 -
.../src/deployment-and-operations.adoc | 36 +
.../detecting-languages-during-indexing.adoc | 2 -
.../src/distributed-requests.adoc | 2 -
.../distributed-search-with-index-sharding.adoc | 4 +-
.../src/documents-fields-and-schema-design.adoc | 2 -
solr/solr-ref-guide/src/documents-screen.adoc | 2 -
solr/solr-ref-guide/src/docvalues.adoc | 6 +-
solr/solr-ref-guide/src/dynamic-fields.adoc | 2 -
solr/solr-ref-guide/src/enabling-ssl.adoc | 22 +-
solr/solr-ref-guide/src/errata.adoc | 6 +-
.../src/exporting-result-sets.adoc | 2 -
solr/solr-ref-guide/src/faceting.adoc | 12 +-
.../src/field-properties-by-use-case.adoc | 5 +-
.../field-type-definitions-and-properties.adoc | 8 +-
.../src/field-types-included-with-solr.adoc | 2 -
solr/solr-ref-guide/src/files-screen.adoc | 2 -
.../solr-ref-guide/src/filter-descriptions.adoc | 8 +-
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 2 -
solr/solr-ref-guide/src/function-queries.adoc | 35 +-
solr/solr-ref-guide/src/further-assistance.adoc | 2 -
solr/solr-ref-guide/src/getting-assistance.adoc | 2 -
.../src/getting-started-with-solrcloud.adoc | 4 +-
solr/solr-ref-guide/src/getting-started.adoc | 18 +-
solr/solr-ref-guide/src/graph-traversal.adoc | 2 -
.../src/hadoop-authentication-plugin.adoc | 2 -
solr/solr-ref-guide/src/highlighting.adoc | 8 +-
.../solr-ref-guide/src/how-solrcloud-works.adoc | 2 -
solr/solr-ref-guide/src/how-to-contribute.adoc | 4 +-
.../solr-tutorial/tutorial-add-copy-field.png | Bin 123194 -> 93190 bytes
.../images/solr-tutorial/tutorial-add-field.png | Bin 212142 -> 110529 bytes
.../src/implicit-requesthandlers.adoc | 23 +-
solr/solr-ref-guide/src/index-replication.adoc | 8 +-
solr/solr-ref-guide/src/index.adoc | 12 +-
.../src/indexconfig-in-solrconfig.adoc | 4 +-
.../src/indexing-and-basic-data-operations.adoc | 4 +-
solr/solr-ref-guide/src/indexupgrader-tool.adoc | 17 +-
.../src/initparams-in-solrconfig.adoc | 4 +-
solr/solr-ref-guide/src/installing-solr.adoc | 4 +-
.../src/introduction-to-client-apis.adoc | 2 -
...ntroduction-to-scaling-and-distribution.adoc | 2 -
.../src/introduction-to-solr-indexing.adoc | 2 -
solr/solr-ref-guide/src/java-properties.adoc | 2 -
solr/solr-ref-guide/src/json-query-dsl.adoc | 170 +
solr/solr-ref-guide/src/json-request-api.adoc | 164 +
solr/solr-ref-guide/src/jvm-settings.adoc | 2 -
.../src/kerberos-authentication-plugin.adoc | 6 +-
solr/solr-ref-guide/src/language-analysis.adoc | 6 +-
solr/solr-ref-guide/src/learning-to-rank.adoc | 58 +-
.../src/legacy-scaling-and-distribution.adoc | 2 -
.../src/lib-directives-in-solrconfig.adoc | 2 -
.../src/local-parameters-in-queries.adoc | 2 -
solr/solr-ref-guide/src/logging.adoc | 2 -
.../major-changes-from-solr-5-to-solr-6.adoc | 2 -
.../src/major-changes-in-solr-7.adoc | 14 +-
.../src/making-and-restoring-backups.adoc | 19 +-
solr/solr-ref-guide/src/managed-resources.adoc | 12 +-
solr/solr-ref-guide/src/managing-solr.adoc | 40 -
.../src/mbean-request-handler.adoc | 15 +-
solr/solr-ref-guide/src/merging-indexes.adoc | 2 -
.../src/meta-docs/asciidoc-syntax.adoc | 33 +-
solr/solr-ref-guide/src/meta-docs/jekyll.adoc | 13 +-
solr/solr-ref-guide/src/metrics-reporting.adoc | 245 +-
solr/solr-ref-guide/src/monitoring-solr.adoc | 35 +
solr/solr-ref-guide/src/morelikethis.adoc | 2 -
.../src/near-real-time-searching.adoc | 127 +-
solr/solr-ref-guide/src/other-parsers.adoc | 65 +-
.../src/other-schema-elements.adoc | 2 -
...w-of-documents-fields-and-schema-design.adoc | 2 -
.../src/overview-of-searching-in-solr.adoc | 4 +-
.../src/overview-of-the-solr-admin-ui.adoc | 2 -
.../src/pagination-of-results.adoc | 4 +-
.../src/parallel-sql-interface.adoc | 4 +-
.../solr-ref-guide/src/parameter-reference.adoc | 2 -
.../src/pdf/SolrRefGuide-all.adoc | 1 +
.../src/performance-statistics-reference.adoc | 162 +-
solr/solr-ref-guide/src/phonetic-matching.adoc | 2 -
solr/solr-ref-guide/src/ping.adoc | 4 +-
.../src/plugins-stats-screen.adoc | 2 -
solr/solr-ref-guide/src/post-tool.adoc | 2 -
.../src/putting-the-pieces-together.adoc | 4 +-
solr/solr-ref-guide/src/query-re-ranking.adoc | 4 +-
solr/solr-ref-guide/src/query-screen.adoc | 2 -
.../src/query-settings-in-solrconfig.adoc | 4 +-
.../src/query-syntax-and-parsing.adoc | 2 -
solr/solr-ref-guide/src/realtime-get.adoc | 2 -
solr/solr-ref-guide/src/relevance.adoc | 2 -
solr/solr-ref-guide/src/replication-screen.adoc | 2 -
.../src/request-parameters-api.adoc | 4 +-
.../src/requestdispatcher-in-solrconfig.adoc | 21 +-
...lers-and-searchcomponents-in-solrconfig.adoc | 2 -
solr/solr-ref-guide/src/response-writers.adoc | 30 +-
solr/solr-ref-guide/src/result-clustering.adoc | 4 +-
solr/solr-ref-guide/src/result-grouping.adoc | 2 -
.../src/rule-based-authorization-plugin.adoc | 29 +-
.../src/rule-based-replica-placement.adoc | 8 +-
.../src/running-solr-on-hdfs.adoc | 7 +-
.../src/running-your-analyzer.adoc | 2 -
solr/solr-ref-guide/src/schema-api.adoc | 10 +-
.../src/schema-browser-screen.adoc | 2 -
...schema-factory-definition-in-solrconfig.adoc | 4 +-
solr/solr-ref-guide/src/schemaless-mode.adoc | 6 +-
solr/solr-ref-guide/src/searching.adoc | 6 +-
solr/solr-ref-guide/src/securing-solr.adoc | 2 -
solr/solr-ref-guide/src/segments-info.adoc | 2 -
...tting-up-an-external-zookeeper-ensemble.adoc | 2 -
.../shards-and-indexing-data-in-solrcloud.adoc | 4 +-
.../src/solr-configuration-files.adoc | 2 -
.../src/solr-control-script-reference.adoc | 23 +-
.../src/solr-cores-and-solr-xml.adoc | 2 -
solr/solr-ref-guide/src/solr-field-types.adoc | 2 -
solr/solr-ref-guide/src/solr-glossary.adoc | 4 +-
.../src/solr-jdbc-apache-zeppelin.adoc | 2 -
.../src/solr-jdbc-dbvisualizer.adoc | 2 -
.../src/solr-jdbc-python-jython.adoc | 2 -
solr/solr-ref-guide/src/solr-jdbc-r.adoc | 2 -
.../src/solr-jdbc-squirrel-sql.adoc | 2 -
solr/solr-ref-guide/src/solr-plugins.adoc | 2 -
.../src/solr-system-requirements.adoc | 2 -
solr/solr-ref-guide/src/solr-tutorial.adoc | 12 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 27 +-
.../src/solrcloud-autoscaling-api.adoc | 215 +-
...solrcloud-autoscaling-auto-add-replicas.adoc | 73 +
.../solrcloud-autoscaling-fault-tolerance.adoc | 59 +
.../src/solrcloud-autoscaling-listeners.adoc | 188 +
.../src/solrcloud-autoscaling-overview.adoc | 66 +-
...olrcloud-autoscaling-policy-preferences.adoc | 27 +-
.../solrcloud-autoscaling-trigger-actions.adoc | 44 +
.../src/solrcloud-autoscaling-triggers.adoc | 108 +
.../src/solrcloud-autoscaling.adoc | 15 +-
.../solrcloud-configuration-and-parameters.adoc | 2 -
...rcloud-query-routing-and-read-tolerance.adoc | 8 +-
...olrcloud-recoveries-and-write-tolerance.adoc | 2 -
.../src/solrcloud-resilience.adoc | 2 -
...lrcloud-with-legacy-configuration-files.adoc | 2 -
solr/solr-ref-guide/src/solrcloud.adoc | 2 -
solr/solr-ref-guide/src/spatial-search.adoc | 87 +-
solr/solr-ref-guide/src/spell-checking.adoc | 6 +-
.../src/statistical-programming.adoc | 261 +-
.../src/stream-decorator-reference.adoc | 1214 +
solr/solr-ref-guide/src/stream-decorators.adoc | 1216 -
.../src/stream-evaluator-reference.adoc | 1787 +
solr/solr-ref-guide/src/stream-evaluators.adoc | 1030 -
solr/solr-ref-guide/src/stream-screen.adoc | 2 -
.../src/stream-source-reference.adoc | 537 +
solr/solr-ref-guide/src/stream-sources.adoc | 540 -
.../src/streaming-expressions.adoc | 11 +-
solr/solr-ref-guide/src/suggester.adoc | 4 +-
.../src/taking-solr-to-production.adoc | 2 -
.../src/the-dismax-query-parser.adoc | 2 -
.../src/the-extended-dismax-query-parser.adoc | 7 +-
.../src/the-query-elevation-component.adoc | 26 +-
.../src/the-standard-query-parser.adoc | 8 +-
.../solr-ref-guide/src/the-stats-component.adoc | 12 +-
.../src/the-term-vector-component.adoc | 11 +-
.../solr-ref-guide/src/the-terms-component.adoc | 20 +-
.../src/the-well-configured-solr-instance.adoc | 6 +-
solr/solr-ref-guide/src/thread-dump.adoc | 2 -
solr/solr-ref-guide/src/tokenizers.adoc | 7 +-
.../transforming-and-indexing-custom-json.adoc | 12 +-
.../src/transforming-result-documents.adoc | 14 +-
solr/solr-ref-guide/src/uima-integration.adoc | 2 -
...anding-analyzers-tokenizers-and-filters.adoc | 2 -
.../src/update-request-processors.adoc | 51 +-
.../src/updatehandlers-in-solrconfig.adoc | 21 +-
.../src/updating-parts-of-documents.adoc | 8 +-
.../src/upgrading-a-solr-cluster.adoc | 20 +-
.../src/uploading-data-with-index-handlers.adoc | 8 +-
...g-data-with-solr-cell-using-apache-tika.adoc | 14 +-
...store-data-with-the-data-import-handler.adoc | 38 +-
solr/solr-ref-guide/src/using-javascript.adoc | 2 -
.../solr-ref-guide/src/using-jmx-with-solr.adoc | 72 +-
solr/solr-ref-guide/src/using-python.adoc | 15 +-
.../src/using-solr-from-ruby.adoc | 2 -
solr/solr-ref-guide/src/using-solrj.adoc | 180 +-
...-the-solr-administration-user-interface.adoc | 2 -
...zookeeper-to-manage-configuration-files.adoc | 2 -
solr/solr-ref-guide/src/v2-api.adoc | 23 +-
.../src/velocity-response-writer.adoc | 4 +-
solr/solr-ref-guide/src/velocity-search-ui.adoc | 2 -
...king-with-currencies-and-exchange-rates.adoc | 4 +-
solr/solr-ref-guide/src/working-with-dates.adoc | 22 +-
.../src/working-with-enum-fields.adoc | 2 -
...rking-with-external-files-and-processes.adoc | 6 +-
.../src/zookeeper-access-control.adoc | 10 +-
.../tools/BuildNavAndPDFBody.java | 64 +-
.../client/solrj/cloud/DistributedQueue.java | 13 +-
.../solrj/cloud/DistributedQueueFactory.java | 28 +
.../cloud/autoscaling/AddReplicaSuggester.java | 5 +-
.../client/solrj/cloud/autoscaling/Clause.java | 195 +-
.../autoscaling/DelegatingCloudManager.java | 8 +-
.../DelegatingClusterStateProvider.java | 18 +-
.../DelegatingNodeStateProvider.java | 2 +-
.../cloud/autoscaling/DistribStateManager.java | 4 +-
.../cloud/autoscaling/MoveReplicaSuggester.java | 16 +-
.../cloud/autoscaling/NodeStateProvider.java | 5 +-
.../solrj/cloud/autoscaling/NoneSuggester.java | 6 +-
.../client/solrj/cloud/autoscaling/Operand.java | 37 +-
.../client/solrj/cloud/autoscaling/Policy.java | 233 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 53 +-
.../solrj/cloud/autoscaling/ReplicaInfo.java | 39 +-
.../client/solrj/cloud/autoscaling/Row.java | 27 +-
.../cloud/autoscaling/SolrCloudManager.java | 23 +-
.../solrj/cloud/autoscaling/Suggester.java | 267 +
.../solrj/cloud/autoscaling/Suggestion.java | 302 +
.../autoscaling/TriggerEventProcessorStage.java | 4 +-
.../solrj/cloud/autoscaling/VersionedData.java | 8 +-
.../solrj/cloud/autoscaling/Violation.java | 124 +
.../solr/client/solrj/cloud/package-info.java | 23 +
.../client/solrj/impl/BinaryRequestWriter.java | 83 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 219 +-
.../client/solrj/impl/ClusterStateProvider.java | 14 +-
.../solrj/impl/HttpClusterStateProvider.java | 73 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 206 +-
.../client/solrj/impl/SolrClientBuilder.java | 14 +-
.../solrj/impl/SolrClientCloudManager.java | 1 +
.../solrj/impl/SolrClientNodeStateProvider.java | 83 +-
.../impl/ZkClientClusterStateProvider.java | 19 +-
.../solrj/impl/ZkDistribStateManager.java | 4 -
.../io/eval/BetaDistributionEvaluator.java | 48 +
.../io/eval/BinomialCoefficientEvaluator.java | 46 +
.../io/eval/ConstantDistributionEvaluator.java | 44 +
.../eval/EnumeratedDistributionEvaluator.java | 19 +-
.../eval/ExponentialMovingAverageEvaluator.java | 99 +
.../solrj/io/eval/FactorialEvaluator.java | 54 +
.../solrj/io/eval/FieldValueEvaluator.java | 2 +
.../io/eval/GammaDistributionEvaluator.java | 48 +
.../solrj/io/eval/HarmonicFitEvaluator.java | 85 +
.../client/solrj/io/eval/LoessEvaluator.java | 83 +
.../io/eval/LogNormalDistributionEvaluator.java | 48 +
.../solr/client/solrj/io/eval/Matrix.java | 63 +
.../client/solrj/io/eval/MatrixEvaluator.java | 52 +
.../client/solrj/io/eval/MeanEvaluator.java | 57 +
.../client/solrj/io/eval/ModeEvaluator.java | 64 +
.../solrj/io/eval/MonteCarloEvaluator.java | 76 +
.../solrj/io/eval/MovingMedianEvaluator.java | 68 +
.../io/eval/PolyFitDerivativeEvaluator.java | 104 +
.../client/solrj/io/eval/PolyFitEvaluator.java | 102 +
.../solrj/io/eval/RecursiveEvaluator.java | 3 +-
.../client/solrj/io/eval/SampleEvaluator.java | 30 +-
.../solrj/io/eval/TransposeEvaluator.java | 52 +
.../client/solrj/io/eval/UnitEvaluator.java | 77 +
.../io/eval/WeibullDistributionEvaluator.java | 48 +
.../io/eval/ZipFDistributionEvaluator.java | 48 +
.../solrj/io/graph/GatherNodesStream.java | 5 +-
.../solrj/io/graph/ShortestPathStream.java | 3 +
.../client/solrj/io/stream/BiJoinStream.java | 1 +
.../solrj/io/stream/CalculatorStream.java | 5 +-
.../solrj/io/stream/CartesianProductStream.java | 5 +-
.../solr/client/solrj/io/stream/CellStream.java | 5 +-
.../client/solrj/io/stream/CloudSolrStream.java | 39 +-
.../client/solrj/io/stream/CommitStream.java | 1 +
.../solrj/io/stream/ComplementStream.java | 1 +
.../client/solrj/io/stream/DaemonStream.java | 6 +-
.../solr/client/solrj/io/stream/EchoStream.java | 5 +-
.../solr/client/solrj/io/stream/EvalStream.java | 5 +-
.../client/solrj/io/stream/ExceptionStream.java | 3 +
.../client/solrj/io/stream/ExecutorStream.java | 3 +-
.../client/solrj/io/stream/FacetStream.java | 1 +
.../io/stream/FeaturesSelectionStream.java | 3 +
.../client/solrj/io/stream/FetchStream.java | 1 +
.../solr/client/solrj/io/stream/GetStream.java | 5 +-
.../client/solrj/io/stream/HashJoinStream.java | 3 +-
.../client/solrj/io/stream/HavingStream.java | 3 +-
.../client/solrj/io/stream/InnerJoinStream.java | 1 +
.../client/solrj/io/stream/IntersectStream.java | 1 +
.../solr/client/solrj/io/stream/JDBCStream.java | 1 +
.../solr/client/solrj/io/stream/JoinStream.java | 5 +-
.../solr/client/solrj/io/stream/KnnStream.java | 5 +-
.../solrj/io/stream/LeftOuterJoinStream.java | 1 +
.../solr/client/solrj/io/stream/LetStream.java | 32 +-
.../solr/client/solrj/io/stream/ListStream.java | 5 +-
.../client/solrj/io/stream/MergeStream.java | 3 +-
.../client/solrj/io/stream/ModelStream.java | 1 +
.../solr/client/solrj/io/stream/NullStream.java | 3 +-
.../solrj/io/stream/OuterHashJoinStream.java | 3 +-
.../client/solrj/io/stream/ParallelStream.java | 3 +-
.../solr/client/solrj/io/stream/PlotStream.java | 5 +-
.../client/solrj/io/stream/PriorityStream.java | 3 +-
.../client/solrj/io/stream/PushBackStream.java | 3 +-
.../client/solrj/io/stream/RandomStream.java | 1 +
.../solr/client/solrj/io/stream/RankStream.java | 3 +-
.../client/solrj/io/stream/ReducerStream.java | 3 +-
.../client/solrj/io/stream/RollupStream.java | 5 +-
.../solrj/io/stream/ScoreNodesStream.java | 1 +
.../client/solrj/io/stream/SelectStream.java | 3 +-
.../client/solrj/io/stream/ShuffleStream.java | 3 +
.../solrj/io/stream/SignificantTermsStream.java | 3 +
.../solr/client/solrj/io/stream/SolrStream.java | 5 +-
.../solr/client/solrj/io/stream/SortStream.java | 3 +-
.../solr/client/solrj/io/stream/SqlStream.java | 10 +-
.../client/solrj/io/stream/StatsStream.java | 3 +
.../client/solrj/io/stream/TextLogitStream.java | 3 +
.../solrj/io/stream/TimeSeriesStream.java | 3 +
.../client/solrj/io/stream/TopicStream.java | 3 +
.../solr/client/solrj/io/stream/TupStream.java | 5 +-
.../client/solrj/io/stream/TupleStream.java | 49 +-
.../client/solrj/io/stream/UniqueStream.java | 3 +-
.../client/solrj/io/stream/UpdateStream.java | 1 +
.../io/stream/expr/StreamExpressionParser.java | 29 +
.../solrj/io/stream/expr/StreamFactory.java | 6 +
.../solrj/request/CollectionAdminRequest.java | 12 +-
.../solrj/request/CollectionApiMapping.java | 2 +
.../client/solrj/request/RequestWriter.java | 40 +-
.../solr/client/solrj/request/V2Request.java | 42 +-
.../solrj/request/schema/SchemaRequest.java | 25 +-
.../solrj/request/schema/package-info.java | 4 +-
.../solrj/response/CollectionAdminResponse.java | 7 +
.../solrj/response/schema/SchemaResponse.java | 2 +-
.../solrj/response/schema/package-info.java | 4 +-
.../java/org/apache/solr/common/MapWriter.java | 1 -
.../org/apache/solr/common/SolrCloseable.java | 30 +
.../apache/solr/common/SolrCloseableLatch.java | 65 +
.../org/apache/solr/common/cloud/Aliases.java | 127 +-
.../apache/solr/common/cloud/ClusterState.java | 9 -
.../common/cloud/CollectionStateWatcher.java | 5 +-
.../solr/common/cloud/DistributedQueue.java | 42 +
.../org/apache/solr/common/cloud/Slice.java | 24 +-
.../apache/solr/common/cloud/SolrZkClient.java | 100 +-
.../cloud/ZkClientConnectionStrategy.java | 14 +-
.../apache/solr/common/cloud/ZkOperation.java | 4 +-
.../apache/solr/common/cloud/ZkStateReader.java | 10 +-
.../solr/common/params/AutoScalingParams.java | 7 +
.../solr/common/params/CommonAdminParams.java | 4 +-
.../apache/solr/common/params/CommonParams.java | 4 +-
.../apache/solr/common/params/FacetParams.java | 5 +
.../apache/solr/common/params/SolrParams.java | 16 +-
.../org/apache/solr/common/util/StrUtils.java | 1 +
.../java/org/apache/solr/common/util/Utils.java | 19 +
.../resources/apispec/autoscaling.Commands.json | 46 +-
.../resources/apispec/autoscaling.history.json | 61 +
.../resources/apispec/collections.Commands.json | 5 +
.../collections.collection.Commands.json | 23 +
.../collections.collection.shards.Commands.json | 15 +
.../UsingSolrJRefGuideExamplesTest.java | 235 +
.../solrj/cloud/autoscaling/TestPolicy.java | 232 +-
.../solrj/impl/CloudSolrClientBuilderTest.java | 11 +
.../solrj/impl/CloudSolrClientCacheTest.java | 12 +-
.../client/solrj/impl/CloudSolrClientTest.java | 59 +
.../solr/client/solrj/io/sql/JdbcTest.java | 9 +-
.../solrj/io/stream/StreamExpressionTest.java | 593 +-
.../solr/common/cloud/SolrZkClientTest.java | 11 +
.../java/org/apache/solr/SolrTestCaseJ4.java | 34 +-
1156 files changed, 81793 insertions(+), 24689 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
index e4d6b8a,0f93a2b..0dc6011
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
@@@ -36,20 -36,19 +36,22 @@@ import java.util.stream.Stream
import org.apache.solr.api.Api;
import org.apache.solr.api.ApiBag;
+ import org.apache.solr.client.solrj.cloud.DistributedQueueFactory;
import org.apache.solr.client.solrj.cloud.autoscaling.AutoScalingConfig;
- import org.apache.solr.client.solrj.cloud.autoscaling.Cell;
import org.apache.solr.client.solrj.cloud.autoscaling.Clause;
import org.apache.solr.client.solrj.cloud.autoscaling.Policy;
+ import org.apache.solr.client.solrj.cloud.autoscaling.PolicyHelper;
import org.apache.solr.client.solrj.cloud.autoscaling.Preference;
+import org.apache.solr.client.solrj.cloud.autoscaling.Row;
+import org.apache.solr.client.solrj.cloud.autoscaling.SolrCloudManager;
import org.apache.solr.client.solrj.cloud.autoscaling.TriggerEventProcessorStage;
import org.apache.solr.client.solrj.cloud.autoscaling.TriggerEventType;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.SolrClientCloudManager;
+ import org.apache.solr.cloud.ZkDistributedQueueFactory;
import org.apache.solr.common.MapWriter;
import org.apache.solr.common.SolrException;
+import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.AutoScalingParams;
import org.apache.solr.common.params.CollectionAdminParams;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/core/src/java/org/apache/solr/cloud/autoscaling/ZkDistributedQueueFactory.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/cloud/autoscaling/ZkDistributedQueueFactory.java
index a6cb945,0000000..efb123e
mode 100644,000000..100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ZkDistributedQueueFactory.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ZkDistributedQueueFactory.java
@@@ -1,28 -1,0 +1,28 @@@
+package org.apache.solr.cloud.autoscaling;
+
+import java.io.IOException;
+
+import org.apache.solr.client.solrj.cloud.DistributedQueue;
- import org.apache.solr.client.solrj.cloud.autoscaling.SolrCloudManager;
++import org.apache.solr.client.solrj.cloud.DistributedQueueFactory;
+import org.apache.solr.cloud.ZkDistributedQueue;
+import org.apache.solr.common.cloud.SolrZkClient;
+
+/**
+ *
+ */
- public class ZkDistributedQueueFactory implements SolrCloudManager.DistributedQueueFactory {
++public class ZkDistributedQueueFactory implements DistributedQueueFactory {
+ private final SolrZkClient zkClient;
+
+ public ZkDistributedQueueFactory(SolrZkClient zkClient) {
+ this.zkClient = zkClient;
+ }
+ @Override
+ public DistributedQueue makeQueue(String path) throws IOException {
+ return new ZkDistributedQueue(zkClient, path);
+ }
+
+ @Override
+ public void removeQueue(String path) throws IOException {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingCloudManager.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingCloudManager.java
index dca67e7,05801b9..b8adeda
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingCloudManager.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DelegatingCloudManager.java
@@@ -62,4 -63,4 +63,9 @@@ public class DelegatingCloudManager imp
public byte[] httpRequest(String url, SolrRequest.METHOD method, Map<String, String> headers, String payload, int timeout, boolean followRedirects) throws IOException {
return delegate.httpRequest(url, method, headers, payload, timeout, followRedirects);
}
++
++ @Override
++ public void close() throws IOException {
++ delegate.close();
++ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DistribStateManager.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DistribStateManager.java
index 6535354,4318418..416bf90
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DistribStateManager.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DistribStateManager.java
@@@ -48,18 -48,9 +48,18 @@@ public interface DistribStateManager ex
void makePath(String path) throws AlreadyExistsException, IOException, KeeperException, InterruptedException;
+ /**
+ * Create data (leaf) node at specified path.
+ * @param path base path name of the node.
+ * @param data data to be stored.
+ * @param mode creation mode.
+ * @return actual path of the node - in case of sequential nodes this will differ from the base path because
+ * of the appended sequence number.
+ * @throws IOException
+ */
String createData(String path, byte[] data, CreateMode mode) throws AlreadyExistsException, IOException, KeeperException, InterruptedException;
- void removeData(String path, int version) throws NoSuchElementException, BadVersionException, IOException, KeeperException, InterruptedException;
- void removeData(String path, int version) throws NoSuchElementException, IOException, KeeperException, InterruptedException;
++ void removeData(String path, int version) throws NoSuchElementException, IOException, KeeperException, InterruptedException, BadVersionException;
void setData(String path, byte[] data, int version) throws BadVersionException, NoSuchElementException, IOException, KeeperException, InterruptedException;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
index 9970625,5f7281f..6f32e05
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
@@@ -28,18 -28,31 +29,33 @@@ import org.apache.solr.common.util.Util
public class ReplicaInfo implements MapWriter {
- final String name;
- final String core, collection, shard;
- final Map<String, Object> variables = new HashMap<>();
+ // private final Replica replica;
+ private final String name;
+ private String core, collection, shard;
+ private Replica.Type type;
+ private String node;
+ private Map<String, Object> variables;
+
+ public ReplicaInfo(String coll,String shard, Replica r, Map<String, Object> vals){
+ this.name = r.getName();
+ this.core = r.getCoreName();
+ this.collection = coll;
+ this.shard = shard;
+ this.type = r.getType();
+ this.variables = vals;
+ this.node = r.getNodeName();
+ }
- public ReplicaInfo(String name, String coll, String shard, Map<String, Object> vals) {
+ public ReplicaInfo(String name, String core, String coll, String shard, Replica.Type type, String node, Map<String, Object> vals) {
this.name = name;
- this.variables = vals;
+ if (vals != null) {
+ this.variables.putAll(vals);
+ }
this.collection = coll;
this.shard = shard;
- this.core = (String)vals.get("core");
+ this.type = type;
+ this.core = core;
+ this.node = node;
}
@Override
@@@ -68,9 -84,8 +84,9 @@@
}
public Replica.Type getType() {
- Object o = variables.get(ZkStateReader.REPLICA_TYPE);
+ Object o = type == null ? variables.get(ZkStateReader.REPLICA_TYPE) : type;
if (o == null) {
+ variables.put(ZkStateReader.REPLICA_TYPE, Replica.Type.NRT);
return Replica.Type.NRT;
} else if (o instanceof Replica.Type) {
return (Replica.Type)o;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SolrCloudManager.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SolrCloudManager.java
index f44118f,726c2c6..7db7d2a
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SolrCloudManager.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/SolrCloudManager.java
@@@ -50,15 -46,11 +46,4 @@@ public interface SolrCloudManager exten
SolrResponse request(SolrRequest req) throws IOException;
byte[] httpRequest(String url, SolrRequest.METHOD method, Map<String, String> headers, String payload, int timeout, boolean followRedirects) throws IOException;
--
-- // distributed queue implementation
--
-- @Override
-- default void close() {
-
- }
--
- default boolean isClosed() {
- return false;
-- }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
index d7be7fe,7048067..05e9ce7
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
@@@ -57,13 -62,15 +62,16 @@@ import static org.apache.solr.client.so
/**
*
*/
- public class SolrClientNodeStateProvider implements NodeStateProvider {
+ public class SolrClientNodeStateProvider implements NodeStateProvider, MapWriter {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ //only for debugging
+ public static SolrClientNodeStateProvider INST;
+
+
private final CloudSolrClient solrClient;
private final ZkStateReader zkStateReader;
- private final Map<String, Map<String, Map<String, List<ReplicaInfo>>>> data = new HashMap<>();
+ private final Map<String, Map<String, Map<String, List<ReplicaInfo>>>> nodeVsCollectionVsShardVsReplicaInfo = new HashMap<>();
private Map<String, Object> snitchSession = new HashMap<>();
private Map<String, Map> nodeVsTags = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ZkDistribStateManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75b2a888/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
index 1957afc,503ba75..78aac3d
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
@@@ -1126,6 -1129,6 +1129,11 @@@ public class TestPolicy extends SolrTes
private SolrCloudManager getSolrCloudManager(final Map<String, Map> nodeValues, String clusterState) {
return new SolrCloudManager() {
@Override
++ public void close() throws IOException {
++
++ }
++
++ @Override
public ClusterStateProvider getClusterStateProvider() {
return new DelegatingClusterStateProvider(null) {
@Override