You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gu...@apache.org on 2019/02/19 02:26:46 UTC

[lucene-solr] 03/03: Merge branch 'master' of https://gitbox.apache.org/repos/asf/lucene-solr into solr-13131

This is an automated email from the ASF dual-hosted git repository.

gus pushed a commit to branch solr-13131
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 844de7a47225ae53b9e629f8f37def1a36ac2849
Merge: 22fe429 97875af
Author: Gus Heck <gu...@apache.org>
AuthorDate: Mon Feb 18 19:51:37 2019 -0500

    Merge branch 'master' of https://gitbox.apache.org/repos/asf/lucene-solr into solr-13131

 lucene/CHANGES.txt                                 |   2 +
 lucene/MIGRATE.txt                                 |  10 +-
 .../analysis/charfilter/HTMLStripCharFilter.java   |   2 +-
 .../miscellaneous/WordDelimiterIterator.java       |   2 +-
 .../analysis/pattern/PatternReplaceFilter.java     |   4 +-
 .../pattern/SimplePatternSplitTokenizer.java       |   2 +-
 .../analysis/wikipedia/WikipediaTokenizer.java     |   6 +-
 .../codecs/lucene70/Lucene70DocValuesProducer.java |   8 +-
 .../benchmark/byTask/tasks/NewAnalyzerTask.java    |   2 +-
 .../lucene/benchmark/quality/trec/TrecJudge.java   |   2 +-
 .../lucene/classification/BM25NBClassifier.java    |   2 +-
 .../SimpleNaiveBayesDocumentClassifier.java        |   2 +-
 .../classification/utils/NearestFuzzyQuery.java    |   2 +-
 .../lucene/codecs/blockterms/BlockTermsReader.java |   8 +-
 .../blocktreeords/OrdsIntersectTermsEnum.java      |   4 +-
 .../codecs/blocktreeords/OrdsSegmentTermsEnum.java |   4 +-
 .../codecs/bloom/BloomFilteringPostingsFormat.java |   3 +-
 .../lucene/codecs/memory/DirectPostingsFormat.java |   9 +-
 .../lucene/codecs/memory/FSTOrdTermsReader.java    |   7 +-
 .../lucene/codecs/memory/FSTTermsReader.java       |   7 +-
 .../codecs/simpletext/SimpleTextFieldsReader.java  |   3 +-
 .../simpletext/SimpleTextTermVectorsReader.java    |   8 +-
 .../lucene/codecs/PushPostingsWriterBase.java      |   2 +-
 .../codecs/blocktree/IntersectTermsEnum.java       |   4 +-
 .../lucene/codecs/blocktree/SegmentTermsEnum.java  |   4 +-
 .../compressing/CompressingTermVectorsReader.java  |   8 +-
 .../lucene/codecs/compressing/Compressor.java      |   2 +-
 .../codecs/lucene60/Lucene60PointsFormat.java      |   2 +-
 .../codecs/lucene70/Lucene70SegmentInfoFormat.java |   2 +-
 .../codecs/lucene80/Lucene80DocValuesProducer.java |   8 +-
 .../lucene/geo/SimpleGeoJSONPolygonParser.java     |   2 +-
 .../org/apache/lucene/index/BaseTermsEnum.java     |  75 ++
 .../lucene/index/ConcurrentMergeScheduler.java     |   2 +-
 .../lucene/index/EmptyDocValuesProducer.java       |   2 +-
 .../org/apache/lucene/index/FilterLeafReader.java  |  10 +
 .../org/apache/lucene/index/FreqProxFields.java    |   7 +-
 .../org/apache/lucene/index/IndexWriterConfig.java |   2 +-
 .../org/apache/lucene/index/MultiTermsEnum.java    |   2 +-
 .../lucene/index/SortedDocValuesTermsEnum.java     |   2 +-
 .../lucene/index/SortedSetDocValuesTermsEnum.java  |   2 +-
 .../apache/lucene/index/StoredFieldVisitor.java    |   2 +-
 .../java/org/apache/lucene/index/TermsEnum.java    |  37 +-
 .../search/ControlledRealTimeReopenThread.java     |   2 +-
 .../apache/lucene/search/DisjunctionMaxScorer.java |   2 +-
 .../org/apache/lucene/search/FuzzyTermsEnum.java   |   3 +-
 .../lucene/search/SearcherLifetimeManager.java     |   2 +-
 .../org/apache/lucene/search/SearcherManager.java  |   2 +-
 .../java/org/apache/lucene/store/FSDirectory.java  |   4 +-
 .../java/org/apache/lucene/store/IndexInput.java   |   2 +-
 .../apache/lucene/store/NativeFSLockFactory.java   |   2 +-
 .../java/org/apache/lucene/util/ByteBlockPool.java |   2 +-
 .../lucene/util/automaton/CompiledAutomaton.java   |   2 +-
 .../util/automaton/MinimizationOperations.java     |   2 +-
 .../org/apache/lucene/util/automaton/RegExp.java   |   4 +-
 .../src/java/org/apache/lucene/util/fst/Util.java  |   2 +-
 .../test/org/apache/lucene/index/TestCodecs.java   |   7 +-
 .../org/apache/lucene/facet/DrillDownQuery.java    |   2 +-
 .../apache/lucene/facet/LongValueFacetCounts.java  |   2 +-
 .../facet/taxonomy/writercache/LabelToOrdinal.java |   4 +-
 .../taxonomy/writercache/NameHashIntCacheLRU.java  |   2 +-
 .../taxonomy/writercache/NameIntCacheLRU.java      |   2 +-
 .../apache/lucene/index/memory/MemoryIndex.java    |   2 +-
 .../org/apache/lucene/document/LazyDocument.java   |   2 +-
 .../apache/lucene/misc/SweetSpotSimilarity.java    |   2 +-
 .../lucene/queries/function/ValueSource.java       |   5 +-
 .../lucene/queryparser/classic/CharStream.java     |   2 +-
 .../standard/builders/SynonymQueryNodeBuilder.java |   2 +-
 .../flexible/standard/nodes/PointQueryNode.java    |   2 +-
 .../flexible/standard/parser/CharStream.java       |   2 +-
 .../queryparser/surround/parser/CharStream.java    |   2 +-
 .../lucene/replicator/ReplicationClient.java       |   2 +-
 .../org/apache/lucene/replicator/Revision.java     |   4 +-
 .../apache/lucene/replicator/nrt/ReplicaNode.java  |   4 +-
 .../idversion/IDVersionSegmentTermsEnum.java       |   6 +-
 .../suggest/analyzing/AnalyzingInfixSuggester.java |   2 +-
 .../suggest/jaspell/JaspellTernarySearchTrie.java  |   6 +-
 .../apache/lucene/search/suggest/Top50KWiki.utf8   |   2 +-
 .../codecs/ramonly/RAMOnlyPostingsFormat.java      |   8 +-
 .../apache/lucene/index/RandomPostingsTester.java  |   7 +-
 solr/CHANGES.txt                                   |  35 +
 solr/bin/solr                                      |  11 -
 solr/bin/solr.cmd                                  |  10 +-
 .../dataimport/TestContentStreamDataSource.java    |   2 +-
 .../java/org/apache/solr/cloud/ZkController.java   |  18 +-
 .../apache/solr/cloud/api/collections/Assign.java  |   4 +-
 .../OverseerCollectionMessageHandler.java          |   2 +-
 .../java/org/apache/solr/core/CoreContainer.java   |  13 +-
 .../solr/handler/AnalysisRequestHandlerBase.java   |   4 +-
 .../handler/component/RealTimeGetComponent.java    |  25 +-
 .../java/org/apache/solr/query/SolrRangeQuery.java |   3 +-
 .../apache/solr/response/BinaryResponseWriter.java |   9 +
 .../org/apache/solr/uninverting/DocTermOrds.java   |   8 +-
 .../org/apache/solr/update/DocumentBuilder.java    |   4 +-
 .../processor/AtomicUpdateDocumentMerger.java      |   2 +-
 .../processor/DistributedUpdateProcessor.java      |   2 +-
 .../src/java/org/apache/solr/util/SolrCLI.java     |   6 +-
 .../conf/schema-inplace-required-field.xml         |  35 +
 .../apache/solr/cloud/BasicDistributedZkTest.java  |   2 +-
 .../org/apache/solr/cloud/DeleteReplicaTest.java   |   8 +-
 .../org/apache/solr/cloud/MoveReplicaTest.java     |   4 +-
 .../org/apache/solr/cloud/TestCloudRecovery.java   |   2 +-
 .../solr/cloud/TestMiniSolrCloudClusterSSL.java    |   3 +-
 .../org/apache/solr/cloud/TestPullReplica.java     |   2 +-
 .../solr/cloud/TestSkipOverseerOperations.java     |   2 +-
 .../solr/cloud/TestStressInPlaceUpdates.java       |   2 +-
 .../org/apache/solr/cloud/TestTlogReplica.java     |   2 +-
 .../org/apache/solr/cloud/TestWithCollection.java  |   2 +-
 .../org/apache/solr/cloud/ZkShardTermsTest.java    | 632 ++++++++--------
 .../solr/cloud/api/collections/AssignTest.java     |  21 +-
 .../api/collections/CustomCollectionTest.java      |   2 +-
 .../solr/cloud/api/collections/ShardSplitTest.java |   4 +-
 .../cloud/autoscaling/ComputePlanActionTest.java   |   4 +-
 .../ScheduledTriggerIntegrationTest.java           |   2 +-
 .../cloud/autoscaling/TriggerIntegrationTest.java  |   2 +-
 .../TriggerSetPropertiesIntegrationTest.java       |   2 +-
 .../sim/TestSimGenericDistributedQueue.java        |   2 +-
 .../cloud/autoscaling/sim/TestSimLargeCluster.java |   2 +-
 .../cloud/autoscaling/sim/TestSimPolicyCloud.java  |   2 +-
 .../apache/solr/cloud/cdcr/CdcrBootstrapTest.java  |   2 +-
 .../solr/handler/TestSystemCollAutoCreate.java     |   2 +-
 .../metrics/rrd/SolrRrdBackendFactoryTest.java     |   2 +-
 .../org/apache/solr/search/TestQueryTypes.java     |  16 +
 .../apache/solr/search/stats/TestDistribIDF.java   |   4 +-
 .../solr/security/BasicAuthIntegrationTest.java    |   2 +-
 .../security/JWTAuthPluginIntegrationTest.java     |   1 +
 .../hadoop/TestSolrCloudWithHadoopAuthPlugin.java  |   1 +
 .../solr/update/TestInPlaceUpdatesDistrib.java     |   2 +-
 .../update/TestInPlaceUpdatesRequiredField.java    |  48 ++
 .../TimeRoutedAliasUpdateProcessorTest.java        |   2 +-
 .../solr-ref-guide/src/aws-solrcloud-tutorial.adoc |   2 +-
 solr/solr-ref-guide/src/curve-fitting.adoc         |   2 +-
 solr/solr-ref-guide/src/distributed-requests.adoc  |  36 +-
 .../distributed-search-with-index-sharding.adoc    |   5 +-
 solr/solr-ref-guide/src/dsp.adoc                   |   6 +-
 .../src/getting-started-with-solrcloud.adoc        |   2 +-
 solr/solr-ref-guide/src/highlighting.adoc          |   2 +-
 .../src/implicit-requesthandlers.adoc              |   2 +-
 solr/solr-ref-guide/src/installing-solr.adoc       |   2 +-
 solr/solr-ref-guide/src/machine-learning.adoc      |   4 +-
 .../src/solr-control-script-reference.adoc         |   2 +-
 solr/solr-ref-guide/src/streaming-expressions.adoc |   2 +-
 solr/solr-ref-guide/src/the-terms-component.adoc   |   8 +-
 solr/solr-ref-guide/src/time-series.adoc           |   2 +-
 .../client/solrj/FastStreamingDocsCallback.java    |  66 ++
 .../org/apache/solr/client/solrj/SolrClient.java   |  14 +-
 .../solr/client/solrj/impl/HttpSolrClient.java     |   4 +-
 .../solrj/impl/StreamingBinaryResponseParser.java  | 169 +++--
 .../java/org/apache/solr/common/SolrDocument.java  |   1 +
 .../apache/solr/common/ToleratedUpdateError.java   |   2 +-
 .../solr/common/cloud/ClusterProperties.java       |   4 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |   4 +-
 .../org/apache/solr/common/util/DataEntry.java     | 181 +++++
 .../solr/common/util/DataInputInputStream.java     |  14 +
 .../apache/solr/common/util/FastInputStream.java   |   7 +
 .../solr/common/util/FastJavaBinDecoder.java       | 829 +++++++++++++++++++++
 .../org/apache/solr/common/util/JavaBinCodec.java  |  94 +--
 .../org/apache/solr/common/util/StringBytes.java   |  78 ++
 .../apache/solr/common/util/Utf8CharSequence.java  |   4 +-
 .../java/org/apache/solr/common/util/Utils.java    |   1 +
 solr/solrj/src/test-files/solrj/javabin_sample.bin | Bin 0 -> 868 bytes
 .../client/solrj/cloud/autoscaling/TestPolicy.java |   6 +
 .../client/solrj/impl/LBHttpSolrClientTest.java    |   3 +-
 .../client/solrj/io/stream/MathExpressionTest.java |   2 +-
 .../solrj/io/stream/StreamDecoratorTest.java       |   4 +-
 .../solr/client/solrj/io/stream/StreamingTest.java |   4 +-
 .../solr/common/util/TestFastJavabinDecoder.java   | 302 ++++++++
 .../apache/solr/common/util/TestJavaBinCodec.java  |  16 +-
 .../solr/common/util/Utf8CharSequenceTest.java     |   2 +-
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |  19 +-
 169 files changed, 2518 insertions(+), 756 deletions(-)