You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/05/08 22:08:03 UTC
[49/50] [abbrv] lucene-solr:jira/solr-10233: Merge branch 'master'
into jira/solr-10233
Merge branch 'master' into jira/solr-10233
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0bb8e47e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0bb8e47e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0bb8e47e
Branch: refs/heads/jira/solr-10233
Commit: 0bb8e47e4677281802da9304602150126b432933
Parents: 873d1da 82b78bd
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Mon May 8 13:05:51 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Mon May 8 13:05:51 2017 -0700
----------------------------------------------------------------------
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/idea/solr/core/src/java/solr-core.iml | 1 +
dev-tools/scripts/buildAndPushRelease.py | 4 +-
dev-tools/scripts/smokeTestRelease.py | 6 +-
lucene/CHANGES.txt | 37 ++
.../index/TestBackwardsCompatibility.java | 4 +-
.../org/apache/lucene/index/index.6.5.1-cfs.zip | Bin 0 -> 15842 bytes
.../apache/lucene/index/index.6.5.1-nocfs.zip | Bin 0 -> 15827 bytes
.../codecs/simpletext/SimpleTextBKDWriter.java | 20 +-
.../org/apache/lucene/codecs/CodecUtil.java | 2 +-
.../lucene/index/BufferedUpdatesStream.java | 5 +-
.../org/apache/lucene/index/CheckIndex.java | 32 +-
.../apache/lucene/index/IndexFileDeleter.java | 12 +-
.../org/apache/lucene/index/IndexReader.java | 4 +-
.../org/apache/lucene/index/IndexWriter.java | 21 +-
.../apache/lucene/index/SegmentCoreReaders.java | 5 +-
.../apache/lucene/index/SegmentDocValues.java | 3 +-
.../org/apache/lucene/index/SegmentReader.java | 5 +-
.../lucene/index/StandardDirectoryReader.java | 9 +-
.../java/org/apache/lucene/util/IOUtils.java | 92 ++-
.../org/apache/lucene/util/OfflineSorter.java | 453 ++++++++------
.../lucene/util/SameThreadExecutorService.java | 71 +++
.../org/apache/lucene/util/bkd/BKDWriter.java | 21 +-
.../index/TestDemoParallelLeafReader.java | 12 +-
.../apache/lucene/util/TestOfflineSorter.java | 50 +-
.../apache/lucene/facet/FacetsCollector.java | 56 +-
.../lucene/facet/FacetsCollectorManager.java | 16 +-
.../org/apache/lucene/facet/FacetsConfig.java | 2 +-
...ConcurrentSortedSetDocValuesFacetCounts.java | 353 +++++++++++
.../DefaultSortedSetDocValuesReaderState.java | 56 +-
.../SortedSetDocValuesFacetCounts.java | 231 +++----
.../sortedset/SortedSetDocValuesFacetField.java | 1 +
.../SortedSetDocValuesReaderState.java | 7 +-
.../sortedset/TestSortedSetDocValuesFacets.java | 70 ++-
lucene/ivy-versions.properties | 2 +-
.../search/join/ToParentBlockJoinSortField.java | 26 +
.../search/join/TestBlockJoinSorting.java | 41 +-
.../queries/payloads/PayloadScoreQuery.java | 32 +-
.../queries/payloads/SpanPayloadCheckQuery.java | 22 +-
.../queries/payloads/TestPayloadCheckQuery.java | 43 +-
.../queries/payloads/TestPayloadScoreQuery.java | 36 +-
.../flexible/core/util/QueryNodeOperation.java | 2 +-
.../lucene/replicator/http/HttpClientBase.java | 7 +-
.../apache/lucene/replicator/nrt/CopyJob.java | 2 +-
.../lucene/replicator/nrt/CopyOneFile.java | 5 +-
.../lucene/replicator/nrt/ReplicaNode.java | 4 +-
.../prefix/tree/DateRangePrefixTree.java | 8 +-
.../spatial/prefix/DateNRStrategyTest.java | 9 +
.../lucene/index/OwnCacheKeyMultiReader.java | 5 +-
.../org/apache/lucene/mockfile/VerboseFS.java | 14 +-
.../lucene/store/MockDirectoryWrapper.java | 2 +-
solr/CHANGES.txt | 101 +++-
.../collection1/conf/schema-folding-extra.xml | 1 -
.../collection1/conf/schema-icucollate-dv.xml | 1 -
.../solr/collection1/conf/schema-icucollate.xml | 1 -
.../conf/schema-icucollateoptions.xml | 1 -
.../clustering/solr/collection1/conf/schema.xml | 6 -
.../conf/dataimport-schema-no-unique-key.xml | 7 -
.../solr/collection1/conf/dataimport-schema.xml | 2 -
.../conf/dataimport-solr_id-schema.xml | 7 -
.../collection1/conf/dataimport-solrconfig.xml | 1 +
.../dataimport/TestContentStreamDataSource.java | 2 +-
.../extraction/solr/collection1/conf/schema.xml | 1 -
.../extraction/TestXLSXResponseWriter.java | 2 +-
.../langid/solr/collection1/conf/schema.xml | 1 -
.../uima/solr/collection1/conf/schema.xml | 9 -
.../test-files/uima/uima-tokenizers-schema.xml | 9 -
.../velocity/solr/collection1/conf/schema.xml | 5 -
.../java/org/apache/solr/cloud/Overseer.java | 3 +-
.../cloud/OverseerCollectionMessageHandler.java | 3 +-
.../org/apache/solr/cloud/SolrZkServer.java | 163 +----
.../src/java/org/apache/solr/cloud/ZkCLI.java | 96 +--
.../org/apache/solr/cloud/ZkController.java | 1 +
.../solr/cloud/overseer/SliceMutator.java | 3 +-
.../solr/cloud/overseer/ZkStateWriter.java | 14 +-
.../java/org/apache/solr/core/PluginBag.java | 2 +-
.../solr/core/SimpleTextCodecFactory.java | 38 ++
.../src/java/org/apache/solr/core/SolrCore.java | 18 +-
.../java/org/apache/solr/core/SolrCores.java | 1 +
.../apache/solr/handler/SolrConfigHandler.java | 5 +
.../org/apache/solr/handler/StreamHandler.java | 9 +
.../solr/handler/admin/CoreAdminOperation.java | 90 +--
.../solr/handler/component/FacetComponent.java | 3 +-
.../handler/component/SpatialHeatmapFacets.java | 45 +-
.../handler/component/SpellCheckComponent.java | 12 +-
.../java/org/apache/solr/schema/FieldType.java | 1 +
.../solr/search/FloatPayloadValueSource.java | 221 +++++++
.../apache/solr/search/JoinQParserPlugin.java | 22 +-
.../solr/search/PayloadCheckQParserPlugin.java | 109 ++++
.../solr/search/PayloadScoreQParserPlugin.java | 85 +++
.../org/apache/solr/search/QParserPlugin.java | 2 +
.../org/apache/solr/search/QueryParsing.java | 27 -
.../apache/solr/search/ValueSourceParser.java | 66 +-
.../solr/search/facet/FacetFieldProcessor.java | 10 +-
.../solr/search/facet/FacetProcessor.java | 12 +-
.../apache/solr/search/facet/FacetRequest.java | 74 ++-
.../org/apache/solr/search/facet/HLLAgg.java | 6 +-
.../org/apache/solr/search/facet/MaxAgg.java | 57 --
.../org/apache/solr/search/facet/MinAgg.java | 54 --
.../org/apache/solr/search/facet/MinMaxAgg.java | 236 ++++++++
.../org/apache/solr/search/facet/SlotAcc.java | 36 +-
.../org/apache/solr/search/facet/UniqueAgg.java | 6 +-
.../solr/search/facet/UniqueMultiDvSlotAcc.java | 21 +-
.../search/facet/UniqueMultivaluedSlotAcc.java | 5 +-
.../search/facet/UniqueSinglevaluedSlotAcc.java | 20 +-
.../apache/solr/search/facet/UniqueSlotAcc.java | 6 +-
.../search/join/BlockJoinParentQParser.java | 11 +-
.../join/ChildFieldValueSourceParser.java | 197 ++++++
.../PayloadScoringSimilarityWrapper.java | 80 +++
.../similarities/SchemaSimilarityFactory.java | 23 +-
.../solr/security/PKIAuthenticationPlugin.java | 1 +
.../org/apache/solr/servlet/HttpSolrCall.java | 4 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 75 ++-
.../solr/update/DirectUpdateHandler2.java | 47 +-
.../org/apache/solr/update/SolrIndexConfig.java | 12 -
.../processor/AtomicUpdateProcessorFactory.java | 183 ++++++
.../processor/UpdateRequestProcessorChain.java | 12 +-
.../org/apache/solr/util/PayloadDecoder.java | 27 +
.../java/org/apache/solr/util/PayloadUtils.java | 129 ++++
.../java/org/apache/solr/util/RTimerTree.java | 7 +-
.../org/apache/solr/util/SimplePostTool.java | 10 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 55 +-
.../solr/analysisconfs/analysis-err-schema.xml | 1 -
.../bad-schema-analyzer-class-and-nested.xml | 1 -
.../bad-schema-codec-global-vs-ft-mismatch.xml | 1 -
.../bad-schema-currency-dynamic-multivalued.xml | 1 -
...bad-schema-currency-ft-bogus-code-in-xml.xml | 1 -
...ad-schema-currency-ft-bogus-default-code.xml | 1 -
.../conf/bad-schema-currency-ft-multivalued.xml | 1 -
.../conf/bad-schema-currency-ft-oer-norates.xml | 1 -
.../conf/bad-schema-currency-multivalued.xml | 1 -
.../conf/bad-schema-dup-dynamicField.xml | 1 -
.../collection1/conf/bad-schema-dup-field.xml | 1 -
.../conf/bad-schema-dup-fieldType.xml | 1 -
.../bad-schema-dynamicfield-default-val.xml | 1 -
.../conf/bad-schema-dynamicfield-required.xml | 1 -
.../conf/bad-schema-nontext-analyzer.xml | 1 -
.../conf/bad-schema-not-indexed-but-norms.xml | 1 -
.../conf/bad-schema-not-indexed-but-pos.xml | 1 -
.../conf/bad-schema-not-indexed-but-tf.xml | 1 -
.../conf/bad-schema-omit-tf-but-not-pos.xml | 1 -
.../bad-schema-sim-default-does-not-exist.xml | 2 -
...d-schema-sim-default-has-no-explicit-sim.xml | 2 -
.../bad-schema-sim-global-vs-ft-mismatch.xml | 2 -
.../conf/bad-schema-sweetspot-both-tf.xml | 1 -
.../bad-schema-sweetspot-partial-baseline.xml | 1 -
.../bad-schema-sweetspot-partial-hyperbolic.xml | 3 +-
.../conf/bad-schema-sweetspot-partial-norms.xml | 3 +-
.../bad-schema-uniquekey-is-copyfield-dest.xml | 1 -
.../conf/bad-schema-uniquekey-multivalued.xml | 1 -
.../conf/bad-schema-uniquekey-uses-default.xml | 1 -
.../conf/schema-HighlighterMaxOffsetTest.xml | 2 -
.../collection1/conf/schema-SimpleTextCodec.xml | 32 +
.../conf/schema-blockjoinfacetcomponent.xml | 1 -
.../solr/collection1/conf/schema-bm25.xml | 1 -
.../collection1/conf/schema-charfilters.xml | 1 -
.../solr/collection1/conf/schema-collate-dv.xml | 1 -
.../solr/collection1/conf/schema-collate.xml | 1 -
.../collection1/conf/schema-complex-phrase.xml | 36 --
.../collection1/conf/schema-copyfield-test.xml | 1 -
.../collection1/conf/schema-custom-field.xml | 1 -
.../solr/collection1/conf/schema-dfi.xml | 1 -
.../solr/collection1/conf/schema-dfr.xml | 1 -
.../conf/schema-distrib-interval-faceting.xml | 1 -
.../conf/schema-docValuesFaceting.xml | 1 -
.../collection1/conf/schema-docValuesJoin.xml | 1 -
.../conf/schema-field-sort-values.xml | 1 -
.../solr/collection1/conf/schema-folding.xml | 1 -
.../solr/collection1/conf/schema-hash.xml | 1 -
.../solr/collection1/conf/schema-ib.xml | 1 -
.../collection1/conf/schema-lmdirichlet.xml | 1 -
.../collection1/conf/schema-lmjelinekmercer.xml | 1 -
.../conf/schema-not-required-unique-key.xml | 1 -
.../collection1/conf/schema-phrasesuggest.xml | 1 -
.../conf/schema-postingshighlight.xml | 1 -
.../collection1/conf/schema-psuedo-fields.xml | 3 +-
.../collection1/conf/schema-required-fields.xml | 1 -
.../solr/collection1/conf/schema-rest.xml | 4 -
.../solr/collection1/conf/schema-reversed.xml | 1 -
.../solr/collection1/conf/schema-sim.xml | 1 -
.../collection1/conf/schema-simpleqpplugin.xml | 1 -
.../conf/schema-single-dynamic-copy-field.xml | 4 -
.../collection1/conf/schema-spellchecker.xml | 7 -
.../solr/collection1/conf/schema-sql.xml | 1 -
.../solr/collection1/conf/schema-stop-keep.xml | 59 --
.../solr/collection1/conf/schema-sweetspot.xml | 1 -
.../conf/schema-synonym-tokenizer.xml | 1 -
.../solr/collection1/conf/schema-tfidf.xml | 1 -
.../solr/collection1/conf/schema-trie.xml | 4 -
.../conf/schema-unifiedhighlight.xml | 1 -
.../test-files/solr/collection1/conf/schema.xml | 1 -
.../solr/collection1/conf/schema11.xml | 26 +-
.../solr/collection1/conf/schema12.xml | 1 -
.../solr/collection1/conf/schema15.xml | 9 +-
.../solr/collection1/conf/schema_codec.xml | 1 -
.../solr/collection1/conf/schema_latest.xml | 15 -
.../solr/collection1/conf/schemasurround.xml | 1 -
.../conf/solrconfig-cache-enable-disable.xml | 8 +-
.../conf/solrconfig-collapseqparser.xml | 5 +
.../collection1/conf/solrconfig-elevate.xml | 6 +
.../conf/solrconfig-functionquery.xml | 5 +
.../conf/solrconfig-managed-schema.xml | 6 +
.../collection1/conf/solrconfig-minimal.xml | 6 +
.../collection1/conf/solrconfig-nocache.xml | 6 +
.../conf/solrconfig-plugcollector.xml | 6 +
.../conf/solrconfig-postingshighlight.xml | 1 +
.../conf/solrconfig-response-log-component.xml | 6 +
.../solrconfig-sortingmergepolicyfactory.xml | 5 +
.../conf/solrconfig-spellcheckcomponent.xml | 5 +
.../solrconfig-tlog-with-delayingcomponent.xml | 5 +
.../solr/collection1/conf/solrconfig-tlog.xml | 6 +
.../solr/collection1/conf/solrconfig.xml | 6 +
.../conf/solrconfig_SimpleTextCodec.xml | 26 +
.../configsets/cloud-dynamic/conf/schema.xml | 1 -
.../solr/configsets/doc-expiry/conf/schema.xml | 1 -
.../test-files/solr/crazy-path-to-config.xml | 7 +
.../test-files/solr/crazy-path-to-schema.xml | 1 -
.../apache/solr/TestDistributedGrouping.java | 4 +-
.../solr/cloud/CollectionsAPISolrJTest.java | 38 +-
.../org/apache/solr/cloud/OverseerTest.java | 2 +-
.../apache/solr/cloud/SolrCloudExampleTest.java | 8 +
.../cloud/TestCloudJSONFacetJoinDomain.java | 596 +++++++++++++++++++
.../solr/cloud/TestConfigSetsAPIZkFailure.java | 4 +-
.../test/org/apache/solr/cloud/ZkCLITest.java | 28 +
.../apache/solr/core/TestSimpleTextCodec.java | 67 +++
.../apache/solr/core/TestSolrConfigHandler.java | 4 +-
.../org/apache/solr/handler/JsonLoaderTest.java | 139 +++--
.../solr/handler/admin/StatsReloadRaceTest.java | 13 +-
.../component/SpatialHeatmapFacetsTest.java | 22 +
.../component/SpellCheckComponentTest.java | 79 +--
.../highlight/HighlighterMaxOffsetTest.java | 3 +-
.../metrics/reporters/SolrJmxReporterTest.java | 8 +-
.../schema/TestDefaultSearchFieldResource.java | 28 -
.../solr/rest/schema/TestFieldTypeResource.java | 3 +-
.../solr/rest/schema/TestSchemaResource.java | 12 +-
.../org/apache/solr/schema/CopyFieldTest.java | 6 +-
.../apache/solr/search/QueryEqualityTest.java | 58 +-
.../apache/solr/search/QueryParsingTest.java | 4 +-
.../solr/search/TestExtendedDismaxParser.java | 3 +
.../solr/search/TestMaxScoreQueryParser.java | 4 +-
.../search/TestPayloadCheckQParserPlugin.java | 73 +++
.../search/TestPayloadScoreQParserPlugin.java | 54 ++
.../solr/search/TestReRankQParserPlugin.java | 6 +
.../solr/search/TestSimpleQParserPlugin.java | 4 +-
.../search/facet/TestJsonFacetRefinement.java | 50 +-
.../solr/search/facet/TestJsonFacets.java | 299 +++++++++-
.../solr/search/function/TestFunctionQuery.java | 31 +-
.../search/join/BlockJoinFacetRandomTest.java | 1 +
.../search/join/TestCloudNestedDocsSort.java | 185 ++++++
.../solr/search/join/TestNestedDocsSort.java | 145 +++++
.../AtomicUpdateProcessorFactoryTest.java | 281 +++++++++
.../UpdateRequestProcessorFactoryTest.java | 1 +
.../apache/solr/util/SimplePostToolTest.java | 29 +-
.../apache/solr/util/SolrPluginUtilsTest.java | 7 +-
.../apache/solr/util/TestSolrCLIRunExample.java | 138 +++--
.../example-DIH/solr/db/conf/managed-schema | 20 +-
.../example-DIH/solr/mail/conf/managed-schema | 20 +-
.../example-DIH/solr/solr/conf/managed-schema | 20 +-
solr/licenses/zookeeper-3.4.10.jar.sha1 | 1 +
solr/licenses/zookeeper-3.4.6.jar.sha1 | 1 -
.../basic_configs/conf/managed-schema | 5 +-
.../conf/managed-schema | 30 +-
.../conf/managed-schema | 20 +-
solr/server/solr/zoo.cfg | 14 +
solr/solrj/ivy.xml | 1 +
.../org/apache/solr/client/solrj/io/Tuple.java | 4 +
.../solrj/io/comp/SingleValueComparator.java | 65 ++
.../solr/client/solrj/io/eval/AddEvaluator.java | 4 +-
.../client/solrj/io/eval/ComplexEvaluator.java | 7 +
.../client/solrj/io/eval/FieldEvaluator.java | 17 +-
.../client/solrj/io/eval/NumberEvaluator.java | 13 +
.../client/solrj/io/eval/SimpleEvaluator.java | 3 +
.../client/solrj/io/eval/StreamEvaluator.java | 26 +-
.../client/solrj/io/stream/ColumnEvaluator.java | 77 +++
.../solrj/io/stream/ConvolutionEvaluator.java | 82 +++
.../solrj/io/stream/CorrelationEvaluator.java | 77 +++
.../solrj/io/stream/CovarianceEvaluator.java | 77 +++
.../solr/client/solrj/io/stream/GetStream.java | 14 +-
.../solr/client/solrj/io/stream/LetStream.java | 95 +--
.../solrj/io/stream/PredictEvaluator.java | 68 +++
.../solrj/io/stream/RegressionEvaluator.java | 112 ++++
.../client/solrj/io/stream/StatsStream.java | 65 +-
.../client/solrj/io/stream/StreamContext.java | 6 +-
.../solrj/io/stream/TimeSeriesStream.java | 381 ++++++++++++
.../solr/client/solrj/io/stream/TupStream.java | 218 +++++++
.../io/stream/expr/StreamExpressionParser.java | 2 +-
.../solrj/io/stream/expr/StreamFactory.java | 25 +-
.../solr/client/solrj/util/ClientUtils.java | 29 +
.../apache/solr/common/cloud/SolrZkClient.java | 7 +-
.../apache/solr/common/params/SolrParams.java | 23 +-
.../solr/common/util/JsonRecordReader.java | 1 +
.../solrj/solr/collection1/conf/schema-sql.xml | 1 -
.../solrj/solr/collection1/conf/schema.xml | 1 -
.../solr/configsets/shared/conf/schema.xml | 6 -
.../solr/configsets/shared/conf/solrconfig.xml | 6 +
.../solr/configsets/streaming/conf/schema.xml | 1 -
.../configsets/streaming/conf/solrconfig.xml | 8 +-
.../solrj/solr/crazy-path-to-schema.xml | 1 -
.../solrj/solr/multicore/core0/conf/schema.xml | 6 -
.../solr/multicore/core0/conf/solrconfig.xml | 6 +
.../solrj/solr/multicore/core1/conf/schema.xml | 6 -
.../solr/multicore/core1/conf/solrconfig.xml | 6 +
.../solrj/io/stream/StreamExpressionTest.java | 504 +++++++++++++---
.../stream/eval/AbsoluteValueEvaluatorTest.java | 33 +-
.../solrj/io/stream/eval/AddEvaluatorTest.java | 6 -
solr/webapp/web/css/angular/plugins.css | 6 +
solr/webapp/web/partials/plugins.html | 6 +-
308 files changed, 7733 insertions(+), 1873 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0bb8e47e/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0bb8e47e/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0bb8e47e/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0bb8e47e/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0bb8e47e/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0bb8e47e/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
----------------------------------------------------------------------