You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2017/10/04 08:25:20 UTC

[28/50] [abbrv] lucene-solr:master: Merge branch 'master' into feature/autoscaling

Merge branch 'master' into feature/autoscaling

# Conflicts:
#	solr/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/de3107c7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/de3107c7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/de3107c7

Branch: refs/heads/master
Commit: de3107c70f0ca35840496a990c7939f31c8095aa
Parents: 6fb2803 2e5f9a4
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Mon Sep 18 09:23:41 2017 -0700
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Mon Sep 18 09:23:41 2017 -0700

----------------------------------------------------------------------
 build.xml                                       |   18 +-
 dev-tools/doap/lucene.rdf                       |    9 +-
 dev-tools/doap/solr.rdf                         |    7 +
 lucene/CHANGES.txt                              |   20 +
 lucene/NOTICE.txt                               |    5 +-
 lucene/analysis/build.xml                       |    4 +
 .../lucene/analysis/bn/BengaliAnalyzer.java     |  132 +++
 .../analysis/bn/BengaliNormalizationFilter.java |   59 +
 .../bn/BengaliNormalizationFilterFactory.java   |   55 +
 .../lucene/analysis/bn/BengaliNormalizer.java   |  155 +++
 .../lucene/analysis/bn/BengaliStemFilter.java   |   49 +
 .../analysis/bn/BengaliStemFilterFactory.java   |   48 +
 .../lucene/analysis/bn/BengaliStemmer.java      |  183 ++++
 .../apache/lucene/analysis/bn/package-info.java |   21 +
 ...ache.lucene.analysis.util.TokenFilterFactory |    2 +
 .../org/apache/lucene/analysis/bn/stopwords.txt |  121 +++
 .../lucene/analysis/bn/TestBengaliAnalyzer.java |   53 +
 .../lucene/analysis/bn/TestBengaliFilters.java  |   80 ++
 .../analysis/bn/TestBengaliNormalizer.java      |  110 ++
 .../lucene/analysis/bn/TestBengaliStemmer.java  |   79 ++
 .../analysis/icu/ICUNormalizer2CharFilter.java  |   35 +-
 .../icu/TestICUNormalizer2CharFilter.java       |   21 +
 .../index/TestBackwardsCompatibility.java       |    4 +-
 .../lucene/index/unsupported.6.6.1-cfs.zip      |  Bin 0 -> 15836 bytes
 .../lucene/index/unsupported.6.6.1-nocfs.zip    |  Bin 0 -> 15830 bytes
 lucene/build.xml                                |   13 +
 lucene/codecs/build.xml                         |    2 +
 lucene/common-build.xml                         |   53 +-
 lucene/core/build.xml                           |    2 +
 .../lucene/index/DefaultIndexingChain.java      |    2 -
 .../lucene/store/NativeFSLockFactory.java       |   14 +-
 .../lucene/store/TestNativeFSLockFactory.java   |   42 +
 .../writercache/LruTaxonomyWriterCache.java     |   20 +-
 .../writercache/TestLruTaxonomyWriterCache.java |   50 +
 lucene/ivy-versions.properties                  |    2 +-
 .../lucene/spatial3d/geom/GeoBBoxFactory.java   |    9 +-
 .../spatial3d/geom/GeoDegeneratePath.java       |  788 ++++++++++++++
 .../spatial3d/geom/GeoDegeneratePoint.java      |    2 +-
 .../apache/lucene/spatial3d/geom/GeoPath.java   |   58 +
 .../lucene/spatial3d/geom/GeoPathFactory.java   |    3 +
 .../lucene/spatial3d/geom/GeoStandardPath.java  |  170 +++
 .../lucene/spatial3d/geom/StandardObjects.java  |    1 +
 .../lucene/spatial3d/geom/GeoPathTest.java      |   75 ++
 .../spatial3d/geom/RandomBinaryCodecTest.java   |   10 +-
 .../geom/RandomGeo3dShapeGenerator.java         | 1013 ++++++++++++++++++
 .../spatial3d/geom/RandomGeoShapeGenerator.java |  944 ----------------
 .../geom/RandomGeoShapeRelationshipTest.java    |   65 +-
 .../geom/SimpleGeoPolygonRelationshipsTest.java |   24 +
 .../suggest/analyzing/AnalyzingSuggester.java   |    6 +-
 .../analyzing/AnalyzingSuggesterTest.java       |   60 ++
 solr/CHANGES.txt                                |   32 +-
 solr/build.xml                                  |   16 +-
 .../apache/solr/ltr/model/LTRScoringModel.java  |    4 +-
 .../org/apache/solr/ltr/TestRerankBase.java     |   12 +-
 solr/core/build.xml                             |    7 +
 .../org/apache/solr/handler/StreamHandler.java  |  107 +-
 .../solr/handler/component/QueryComponent.java  |  460 ++++----
 .../org/apache/solr/parser/FastCharStream.java  |    7 +-
 .../org/apache/solr/parser/QueryParser.java     |    2 +-
 .../apache/solr/schema/AbstractEnumField.java   |   11 +-
 .../org/apache/solr/schema/DatePointField.java  |   15 +-
 .../org/apache/solr/schema/DateRangeField.java  |    4 +-
 .../apache/solr/schema/DoublePointField.java    |   15 +-
 .../java/org/apache/solr/schema/FieldType.java  |   65 +-
 .../org/apache/solr/schema/FloatPointField.java |   15 +-
 .../org/apache/solr/schema/IntPointField.java   |   15 +-
 .../org/apache/solr/schema/LongPointField.java  |   15 +-
 .../apache/solr/schema/PreAnalyzedField.java    |    6 +-
 .../java/org/apache/solr/schema/TextField.java  |    5 +-
 .../java/org/apache/solr/schema/TrieField.java  |   44 +-
 .../org/apache/solr/search/FunctionQParser.java |   11 +-
 .../apache/solr/search/LuceneQParserPlugin.java |   54 -
 .../solr/search/OldLuceneQParserPlugin.java     |   37 -
 .../java/org/apache/solr/search/Sorting.java    |   12 +-
 .../apache/solr/search/ValueSourceParser.java   |    4 +-
 .../org/apache/solr/search/facet/MinMaxAgg.java |  145 ++-
 .../org/apache/solr/search/facet/SlotAcc.java   |   84 +-
 .../search/function/FieldNameValueSource.java   |   60 ++
 .../FieldLengthUpdateProcessorFactory.java      |    6 +-
 .../FieldMutatingUpdateProcessorFactory.java    |    4 +-
 .../ParseDateFieldUpdateProcessorFactory.java   |    4 +-
 .../ParseDoubleFieldUpdateProcessorFactory.java |    4 +-
 .../ParseFloatFieldUpdateProcessorFactory.java  |    4 +-
 .../ParseIntFieldUpdateProcessorFactory.java    |    4 +-
 .../ParseLongFieldUpdateProcessorFactory.java   |    4 +-
 .../configuration/providers/package-info.java   |   23 +
 .../solr/collection1/conf/schema-enums.xml      |   10 +
 .../solr/collection1/conf/solrconfig.xml        |    3 -
 .../org/apache/solr/BasicFunctionalityTest.java |    2 +-
 .../org/apache/solr/ConvertedLegacyTest.java    |   70 +-
 .../apache/solr/TestDistributedMissingSort.java |    8 +-
 .../apache/solr/cloud/CdcrBootstrapTest.java    |    1 +
 .../org/apache/solr/core/TestLazyCores.java     |    4 +-
 .../apache/solr/handler/SearchHandlerTest.java  |    4 +-
 .../org/apache/solr/handler/TestSQLHandler.java |    1 -
 .../org/apache/solr/schema/EnumFieldTest.java   |   16 +
 .../org/apache/solr/schema/TestPointFields.java |    9 +-
 .../org/apache/solr/search/CursorMarkTest.java  |   10 +-
 .../apache/solr/search/QueryEqualityTest.java   |    8 -
 .../apache/solr/search/QueryParsingTest.java    |    1 -
 .../apache/solr/search/TestSolrQueryParser.java |    2 +-
 .../test/org/apache/solr/search/TestSort.java   |   21 +-
 .../solr/search/facet/TestJsonFacets.java       |   86 +-
 solr/example/example-DIH/.gitignore             |    1 +
 solr/example/example-DIH/hsqldb/.gitignore      |    5 +
 solr/example/example-DIH/hsqldb/ex.backup       |  Bin 11354 -> 0 bytes
 solr/example/example-DIH/hsqldb/ex.data         |  Bin 1048576 -> 0 bytes
 solr/example/example-DIH/hsqldb/ex.script       |  173 ++-
 .../example-DIH/solr/db/conf/managed-schema     |    2 +-
 .../example-DIH/solr/mail/conf/managed-schema   |    2 +-
 .../example-DIH/solr/solr/conf/managed-schema   |    2 +-
 solr/example/files/conf/managed-schema          |    8 +-
 solr/example/films/README.txt                   |    6 +-
 solr/licenses/commons-math3-3.4.1.jar.sha1      |    1 -
 solr/licenses/commons-math3-3.6.1.jar.sha1      |    1 +
 solr/solr-ref-guide/README.adoc                 |   32 +-
 solr/solr-ref-guide/src/schema-api.adoc         |    4 +-
 solr/solr-ref-guide/src/schemaless-mode.adoc    |   62 +-
 .../src/solrcloud-autoscaling-overview.adoc     |    2 +-
 ...olrcloud-autoscaling-policy-preferences.adoc |    1 +
 solr/solr-ref-guide/src/spatial-search.adoc     |    5 +-
 solr/solr-ref-guide/src/working-with-dates.adoc |    4 +-
 solr/solrj/build.xml                            |    2 +
 .../io/eval/BinomialDistributionEvaluator.java  |   48 +
 .../io/eval/CanberraDistanceEvaluator.java      |   56 +
 .../io/eval/ChebyshevDistanceEvaluator.java     |   56 +
 .../solrj/io/eval/CopyOfRangeEvaluator.java     |    4 +-
 .../io/eval/CosineSimilarityEvaluator.java      |   67 ++
 .../io/eval/CumulativeProbabilityEvaluator.java |   21 +-
 .../solrj/io/eval/DotProductEvaluator.java      |   58 +
 .../client/solrj/io/eval/EBEAddEvaluator.java   |   63 ++
 .../solrj/io/eval/EBEDivideEvaluator.java       |   63 ++
 .../solrj/io/eval/EBEMultiplyEvaluator.java     |   63 ++
 .../solrj/io/eval/EBESubtractEvaluator.java     |   63 ++
 .../io/eval/EarthMoversDistanceEvaluator.java   |   56 +
 .../eval/EnumeratedDistributionEvaluator.java   |   45 +
 .../solrj/io/eval/FrequencyTableEvaluator.java  |   84 ++
 .../solrj/io/eval/HistogramEvaluator.java       |    7 +-
 .../io/eval/KendallsCorrelationEvaluator.java   |   57 +
 .../io/eval/ManhattanDistanceEvaluator.java     |   56 +
 .../solrj/io/eval/MeanDifferenceEvaluator.java  |   55 +
 .../io/eval/PoissonDistributionEvaluator.java   |   44 +
 .../client/solrj/io/eval/PrimesEvaluator.java   |   58 +
 .../solrj/io/eval/ProbabilityEvaluator.java     |   52 +
 .../client/solrj/io/eval/SampleEvaluator.java   |   18 +-
 .../io/eval/SpearmansCorrelationEvaluator.java  |   57 +
 .../solrj/io/eval/SumDifferenceEvaluator.java   |   55 +
 .../UniformIntegerDistributionEvaluator.java    |   48 +
 .../client/solrj/io/stream/FacetStream.java     |   10 +-
 .../solrj/io/stream/StreamExpressionTest.java   |  357 +++++-
 solr/webapp/build.xml                           |    3 +
 151 files changed, 6488 insertions(+), 1720 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/de3107c7/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index 50ec4ed,5d035c3..a1a23e6
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -98,8 -83,13 +98,15 @@@ New Feature
  
  * SOLR-11244: Query DSL for Solr (Cao Manh Dat)
  
 +* SOLR-11072: Implement trigger for searchRate event type. (ab)
 +
+ * SOLR-11317: JSON Facet API: min/max aggregations on numeric fields are now typed better so int/long
+   fields return an appropriate integral type rather than a double. (yonik)
+ 
+ * SOLR-11316: JSON Facet API: min/max aggregations are now supported on single-valued date fields.
+   (yonik)
+ 
+ 
  Bug Fixes
  ----------------------
  
@@@ -148,12 -139,12 +161,16 @@@ Optimization
  * SOLR-10985: Remove unnecessary toString() calls in solr-core's search package's debug logging.
    (Michael Braun via Christine Poerschke)
  
 +* SOLR-11000: Changes made via AutoScalingHandler should be atomic. (ab, shalin)
 +
  * SOLR-11124: MoveReplicaCmd should skip deleting old replica in case of its node is not live (Cao Manh Dat)
  
 +* SOLR-10769: Allow nodeAdded / nodeLost events to report multiple nodes in one event. (ab)
 +
+ * SOLR-11242: QueryParser: re-use the LookaheadSuccess exception. (Michael Braun via David Smiley)
+ 
+ * SOLR-11314: FastCharStream: re-use the READ_PAST_EOF exception. (Michael Braun via David Smiley)
+ 
  Other Changes
  ----------------------
  
@@@ -941,7 -907,9 +967,9 @@@ Other Change
  
  * SOLR-11261, SOLR-10966: Upgrade to Hadoop 2.7.4 to fix incompatibility with Java 9.
    (Uwe Schindler)
 -  
 +
+ * SOLR-11324: Clean up mention of trie fields in documentation and source comments. (Steve Rowe)
+ 
  ==================  6.6.1 ==================
  
  Bug Fixes