You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2018/01/23 12:35:36 UTC
[1/2] lucene-solr:master: LUCENE-8133: Increase MINIMUM_RESOLUTION to
1.5e-12.
Repository: lucene-solr
Updated Branches:
refs/heads/master 3450d71d1 -> 653935bbd
LUCENE-8133: Increase MINIMUM_RESOLUTION to 1.5e-12.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a7a28ec1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a7a28ec1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a7a28ec1
Branch: refs/heads/master
Commit: a7a28ec170a0e1afdff343a1cfe1489541e1c928
Parents: bdfbe43
Author: Karl Wright <Da...@gmail.com>
Authored: Tue Jan 23 07:34:49 2018 -0500
Committer: Karl Wright <Da...@gmail.com>
Committed: Tue Jan 23 07:34:49 2018 -0500
----------------------------------------------------------------------
.../lucene/spatial3d/geom/SidedPlane.java | 1 +
.../apache/lucene/spatial3d/geom/Vector.java | 2 +-
.../lucene/spatial3d/geom/GeoPolygonTest.java | 21 +++++++++++++++++++-
3 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7a28ec1/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/SidedPlane.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/SidedPlane.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/SidedPlane.java
index 8319e6f..404135a 100755
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/SidedPlane.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/SidedPlane.java
@@ -190,6 +190,7 @@ public class SidedPlane extends Plane implements Membership {
@Override
public boolean isWithin(double x, double y, double z) {
double evalResult = evaluate(x, y, z);
+ //System.out.println(Math.abs(evalResult));
if (Math.abs(evalResult) < MINIMUM_RESOLUTION)
return true;
double sigNum = Math.signum(evalResult);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7a28ec1/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Vector.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Vector.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Vector.java
index 852cac4..8fad521 100755
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Vector.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/Vector.java
@@ -27,7 +27,7 @@ public class Vector {
* Values that are all considered to be essentially zero have a magnitude
* less than this.
*/
- public static final double MINIMUM_RESOLUTION = 1.0e-12;
+ public static final double MINIMUM_RESOLUTION = 1.5e-12;
/**
* Angular version of minimum resolution.
*/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7a28ec1/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPolygonTest.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPolygonTest.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPolygonTest.java
index 00d7899..8892111 100755
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPolygonTest.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoPolygonTest.java
@@ -1029,5 +1029,24 @@ shape:
GeoPolygon polygon2 = GeoPolygonFactory.makeGeoConvexPolygon(PlanetModel.SPHERE,points,Collections.singletonList(hole));
assertEquals(polygon,polygon2);
}
-
+
+ @Test
+ public void testLUCENE8133() {
+ GeoPoint point1 = new GeoPoint(PlanetModel.SPHERE, Geo3DUtil.fromDegrees(-23.434456), Geo3DUtil.fromDegrees(14.459204));
+ GeoPoint point2 = new GeoPoint(PlanetModel.SPHERE, Geo3DUtil.fromDegrees(-23.43394), Geo3DUtil.fromDegrees(14.459206));
+ GeoPoint check = new GeoPoint(PlanetModel.SPHERE, Geo3DUtil.fromDegrees(-23.434067), Geo3DUtil.fromDegrees(14.458927));
+ SidedPlane plane = new SidedPlane(check, point1, point2);
+ assertTrue(plane.isWithin(check));
+ assertTrue(plane.isWithin(point1));
+ assertTrue(plane.isWithin(point2));
+ //POLYGON((14.459204 -23.434456, 14.459206 -23.43394,14.458647 -23.434196, 14.458646 -23.434452,14.459204 -23.434456))
+ List<GeoPoint> points = new ArrayList<>();
+ points.add(new GeoPoint(PlanetModel.SPHERE, Geo3DUtil.fromDegrees(-23.434456), Geo3DUtil.fromDegrees(14.459204)));
+ points.add(new GeoPoint(PlanetModel.SPHERE, Geo3DUtil.fromDegrees( -23.43394), Geo3DUtil.fromDegrees(14.459206)));
+ points.add(new GeoPoint(PlanetModel.SPHERE, Geo3DUtil.fromDegrees(-23.434196), Geo3DUtil.fromDegrees(14.458647)));
+ points.add(new GeoPoint(PlanetModel.SPHERE, Geo3DUtil.fromDegrees(-23.434452), Geo3DUtil.fromDegrees(14.458646)));
+ GeoPolygonFactory.makeGeoPolygon(PlanetModel.SPHERE, points);
+ }
+
+
}
[2/2] lucene-solr:master: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
Posted by kw...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/653935bb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/653935bb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/653935bb
Branch: refs/heads/master
Commit: 653935bbdfd70fa9490f8c363ffcf9832d3141a5
Parents: a7a28ec 3450d71
Author: Karl Wright <Da...@gmail.com>
Authored: Tue Jan 23 07:35:14 2018 -0500
Committer: Karl Wright <Da...@gmail.com>
Committed: Tue Jan 23 07:35:14 2018 -0500
----------------------------------------------------------------------
build.xml | 1 +
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/idea/solr/contrib/langid/langid.iml | 1 +
dev-tools/scripts/reproduceJenkinsFailures.py | 215 ++++
lucene/CHANGES.txt | 48 +
lucene/MIGRATE.txt | 12 +-
.../analysis/commongrams/CommonGramsFilter.java | 3 -
.../commongrams/CommonGramsQueryFilter.java | 3 -
.../compound/hyphenation/HyphenationTree.java | 4 +-
.../miscellaneous/FingerprintFilter.java | 3 -
.../miscellaneous/HyphenatedWordsFilter.java | 6 -
.../RemoveDuplicatesTokenFilter.java | 6 -
.../lucene/analysis/util/UnicodeProps.java | 116 +-
.../compound/TestCompoundWordTokenFilter.java | 15 +
.../compound/hyphenation-LUCENE-8124.xml | 61 ++
lucene/analysis/icu/src/data/uax29/Default.rbbi | 96 +-
.../icu/src/data/utr30/DiacriticFolding.txt | 11 +-
.../icu/src/data/utr30/NativeDigitFolding.txt | 10 +
lucene/analysis/icu/src/data/utr30/nfc.txt | 13 +-
lucene/analysis/icu/src/data/utr30/nfkc.txt | 4 +-
lucene/analysis/icu/src/data/utr30/nfkc_cf.txt | 10 +-
.../lucene/analysis/icu/ICUFoldingFilter.java | 28 +-
.../analysis/icu/ICUFoldingFilterFactory.java | 20 +-
.../icu/segmentation/BreakIteratorWrapper.java | 190 ++--
.../segmentation/CompositeBreakIterator.java | 2 +-
.../segmentation/DefaultICUTokenizerConfig.java | 18 +-
.../analysis/icu/segmentation/ICUTokenizer.java | 8 +-
.../icu/segmentation/ICUTokenizerConfig.java | 9 +-
.../icu/segmentation/ICUTokenizerFactory.java | 4 +-
lucene/analysis/icu/src/java/overview.html | 2 +-
.../analysis/icu/segmentation/Default.brk | Bin 36768 -> 54488 bytes
.../icu/segmentation/MyanmarSyllable.brk | Bin 20744 -> 21976 bytes
.../org/apache/lucene/analysis/icu/utr30.nrm | Bin 55184 -> 59056 bytes
.../icu/TestICUFoldingFilterFactory.java | 21 +-
.../icu/segmentation/TestICUTokenizer.java | 99 +-
.../icu/segmentation/TestICUTokenizerCJK.java | 9 +
.../analysis/icu/GenerateUTR30DataFiles.java | 6 +-
.../ja/JapaneseIterationMarkCharFilter.java | 6 -
.../index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.7.2.1-cfs.zip | Bin 0 -> 15605 bytes
.../apache/lucene/index/index.7.2.1-nocfs.zip | Bin 0 -> 15606 bytes
.../org/apache/lucene/index/sorted.7.2.1.zip | Bin 0 -> 93388 bytes
.../lucene/classification/BM25NBClassifier.java | 9 -
.../BooleanPerceptronClassifier.java | 9 -
.../classification/KNearestFuzzyClassifier.java | 11 +-
.../KNearestNeighborClassifier.java | 11 +-
.../SimpleNaiveBayesClassifier.java | 9 -
.../KNearestNeighborDocumentClassifier.java | 9 -
.../SimpleNaiveBayesDocumentClassifier.java | 9 -
.../classification/utils/NearestFuzzyQuery.java | 12 +-
lucene/common-build.xml | 3 +-
.../analysis/standard/StandardTokenizer.java | 5 +-
.../codecs/blocktree/IntersectTermsEnum.java | 7 +-
.../org/apache/lucene/index/TermContext.java | 197 ----
.../org/apache/lucene/index/TermStates.java | 234 ++++
.../apache/lucene/search/BlendedTermQuery.java | 28 +-
.../org/apache/lucene/search/BooleanWeight.java | 2 +-
.../apache/lucene/search/ExactPhraseScorer.java | 7 +-
.../org/apache/lucene/search/IndexSearcher.java | 49 +-
.../org/apache/lucene/search/LeafSimScorer.java | 73 ++
.../apache/lucene/search/MultiPhraseQuery.java | 51 +-
.../apache/lucene/search/MultiTermQuery.java | 8 +-
.../MultiTermQueryConstantScoreWrapper.java | 8 +-
.../org/apache/lucene/search/PhraseQuery.java | 31 +-
.../apache/lucene/search/ScoringRewrite.java | 14 +-
.../lucene/search/SloppyPhraseScorer.java | 7 +-
.../org/apache/lucene/search/SynonymQuery.java | 49 +-
.../lucene/search/TermCollectingRewrite.java | 4 +-
.../apache/lucene/search/TermInSetQuery.java | 8 +-
.../org/apache/lucene/search/TermQuery.java | 71 +-
.../org/apache/lucene/search/TermScorer.java | 11 +-
.../apache/lucene/search/TopTermsRewrite.java | 10 +-
.../org/apache/lucene/search/package-info.java | 4 +-
.../lucene/search/similarities/Axiomatic.java | 16 +-
.../search/similarities/BM25Similarity.java | 137 +--
.../lucene/search/similarities/BasicStats.java | 2 +-
.../search/similarities/BooleanSimilarity.java | 50 +-
.../search/similarities/DFISimilarity.java | 12 +-
.../search/similarities/DFRSimilarity.java | 14 +-
.../search/similarities/IBSimilarity.java | 14 +-
.../similarities/LMDirichletSimilarity.java | 16 +-
.../similarities/LMJelinekMercerSimilarity.java | 16 +-
.../search/similarities/LMSimilarity.java | 2 +-
.../search/similarities/MultiSimilarity.java | 47 +-
.../similarities/PerFieldSimilarityWrapper.java | 22 +-
.../lucene/search/similarities/Similarity.java | 140 +--
.../search/similarities/SimilarityBase.java | 92 +-
.../search/similarities/TFIDFSimilarity.java | 124 +--
.../lucene/search/spans/SpanContainQuery.java | 10 +-
.../search/spans/SpanContainingQuery.java | 10 +-
.../search/spans/SpanMultiTermQueryWrapper.java | 6 +-
.../lucene/search/spans/SpanNearQuery.java | 14 +-
.../lucene/search/spans/SpanNotQuery.java | 12 +-
.../apache/lucene/search/spans/SpanOrQuery.java | 12 +-
.../search/spans/SpanPositionCheckQuery.java | 12 +-
.../apache/lucene/search/spans/SpanQuery.java | 18 +-
.../apache/lucene/search/spans/SpanScorer.java | 6 +-
.../lucene/search/spans/SpanTermQuery.java | 36 +-
.../apache/lucene/search/spans/SpanWeight.java | 42 +-
.../lucene/search/spans/SpanWithinQuery.java | 10 +-
.../apache/lucene/search/spans/TermSpans.java | 4 +-
.../apache/lucene/index/TestCustomNorms.java | 7 +-
.../apache/lucene/index/TestCustomTermFreq.java | 9 +-
.../lucene/index/TestFieldInvertState.java | 8 +-
.../apache/lucene/index/TestIndexSorting.java | 9 +-
.../lucene/index/TestMaxTermFrequency.java | 17 +-
.../test/org/apache/lucene/index/TestNorms.java | 7 +-
.../org/apache/lucene/index/TestTermStates.java | 36 +
.../lucene/index/TestUniqueTermCount.java | 8 +-
.../apache/lucene/search/JustCompileSearch.java | 7 +-
.../org/apache/lucene/search/TestBoolean2.java | 4 +-
.../search/TestBooleanQueryVisitSubscorers.java | 16 +-
.../lucene/search/TestBooleanRewrites.java | 2 +-
.../apache/lucene/search/TestConjunctions.java | 17 +-
.../lucene/search/TestDocValuesScoring.java | 192 ----
.../lucene/search/TestMinShouldMatch2.java | 13 +-
.../lucene/search/TestSimilarityProvider.java | 36 +-
.../lucene/search/TestSubScorerFreqs.java | 17 +-
.../org/apache/lucene/search/TestTermQuery.java | 6 +-
.../similarities/TestClassicSimilarity.java | 3 +-
.../search/similarities/TestSimilarityBase.java | 11 +-
.../search/spans/TestFieldMaskingSpanQuery.java | 4 +-
.../highlight/WeightedSpanTermExtractor.java | 2 +-
.../search/uhighlight/FieldHighlighter.java | 14 +-
.../search/uhighlight/FieldOffsetStrategy.java | 80 +-
.../lucene/search/uhighlight/OffsetsEnum.java | 132 ++-
.../lucene/search/uhighlight/Passage.java | 18 +
.../lucene/search/uhighlight/PhraseHelper.java | 584 +++-------
.../uhighlight/TokenStreamOffsetStrategy.java | 56 +-
.../uhighlight/TestUnifiedHighlighter.java | 87 +-
.../uhighlight/TestUnifiedHighlighterMTQ.java | 55 +-
.../TestUnifiedHighlighterStrictPhrases.java | 88 ++
.../TestUnifiedHighlighterExtensibility.java | 4 +-
lucene/ivy-versions.properties | 4 +-
.../lucene/search/join/TestBlockJoin.java | 5 -
lucene/licenses/icu4j-59.1.jar.sha1 | 1 -
lucene/licenses/icu4j-60.2.jar.sha1 | 1 +
...jetty-continuation-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-continuation-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-http-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-http-9.4.8.v20171121.jar.sha1 | 1 +
.../licenses/jetty-io-9.3.20.v20170531.jar.sha1 | 1 -
.../licenses/jetty-io-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-server-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-server-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-servlet-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-servlet-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-util-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-util-9.4.8.v20171121.jar.sha1 | 1 +
.../lucene/index/memory/TestMemoryIndex.java | 8 +-
.../search/TestDiversifiedTopDocsCollector.java | 132 ++-
.../apache/lucene/queries/CommonTermsQuery.java | 40 +-
.../queries/function/FunctionScoreQuery.java | 151 +++
.../function/docvalues/FloatDocValues.java | 5 +
.../function/valuesource/IDFValueSource.java | 2 +-
.../function/valuesource/NormValueSource.java | 10 +-
.../function/valuesource/TFValueSource.java | 2 +-
.../queries/payloads/PayloadScoreQuery.java | 13 +-
.../queries/payloads/SpanPayloadCheckQuery.java | 18 +-
.../lucene/queries/CommonTermsQueryTest.java | 6 +-
.../function/TestFunctionScoreQuery.java | 58 +-
.../function/TestLongNormValueSource.java | 2 +-
.../queries/function/TestValueSources.java | 8 +-
.../docvalues/TestBoolValOfNumericDVs.java | 76 ++
.../lucene/replicator/ReplicatorTestCase.java | 4 +-
.../lucene/document/LatLonBoundingBox.java | 21 +-
.../sandbox/queries/FuzzyLikeThisQuery.java | 8 +-
.../lucene/search/TermAutomatonQuery.java | 26 +-
.../lucene/search/TermAutomatonScorer.java | 7 +-
.../search/TestLatLonBoundingBoxQueries.java | 6 +
.../lucene/index/BaseNormsFormatTestCase.java | 7 +-
.../org/apache/lucene/search/QueryUtils.java | 10 +-
.../lucene/search/ShardSearchingTestBase.java | 8 +-
.../similarities/AssertingSimilarity.java | 96 +-
.../similarities/BaseSimilarityTestCase.java | 146 +--
.../search/spans/AssertingSpanWeight.java | 10 +-
solr/CHANGES.txt | 114 +-
solr/bin/solr | 64 +-
solr/contrib/langid/README.txt | 3 +-
solr/contrib/langid/build.xml | 60 ++
solr/contrib/langid/ivy.xml | 1 +
.../LanguageIdentifierUpdateProcessor.java | 64 ++
.../OpenNLPLangDetectUpdateProcessor.java | 80 ++
...OpenNLPLangDetectUpdateProcessorFactory.java | 130 +++
.../TikaLanguageIdentifierUpdateProcessor.java | 65 --
.../opennlp-langdetect.eng-swe-spa-rus-deu.bin | Bin 0 -> 17702 bytes
.../conf/solrconfig-languageidentifier.xml | 25 +-
.../opennlp.langdetect.trainer.params.txt | 17 +
...dentifierUpdateProcessorFactoryTestCase.java | 6 +-
...NLPLangDetectUpdateProcessorFactoryTest.java | 66 ++
.../org/apache/solr/ltr/model/LinearModel.java | 2 +-
.../client/solrj/embedded/JettySolrRunner.java | 8 +-
.../org/apache/solr/cloud/AddReplicaCmd.java | 279 -----
.../src/java/org/apache/solr/cloud/Assign.java | 483 ---------
.../java/org/apache/solr/cloud/BackupCmd.java | 225 ----
.../solr/cloud/CloudConfigSetService.java | 1 +
.../java/org/apache/solr/cloud/CloudUtil.java | 2 +-
.../org/apache/solr/cloud/CreateAliasCmd.java | 101 --
.../apache/solr/cloud/CreateCollectionCmd.java | 533 ---------
.../org/apache/solr/cloud/CreateShardCmd.java | 191 ----
.../apache/solr/cloud/CreateSnapshotCmd.java | 179 ---
.../org/apache/solr/cloud/DeleteAliasCmd.java | 43 -
.../apache/solr/cloud/DeleteCollectionCmd.java | 134 ---
.../org/apache/solr/cloud/DeleteNodeCmd.java | 137 ---
.../org/apache/solr/cloud/DeleteReplicaCmd.java | 281 -----
.../org/apache/solr/cloud/DeleteShardCmd.java | 178 ---
.../apache/solr/cloud/DeleteSnapshotCmd.java | 160 ---
.../solr/cloud/ExclusiveSliceProperty.java | 5 +-
.../solr/cloud/LeaderRecoveryWatcher.java | 88 --
.../java/org/apache/solr/cloud/MigrateCmd.java | 337 ------
.../org/apache/solr/cloud/MoveReplicaCmd.java | 302 ------
.../java/org/apache/solr/cloud/Overseer.java | 7 +-
.../OverseerCollectionConfigSetProcessor.java | 1 +
.../cloud/OverseerCollectionMessageHandler.java | 1002 -----------------
.../org/apache/solr/cloud/OverseerRoleCmd.java | 102 --
.../apache/solr/cloud/OverseerStatusCmd.java | 112 --
.../solr/cloud/OverseerTaskProcessor.java | 7 +-
.../org/apache/solr/cloud/ReplaceNodeCmd.java | 226 ----
.../java/org/apache/solr/cloud/RestoreCmd.java | 363 -------
.../org/apache/solr/cloud/SplitShardCmd.java | 542 ----------
.../org/apache/solr/cloud/UtilizeNodeCmd.java | 120 ---
.../cloud/api/collections/AddReplicaCmd.java | 282 +++++
.../solr/cloud/api/collections/Assign.java | 483 +++++++++
.../solr/cloud/api/collections/BackupCmd.java | 224 ++++
.../cloud/api/collections/CreateAliasCmd.java | 100 ++
.../api/collections/CreateCollectionCmd.java | 528 +++++++++
.../cloud/api/collections/CreateShardCmd.java | 190 ++++
.../api/collections/CreateSnapshotCmd.java | 179 +++
.../cloud/api/collections/DeleteAliasCmd.java | 43 +
.../api/collections/DeleteCollectionCmd.java | 142 +++
.../cloud/api/collections/DeleteNodeCmd.java | 137 +++
.../cloud/api/collections/DeleteReplicaCmd.java | 280 +++++
.../cloud/api/collections/DeleteShardCmd.java | 178 +++
.../api/collections/DeleteSnapshotCmd.java | 160 +++
.../api/collections/LeaderRecoveryWatcher.java | 88 ++
.../solr/cloud/api/collections/MigrateCmd.java | 334 ++++++
.../cloud/api/collections/MoveReplicaCmd.java | 303 ++++++
.../OverseerCollectionMessageHandler.java | 1011 +++++++++++++++++
.../cloud/api/collections/OverseerRoleCmd.java | 102 ++
.../api/collections/OverseerStatusCmd.java | 113 ++
.../cloud/api/collections/ReplaceNodeCmd.java | 227 ++++
.../solr/cloud/api/collections/RestoreCmd.java | 357 ++++++
.../RoutedAliasCreateCollectionCmd.java | 184 ++++
.../cloud/api/collections/SplitShardCmd.java | 540 ++++++++++
.../cloud/api/collections/UtilizeNodeCmd.java | 120 +++
.../cloud/api/collections/package-info.java | 23 +
.../cloud/autoscaling/ScheduledTriggers.java | 69 +-
.../cloud/overseer/ClusterStateMutator.java | 2 +-
.../solr/cloud/overseer/ReplicaMutator.java | 12 +-
.../solr/cloud/overseer/SliceMutator.java | 13 +-
.../org/apache/solr/core/CoreContainer.java | 3 +
.../handler/DocumentAnalysisRequestHandler.java | 3 -
.../handler/FieldAnalysisRequestHandler.java | 3 -
.../org/apache/solr/handler/SchemaHandler.java | 12 +-
.../org/apache/solr/handler/StreamHandler.java | 26 +-
.../solr/handler/admin/CollectionsHandler.java | 40 +-
.../handler/admin/ConfigSetsHandlerApi.java | 6 +
.../handler/component/HighlightComponent.java | 52 +-
.../solr/handler/component/QueryComponent.java | 2 +-
.../handler/component/RangeFacetRequest.java | 73 +-
.../handler/component/StatsValuesFactory.java | 60 --
.../solr/handler/component/TermsComponent.java | 26 +-
.../org/apache/solr/query/SolrRangeQuery.java | 8 +-
.../apache/solr/request/SolrRequestInfo.java | 12 +-
.../apache/solr/schema/AbstractEnumField.java | 24 +-
.../apache/solr/schema/CurrencyFieldType.java | 165 +--
.../org/apache/solr/schema/CurrencyValue.java | 231 ++++
.../org/apache/solr/schema/DatePointField.java | 6 -
.../apache/solr/schema/DoublePointField.java | 6 -
.../org/apache/solr/schema/EnumFieldType.java | 11 +
.../java/org/apache/solr/schema/FieldType.java | 80 +-
.../org/apache/solr/schema/FloatPointField.java | 6 -
.../org/apache/solr/schema/IntPointField.java | 6 -
.../org/apache/solr/schema/LongPointField.java | 6 -
.../java/org/apache/solr/schema/NumberType.java | 34 +-
.../java/org/apache/solr/schema/PointField.java | 6 +
.../apache/solr/schema/PrimitiveFieldType.java | 5 +
.../org/apache/solr/schema/SchemaField.java | 8 +-
.../java/org/apache/solr/schema/StrField.java | 28 +
.../java/org/apache/solr/schema/TrieField.java | 39 +-
.../apache/solr/search/BoostQParserPlugin.java | 21 +-
.../solr/search/ExtendedDismaxQParser.java | 5 +-
.../solr/search/GraphTermsQParserPlugin.java | 38 +-
.../java/org/apache/solr/search/Grouping.java | 51 -
.../apache/solr/search/SolrIndexSearcher.java | 6 +-
.../apache/solr/search/ValueSourceParser.java | 3 +-
.../apache/solr/search/facet/FacetRange.java | 125 ++-
.../solr/search/facet/FacetRangeMerger.java | 2 +-
.../SearchGroupsRequestFactory.java | 3 -
.../TopGroupsShardRequestFactory.java | 3 -
.../SearchGroupShardResponseProcessor.java | 3 -
.../StoredFieldsShardResponseProcessor.java | 3 -
.../TopGroupsShardResponseProcessor.java | 3 -
.../SearchGroupsResultTransformer.java | 6 -
.../TopGroupsResultTransformer.java | 6 -
.../GroupedEndResultTransformer.java | 3 -
.../MainEndResultTransformer.java | 3 -
.../SimpleEndResultTransformer.java | 3 -
.../solr/search/stats/ExactStatsCache.java | 8 +-
.../apache/solr/search/stats/LRUStatsCache.java | 4 +-
.../solr/search/stats/LocalStatsSource.java | 4 +-
.../apache/solr/search/stats/StatsSource.java | 4 +-
.../solr/security/AuthenticationPlugin.java | 1 +
.../apache/solr/servlet/SolrDispatchFilter.java | 48 +-
.../TimeRoutedAliasUpdateProcessor.java | 228 +++-
.../org/apache/solr/util/TimeZoneUtils.java | 18 +
.../configuration/providers/package-info.java | 23 -
.../solr/collection1/conf/schema11.xml | 25 +
.../TestEmbeddedSolrServerSchemaAPI.java | 16 +-
.../AbstractCloudBackupRestoreTestCase.java | 346 ------
.../apache/solr/cloud/AliasIntegrationTest.java | 160 ++-
.../test/org/apache/solr/cloud/AssignTest.java | 155 ---
.../solr/cloud/BasicDistributedZkTest.java | 1 +
.../solr/cloud/ChaosMonkeyShardSplitTest.java | 5 +
.../apache/solr/cloud/CollectionReloadTest.java | 84 --
.../cloud/CollectionTooManyReplicasTest.java | 221 ----
.../CollectionsAPIAsyncDistributedZkTest.java | 177 ---
.../cloud/CollectionsAPIDistributedZkTest.java | 684 ------------
...ConcurrentDeleteAndCreateCollectionTest.java | 226 ----
.../apache/solr/cloud/CustomCollectionTest.java | 198 ----
...verseerCollectionConfigSetProcessorTest.java | 28 +-
.../solr/cloud/OverseerTaskQueueTest.java | 1 +
.../solr/cloud/ReplicaPropertiesBase.java | 177 ---
.../org/apache/solr/cloud/ShardSplitTest.java | 1015 -----------------
.../cloud/SimpleCollectionCreateDeleteTest.java | 64 --
.../apache/solr/cloud/TestCollectionAPI.java | 797 --------------
.../TestCollectionsAPIViaSolrCloudCluster.java | 295 -----
.../apache/solr/cloud/TestConfigSetsAPI.java | 3 +-
.../solr/cloud/TestHdfsCloudBackupRestore.java | 203 ----
.../cloud/TestLocalFSCloudBackupRestore.java | 57 -
.../org/apache/solr/cloud/TestPullReplica.java | 78 +-
.../solr/cloud/TestReplicaProperties.java | 236 ----
.../cloud/TestRequestStatusCollectionAPI.java | 197 ----
.../AbstractCloudBackupRestoreTestCase.java | 348 ++++++
.../solr/cloud/api/collections/AssignTest.java | 156 +++
.../api/collections/CollectionReloadTest.java | 85 ++
.../CollectionTooManyReplicasTest.java | 222 ++++
.../CollectionsAPIAsyncDistributedZkTest.java | 178 +++
.../CollectionsAPIDistributedZkTest.java | 686 ++++++++++++
...ConcurrentDeleteAndCreateCollectionTest.java | 227 ++++
.../api/collections/CustomCollectionTest.java | 199 ++++
.../HdfsCollectionsAPIDistributedZkTest.java | 176 +++
.../api/collections/ReplicaPropertiesBase.java | 178 +++
.../cloud/api/collections/ShardSplitTest.java | 1017 ++++++++++++++++++
.../SimpleCollectionCreateDeleteTest.java | 66 ++
.../api/collections/TestCollectionAPI.java | 795 ++++++++++++++
.../TestCollectionsAPIViaSolrCloudCluster.java | 297 +++++
.../collections/TestHdfsCloudBackupRestore.java | 207 ++++
.../TestLocalFSCloudBackupRestore.java | 57 +
.../api/collections/TestReplicaProperties.java | 236 ++++
.../TestRequestStatusCollectionAPI.java | 198 ++++
.../solr/cloud/autoscaling/TestPolicyCloud.java | 8 +-
.../autoscaling/TriggerIntegrationTest.java | 37 +-
.../cloud/autoscaling/sim/SimCloudManager.java | 19 +-
.../sim/SimClusterStateProvider.java | 14 +-
.../autoscaling/sim/SimSolrCloudTestCase.java | 11 +-
.../cloud/autoscaling/sim/TestLargeCluster.java | 130 ++-
.../autoscaling/sim/TestTriggerIntegration.java | 9 +-
.../cloud/autoscaling/sim/package-info.java | 79 +-
.../cloud/cdcr/BaseCdcrDistributedZkTest.java | 11 +-
.../HdfsCollectionsAPIDistributedZkTest.java | 176 ---
.../solr/core/TestConfigSetImmutable.java | 6 +-
.../component/CustomHighlightComponentTest.java | 310 ++++++
.../solr/rest/schema/TestBulkSchemaAPI.java | 91 +-
.../solr/schema/CurrencyFieldTypeTest.java | 235 ++++
.../solr/schema/SchemaApiFailureTest.java | 66 ++
.../org/apache/solr/schema/TestPointFields.java | 230 ++--
.../search/CurrencyRangeFacetCloudTest.java | 483 +++++++++
.../solr/search/TestReRankQParserPlugin.java | 41 +
.../solr/search/facet/TestJsonFacets.java | 42 +
.../solr/search/function/TestFunctionQuery.java | 16 +-
.../function/TestMinMaxOnMultiValuedField.java | 409 ++++++-
.../similarities/BaseSimilarityTestCase.java | 2 +-
.../solr/security/MockAuthorizationPlugin.java | 19 +-
.../PKIAuthenticationIntegrationTest.java | 15 +-
.../security/TestAuthorizationFramework.java | 35 +-
.../solr/uninverting/TestFieldCacheSort.java | 3 +
.../TimeRoutedAliasUpdateProcessorTest.java | 180 +++-
solr/licenses/icu4j-59.1.jar.sha1 | 1 -
solr/licenses/icu4j-60.2.jar.sha1 | 1 +
...jetty-continuation-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-continuation-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-deploy-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-deploy-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-http-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-http-9.4.8.v20171121.jar.sha1 | 1 +
.../licenses/jetty-io-9.3.20.v20170531.jar.sha1 | 1 -
solr/licenses/jetty-io-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-jmx-9.3.20.v20170531.jar.sha1 | 1 -
.../licenses/jetty-jmx-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-rewrite-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-rewrite-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-security-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-security-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-server-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-server-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-servlet-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-servlet-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-servlets-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-servlets-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-util-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-util-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-webapp-9.3.20.v20170531.jar.sha1 | 1 -
.../jetty-webapp-9.4.8.v20171121.jar.sha1 | 1 +
.../jetty-xml-9.3.20.v20170531.jar.sha1 | 1 -
.../licenses/jetty-xml-9.4.8.v20171121.jar.sha1 | 1 +
solr/licenses/start.jar.sha1 | 2 +-
solr/server/etc/jetty-http.xml | 1 -
solr/server/etc/jetty-https.xml | 1 -
.../conf/velocity/VM_global_library.vm | 6 +-
solr/solr-ref-guide/src/collections-api.adoc | 2 +-
.../src/common-query-parameters.adoc | 22 +-
.../detecting-languages-during-indexing.adoc | 29 +-
.../src/distributed-requests.adoc | 2 +-
solr/solr-ref-guide/src/documents-screen.adoc | 52 +-
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 2 +-
solr/solr-ref-guide/src/schema-api.adoc | 20 +-
.../src/solrcloud-autoscaling-api.adoc | 3 -
solr/solr-ref-guide/src/suggester.adoc | 12 +-
.../src/transforming-result-documents.adoc | 8 +-
...king-with-currencies-and-exchange-rates.adoc | 1 +
.../apache/solr/client/solrj/SolrRequest.java | 6 +-
.../apache/solr/client/solrj/SolrResponse.java | 2 +
.../cloud/autoscaling/AddReplicaSuggester.java | 12 +-
.../DelegatingClusterStateProvider.java | 7 +
.../cloud/autoscaling/MoveReplicaSuggester.java | 21 +-
.../client/solrj/cloud/autoscaling/Policy.java | 38 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 33 +
.../solrj/cloud/autoscaling/ReplicaInfo.java | 7 +
.../client/solrj/cloud/autoscaling/Row.java | 9 +-
.../solrj/cloud/autoscaling/Suggester.java | 44 +-
.../solrj/cloud/autoscaling/Suggestion.java | 12 +-
.../client/solrj/impl/ClusterStateProvider.java | 7 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 27 +-
.../client/solrj/io/eval/AkimaEvaluator.java | 71 ++
.../solr/client/solrj/io/eval/Attributes.java | 26 +
.../io/eval/ChiSquareDataSetEvaluator.java | 65 ++
.../client/solrj/io/eval/ColumnAtEvaluator.java | 55 +
.../solrj/io/eval/ColumnCountEvaluator.java | 42 +
.../solrj/io/eval/CorrelationEvaluator.java | 6 +-
.../eval/CorrelationSignificanceEvaluator.java | 2 +-
.../solrj/io/eval/FeatureSelectEvaluator.java | 93 ++
.../solrj/io/eval/GTestDataSetEvaluator.java | 64 ++
.../solrj/io/eval/GetAttributeEvaluator.java | 43 +
.../solrj/io/eval/GetAttributesEvaluator.java | 42 +
.../solrj/io/eval/GetCentroidsEvaluator.java | 55 +
.../solrj/io/eval/GetClusterEvaluator.java | 64 ++
.../solrj/io/eval/GetColumnLabelsEvaluator.java | 42 +
.../solrj/io/eval/GetRowLabelsEvaluator.java | 42 +
.../client/solrj/io/eval/IndexOfEvaluator.java | 51 +
.../client/solrj/io/eval/KmeansEvaluator.java | 135 +++
.../solr/client/solrj/io/eval/KnnEvaluator.java | 170 +++
.../client/solrj/io/eval/LerpEvaluator.java | 71 ++
.../solr/client/solrj/io/eval/Matrix.java | 43 +-
.../client/solrj/io/eval/MeanEvaluator.java | 1 -
.../client/solrj/io/eval/RowAtEvaluator.java | 56 +
.../client/solrj/io/eval/RowCountEvaluator.java | 42 +
.../client/solrj/io/eval/SequenceEvaluator.java | 2 +-
.../solrj/io/eval/SetColumnLabelsEvaluator.java | 47 +
.../solrj/io/eval/SetRowLabelsEvaluator.java | 47 +
.../solrj/io/eval/TermVectorsEvaluator.java | 188 ++++
.../solrj/io/eval/TopFeaturesEvaluator.java | 112 ++
.../solrj/io/eval/TransposeEvaluator.java | 6 +-
.../client/solrj/io/eval/UnitEvaluator.java | 5 +-
.../solr/client/solrj/io/stream/LetStream.java | 28 +-
.../solrj/request/DocumentAnalysisRequest.java | 3 -
.../solrj/request/FieldAnalysisRequest.java | 3 -
.../response/DocumentAnalysisResponse.java | 3 -
.../solrj/response/FieldAnalysisResponse.java | 3 -
.../client/solrj/response/QueryResponse.java | 14 +-
.../solr/client/solrj/response/RangeFacet.java | 6 +
.../solrj/response/schema/SchemaResponse.java | 39 -
.../java/org/apache/solr/common/MapWriter.java | 13 +
.../apache/solr/common/cloud/ZkNodeProps.java | 11 +-
.../solr/common/cloud/rule/ImplicitSnitch.java | 1 +
.../solr/common/params/AutoScalingParams.java | 2 +
.../solr/common/params/CollectionParams.java | 1 +
.../java/org/apache/solr/common/util/Pair.java | 11 +-
.../solrj/cloud/autoscaling/TestPolicy.java | 152 +++
.../client/solrj/embedded/JettyWebappTest.java | 4 +-
.../client/solrj/impl/CloudSolrClientTest.java | 23 -
.../solrj/io/stream/StreamExpressionTest.java | 630 ++++++++++-
.../solr/client/solrj/request/SchemaTest.java | 75 +-
.../cloud/AbstractFullDistribZkTestBase.java | 40 +-
.../java/org/apache/solr/cloud/ChaosMonkey.java | 6 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
.../org/apache/solr/util/SSLTestConfig.java | 11 +-
.../solr/cloud/MiniSolrCloudClusterTest.java | 2 +-
solr/webapp/web/css/angular/menu.css | 1 +
solr/webapp/web/css/angular/suggestions.css | 46 +
solr/webapp/web/img/ZeroClipboard.swf | Bin 1071 -> 0 bytes
solr/webapp/web/img/ico/idea.png | Bin 0 -> 732 bytes
solr/webapp/web/img/ico/run.png | Bin 0 -> 1205 bytes
solr/webapp/web/index.html | 4 +
solr/webapp/web/js/angular/app.js | 4 +
.../angular/controllers/cluster-suggestions.js | 45 +
.../web/partials/cluster_suggestions.html | 49 +
498 files changed, 21562 insertions(+), 15499 deletions(-)
----------------------------------------------------------------------