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 2019/02/20 19:28:13 UTC

[lucene-solr] branch jira/solr-11127 updated (800cd70 -> 565bbbd)

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

ab pushed a change to branch jira/solr-11127
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.


    from 800cd70  Add a read-only mode for SolrCloud collections.
     add cf39708  Add next minor release version 8.1.0
     add 239905e  SOLR-12984: Update CHANGES.txt
     add a10a989  SOLR-13088: Update CHANGES.txt
     add 2547897  SOLR-13134: Update CHANGES.txt
     add 79d0dab  SOLR-13104: Update CHANGES.txt
     add 0a01b9e  disable TestInjection in TestStressCloudBlindAtomicUpdates
     add b802a52  LUCENE-8663: NRTCachingDirectory.slowFileExists may open a file while it's inaccessible
     add 57f693b  LUCENE-8664: Add equals/hashcode methods to TotalHits class
     add 2beb853  SOLR-13147: Update CHANGES.txt
     add 4fc218e  SOLR-13193: LeaderTragicEventTest doesn't catch NoSuchFileException when corrupting files
     add 806744b  reduce number of nodes/shards used in TriLevelCompositeIdRoutingTest to prevent (incredibly frequent) OOM in nightly
     add 6bb2467  SOLR-9515: Update to Hadoop 3
     add edb0531  LUCENE-8669: Fix LatLonShape WITHIN queries that fail with Multiple search Polygons that share the dateline.
     add e4f202c  Revert "SOLR-9515: Update to Hadoop 3"
     add fdb6353  LUCENE-8679: return WITHIN in EdgeTree#relateTriangle only when polygon and triangle share one edge
     add e9c02a6  LUCENE-8676: The Korean tokenizer does not update the last position if the backtrace is caused by a big buffer (1024 chars).
     add 4a3ddc9  SOLR-9515: Update to Hadoop 3 (Mark Miller, Kevin Risden)
     add 372d68f  SOLR-5211: Document that delete-by-id (and updates) don't affect child/nested docs
     add 429481b  Fix precommit - unused import
     add e8a24bc  SOLR-8182: Update TestSolrCloudWithKerberosAlt to work with JDK9+
     add 1a23ab0  SOLR-10199: Solr's Kerberos functionality does not work in Java9 due to dependency on hadoop's AuthenticationFilter which attempt access to JVM protected classes
     add 49dc7a9  SOLR-13146: Update CHANGES.txt
     add 1b077cf  LUCENE-8655: Add .getSource() method to FunctionScoreQuery
     add 430a810  SOLR-12121: Move CHANGES entry to 8.1.0 after merge to branch_8x
     add b061947  SOLR-12999: Index replication could delete segments before downloading segments from master if there is not enough disk space
     add 1d13d3d  SOLR-12999: Index replication could delete segments before downloading segments from master if there is not enough disk space
     add 0add3bb  Removed some unused variables from DistributedUpdateProcessor
     add ea2956f  Harden OrderedExecutorTest to use concurrent latches/barriers for testing parallelism instead of making assumpions about how milliseconds something should take in another thread
     add 87ad59f  SOLR-13210: Fix TriLevelCompositeIdRoutingTest to actually make sense
     add f30f9b4  SOLR-13042: Miscellaneous JSON Faceting ref-guide improvements
     add 5d1d644  LUCENE-8673: Use radix partitioning when merging dimensional points instead of sorting all dimensions before hand.
     add 475f2fd  SOLR-9515 - Remove pom dependency kerby-kerb
     add 956772b  disable TestInjection in RestartWhileUpdatingTest
     add 87564a3  Update language-analysis.adoc
     add f2b8457  Set types in ZkController callables
     add b80df5b  Fix escaping in Solr Reference Guide
     add 796fbae  SOLR-9515 - Add maven forbiddenapis exclude for copied Hadoop code
     add 06c1ebc  LUCENE-8680: Refactor EdgeTree#relateTriangle method
     add 56007af  LUCENE-8680: Add CHANGES.txt entry
     add 32443cf  Ref Guide: fix typos & abbreviated words
     add a3a4ecd  LUCENE-8662: Change TermsEnum.seekExact(BytesRef) to abstract
     add bf69a40  SOLR-12330: rethow NPEs and other json.facet syntax errors properly as 400
     add cd4cf70  SOLR-12330: clarifying domain.(filter,query) for json.facet in the ref guide.
     add 9db39ab  LUCENE-8687: Optimise radix partitioning for points on heap
     add 75c5325  add 7.7.0 version to rdf
     add 55c0617  Allow GPG keys with no spaces
     add 242ff88  SOLR-13155: Add command-line option for testing autoscaling configurations.
     new 70a01fa  Merge branch 'master' into jira/solr-11127
     new 801aecd  Moving forward step by step...
     add 4e34a0c  Add 7.7.0 back compat test indexes
     add 5310152  Fix some spell check issues
     add cfefdad  SOLR-13171 : A true streaming parser for javabin payload/stream without creating any objects
     add a084cc1  SOLR-13241: Add 'autoscaling' tool to solr.cmd
     add abcda82  SOLR-13155: Minor addition to the "stats" section to make it easier to estimate the distribution of cores across nodes.
     add 1654b32  fix grammar in streaming-expressions.adoc
     add e63ac04  further solr-ref-guide grammar fixes (s/rather then/rather than/g)
     add b4b9c39  SOLR-13252: Fix an NPE when setting a "policy" property for an existing collection.
     add e195995  SOLR-12770: make docs on shards param a little more clear, fix a couple typos
     add 52a9241  Ref Guide: fix "cloud mode" to "SolrCloud mode"
     add 10acaf0  SOLR-13126: Correctly combine multiplicative query boosts
     add 4a513fa  LUCENE-8292: Make TermsEnum fully abstract (#574)
     add 8ac34c2  SOLR-13229: Cleanup replicasMetTragicEvent after all exceptions
     add 3235c61  SOLR-12028: BadApple and AwaitsFix annotations usage.
     add 6a0f7b2  SOLR-11876: In-place updates fail during resolution if required fields are present
     add 7e2d401  SOLR-13248: Autoscaling based replica placement is broken out of the box.
     add 97875af  SOLR-13248: Adding upgrade notes which explain the problem and the mitigation as well as steps to revert to the old behavior
     add 55b4d2d  LUCENE-8697: GraphTokenStreamFiniteStrings correctly handles side paths with gaps
     add 6f61bde  LUCENE-8685: Refactor LatLonShape tests
     add ec801b4  LUCENE-8635: add option to move FSTs off-heap, and do so for the FST terms index in the default codec for non-primary-key fields if MMapDirectory is being used
     add af3ff11  SOLR-11763: Upgrade Guava to 25.1-jre (Markus Jelsma, Kevin Risden)
     add 3ef6e01  LUCENE-8699: Change HeapPointWriter to use a single byte array instead to a list   of byte arrays. In addition a new interface PointValue is added to abstract out   the different formats between offline and on-heap writers.
     add a89b065  SOLR-13255 : ClasscastException when URPs try to read a String field which returns a ByteArrayUTF8CHarSequence . This is a regression  in release 7.7
     add 86fe24c  SOLR-13222: Improve logging in StreamingSolrClients (Peter Cseh via Kevin Risden)
     new 565bbbd  Merge branch 'master' into jira/solr-11127

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dev-tools/doap/lucene.rdf                          |    7 +
 dev-tools/doap/solr.rdf                            |    7 +
 .../maven/solr/core/src/test/pom.xml.template      |    1 +
 dev-tools/scripts/buildAndPushRelease.py           |    2 +-
 lucene/CHANGES.txt                                 |   46 +
 lucene/MIGRATE.txt                                 |    7 +
 .../analysis/charfilter/HTMLStripCharFilter.java   |    2 +-
 .../miscellaneous/WordDelimiterIterator.java       |    2 +-
 .../analysis/pattern/PatternReplaceFilter.java     |    4 +-
 .../pattern/SimplePatternSplitTokenizer.java       |    2 +-
 .../analysis/wikipedia/WikipediaTokenizer.java     |    6 +-
 .../apache/lucene/analysis/ko/KoreanTokenizer.java |    2 +-
 .../codecs/lucene70/Lucene70DocValuesProducer.java |    3 +-
 .../lucene/index/TestBackwardsCompatibility.java   |    4 +-
 .../apache/lucene/index/unsupported.7.7.0-cfs.zip  |  Bin 0 -> 15541 bytes
 .../lucene/index/unsupported.7.7.0-nocfs.zip       |  Bin 0 -> 15543 bytes
 .../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 |    3 +-
 .../blocktreeords/OrdsIntersectTermsEnum.java      |    4 +-
 .../codecs/blocktreeords/OrdsSegmentTermsEnum.java |    4 +-
 .../codecs/bloom/BloomFilteringPostingsFormat.java |    3 +-
 .../lucene/codecs/memory/DirectPostingsFormat.java |    6 +-
 .../lucene/codecs/memory/FSTOrdTermsReader.java    |    2 +-
 .../lucene/codecs/memory/FSTTermsReader.java       |    2 +-
 .../codecs/simpletext/SimpleTextBKDWriter.java     |  546 ++-----
 .../codecs/simpletext/SimpleTextFieldsReader.java  |    3 +-
 .../codecs/simpletext/SimpleTextPointsWriter.java  |    4 +-
 .../simpletext/SimpleTextTermVectorsReader.java    |    3 +-
 .../lucene/codecs/PushPostingsWriterBase.java      |    2 +-
 .../codecs/blocktree/BlockTreeTermsReader.java     |    9 +-
 .../lucene/codecs/blocktree/FieldReader.java       |   11 +-
 .../codecs/blocktree/IntersectTermsEnum.java       |    4 +-
 .../lucene/codecs/blocktree/SegmentTermsEnum.java  |    4 +-
 .../compressing/CompressingTermVectorsReader.java  |    3 +-
 .../lucene/codecs/compressing/Compressor.java      |    2 +-
 .../codecs/lucene60/Lucene60PointsFormat.java      |    2 +-
 .../codecs/lucene60/Lucene60PointsWriter.java      |   10 +-
 .../codecs/lucene70/Lucene70SegmentInfoFormat.java |    2 +-
 .../codecs/lucene80/Lucene80DocValuesProducer.java |    3 +-
 .../src/java/org/apache/lucene/geo/EdgeTree.java   |   85 +-
 .../src/java/org/apache/lucene/geo/GeoUtils.java   |   23 +-
 .../src/java/org/apache/lucene/geo/Polygon2D.java  |   49 +-
 .../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  |   15 +
 .../org/apache/lucene/index/FreqProxFields.java    |    2 +-
 .../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    |   42 +-
 .../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/search/TotalHits.java   |   17 +
 .../apache/lucene/store/ByteBufferIndexInput.java  |    2 +-
 .../java/org/apache/lucene/store/FSDirectory.java  |    4 +-
 .../java/org/apache/lucene/store/IndexInput.java   |    2 +-
 .../apache/lucene/store/NRTCachingDirectory.java   |    2 +-
 .../apache/lucene/store/NativeFSLockFactory.java   |    2 +-
 .../java/org/apache/lucene/util/ByteBlockPool.java |    2 +-
 .../src/java/org/apache/lucene/util/Version.java   |    7 +
 .../lucene/util/automaton/CompiledAutomaton.java   |    2 +-
 .../util/automaton/MinimizationOperations.java     |    2 +-
 .../org/apache/lucene/util/automaton/RegExp.java   |    4 +-
 .../apache/lucene/util/bkd/BKDRadixSelector.java   |  520 ++++++
 .../java/org/apache/lucene/util/bkd/BKDWriter.java |  643 ++------
 .../apache/lucene/util/bkd/HeapPointReader.java    |  101 +-
 .../apache/lucene/util/bkd/HeapPointWriter.java    |  166 +-
 .../apache/lucene/util/bkd/OfflinePointReader.java |  229 +--
 .../apache/lucene/util/bkd/OfflinePointWriter.java |   91 +-
 .../org/apache/lucene/util/bkd/PointReader.java    |   57 +-
 .../org/apache/lucene/util/bkd/PointValue.java     |   20 +-
 .../org/apache/lucene/util/bkd/PointWriter.java    |   17 +-
 .../src/java/org/apache/lucene/util/fst/FST.java   |   41 +-
 .../java/org/apache/lucene/util/fst/FSTStore.java  |   18 +-
 .../apache/lucene/util/fst/OffHeapFSTStore.java    |   69 +
 .../org/apache/lucene/util/fst/OnHeapFSTStore.java |   97 ++
 .../lucene/util/fst/ReverseRandomAccessReader.java |   63 +
 .../src/java/org/apache/lucene/util/fst/Util.java  |    2 +-
 .../util/graph/GraphTokenStreamFiniteStrings.java  |   17 +-
 .../test/org/apache/lucene/index/TestCodecs.java   |    2 +-
 .../org/apache/lucene/search/TestSynonymQuery.java |    3 +-
 .../apache/lucene/search/TestTopDocsCollector.java |    2 +-
 .../org/apache/lucene/search/TestTopDocsMerge.java |   12 +-
 .../lucene/search/TestTopFieldCollector.java       |   12 +-
 .../org/apache/lucene/search/TestTotalHits.java    |   56 +
 .../apache/lucene/util/bkd/Test2BBKDPoints.java    |    4 +-
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |   30 +-
 .../lucene/util/bkd/TestBKDRadixSelector.java      |  323 ++++
 .../graph/TestGraphTokenStreamFiniteStrings.java   |   48 +-
 .../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 +-
 lucene/ivy-versions.properties                     |   96 +-
 .../apache/lucene/index/memory/MemoryIndex.java    |    2 +-
 .../org/apache/lucene/document/LazyDocument.java   |    2 +-
 .../apache/lucene/misc/SweetSpotSimilarity.java    |    2 +-
 .../queries/function/FunctionScoreQuery.java       |    7 +
 .../lucene/queries/function/ValueSource.java       |    5 +-
 .../queries/function/TestFunctionScoreQuery.java   |   24 +
 .../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 +-
 .../src/java/org/apache/lucene/geo/Line2D.java     |   15 +
 .../apache/lucene/document/TestLatLonShape.java    |  639 ++------
 ...tLonShape.java => TestLatLonShapeEncoding.java} |  248 +--
 .../org/apache/lucene/search/TestBM25FQuery.java   |    3 +-
 .../suggest/analyzing/AnalyzingInfixSuggester.java |    2 +-
 .../suggest/jaspell/JaspellTernarySearchTrie.java  |    6 +-
 .../apache/lucene/search/suggest/Top50KWiki.utf8   |    2 +-
 .../codecs/ramonly/RAMOnlyPostingsFormat.java      |    5 +-
 .../java/org/apache/lucene/index/RandomCodec.java  |   10 +-
 .../apache/lucene/index/RandomPostingsTester.java  |    2 +-
 .../tools/src/groovy/check-source-patterns.groovy  |    1 +
 solr/CHANGES.txt                                   |  103 +-
 solr/bin/solr                                      |    8 +-
 solr/bin/solr.cmd                                  |   10 +-
 .../dataimport/TestContentStreamDataSource.java    |    2 +-
 ...geIdentifierUpdateProcessorFactoryTestCase.java |   26 +-
 solr/core/build.xml                                |    1 +
 solr/core/ivy.xml                                  |   94 +-
 .../java/org/apache/solr/cloud/ZkController.java   |   22 +-
 .../apache/solr/cloud/api/collections/Assign.java  |    4 +-
 .../OverseerCollectionMessageHandler.java          |    2 +-
 .../api/collections/ReindexCollectionCmd.java      |  125 +-
 .../cloud/api/collections/TimeRoutedAlias.java     |    4 +-
 .../java/org/apache/solr/core/CoreContainer.java   |   13 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |    6 +
 .../solr/handler/AnalysisRequestHandlerBase.java   |    4 +-
 .../java/org/apache/solr/handler/IndexFetcher.java |  108 +-
 .../apache/solr/handler/ReplicationHandler.java    |    9 +
 .../solr/handler/admin/CollectionsHandler.java     |   10 +-
 .../solr/handler/component/HighlightComponent.java |    4 +-
 .../handler/component/RealTimeGetComponent.java    |   25 +-
 .../solr/handler/component/StatsValuesFactory.java |    3 +-
 .../java/org/apache/solr/query/SolrRangeQuery.java |    3 +-
 .../apache/solr/request/SolrQueryRequestBase.java  |   32 +-
 .../apache/solr/response/BinaryResponseWriter.java |    9 +
 .../org/apache/solr/search/facet/FacetModule.java  |    8 +-
 .../apache/solr/search/facet/FacetProcessor.java   |   39 +-
 .../org/apache/solr/search/facet/FacetRange.java   |   29 +-
 .../org/apache/solr/search/facet/FacetRequest.java |   92 +-
 .../org/apache/solr/uninverting/DocTermOrds.java   |    3 +-
 .../apache/solr/update/DefaultSolrCoreState.java   |    6 +-
 .../org/apache/solr/update/DocumentBuilder.java    |   10 +-
 .../apache/solr/update/StreamingSolrClients.java   |    2 +-
 .../processor/AtomicUpdateDocumentMerger.java      |    2 +-
 .../processor/DistributedUpdateProcessor.java      |   11 +-
 .../src/java/org/apache/solr/util/FSHDFSUtils.java |    3 +-
 .../java/org/apache/solr/util/RedactionUtils.java  |   29 +
 .../src/java/org/apache/solr/util/SolrCLI.java     |  301 ++++
 .../conf/schema-inplace-required-field.xml         |   35 +
 .../datanode/fsdataset/impl/BlockPoolSlice.java    | 1044 ++++++++++++
 .../test/org/apache/hadoop/http/HttpServer2.java   | 1685 ++++++++++++++++++++
 .../apache/solr/cloud/BasicDistributedZkTest.java  |    2 +-
 .../org/apache/solr/cloud/DeleteReplicaTest.java   |    8 +-
 .../apache/solr/cloud/LeaderTragicEventTest.java   |    3 +-
 .../org/apache/solr/cloud/MoveReplicaTest.java     |    4 +-
 .../solr/cloud/RestartWhileUpdatingTest.java       |    7 +-
 .../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/TestSolrCloudWithKerberosAlt.java   |   12 -
 .../cloud/TestStressCloudBlindAtomicUpdates.java   |   25 +-
 .../solr/cloud/TestStressInPlaceUpdates.java       |    2 +-
 .../org/apache/solr/cloud/TestTlogReplica.java     |    2 +-
 .../org/apache/solr/cloud/TestWithCollection.java  |    2 +-
 .../solr/cloud/TriLevelCompositeIdRoutingTest.java |  166 +-
 .../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 +-
 .../org/apache/solr/cloud/hdfs/HdfsTestUtil.java   |  166 +-
 .../solr/handler/TestReplicationHandler.java       |   10 +-
 .../TestReplicationHandlerDiskOverFlow.java        |  190 +++
 .../solr/handler/TestSystemCollAutoCreate.java     |    2 +-
 .../TestDistributedStatsComponentCardinality.java  |    3 +-
 .../solr/handler/export/TestExportWriter.java      |    2 +-
 .../metrics/rrd/SolrRrdBackendFactoryTest.java     |    2 +-
 .../solr/response/TestCustomDocTransformer.java    |    3 +-
 .../org/apache/solr/search/TestQueryTypes.java     |   16 +
 .../apache/solr/search/facet/TestJsonFacets.java   |  115 +-
 .../apache/solr/search/stats/TestDistribIDF.java   |    4 +-
 .../solr/security/BasicAuthIntegrationTest.java    |    2 +-
 .../security/JWTAuthPluginIntegrationTest.java     |    1 +
 .../apache/solr/security/JWTAuthPluginTest.java    |    5 +-
 .../hadoop/TestSolrCloudWithHadoopAuthPlugin.java  |    4 +-
 .../security/hadoop/TestZkAclsWithHadoopAuth.java  |    1 -
 .../apache/solr/store/hdfs/HdfsDirectoryTest.java  |    2 +-
 .../solr/update/TestInPlaceUpdatesDistrib.java     |    2 +-
 .../update/TestInPlaceUpdatesRequiredField.java    |   48 +
 .../TimeRoutedAliasUpdateProcessorTest.java        |    2 +-
 .../org/apache/solr/util/OrderedExecutorTest.java  |  159 +-
 solr/licenses/antlr-2.7.7.jar.sha1                 |    1 -
 solr/licenses/antlr-LICENSE-PD.txt                 |   31 -
 solr/licenses/antlr-NOTICE.txt                     |    1 -
 solr/licenses/apacheds-core-2.0.0-M15.jar.sha1     |    1 -
 solr/licenses/apacheds-core-NOTICE.txt             |   23 -
 solr/licenses/apacheds-core-api-2.0.0-M15.jar.sha1 |    1 -
 solr/licenses/apacheds-core-api-NOTICE.txt         |   23 -
 solr/licenses/apacheds-core-avl-2.0.0-M15.jar.sha1 |    1 -
 solr/licenses/apacheds-core-avl-NOTICE.txt         |   23 -
 .../apacheds-core-shared-2.0.0-M15.jar.sha1        |    1 -
 solr/licenses/apacheds-core-shared-LICENSE-ASL.txt |  341 ----
 solr/licenses/apacheds-core-shared-NOTICE.txt      |   23 -
 solr/licenses/apacheds-i18n-2.0.0-M15.jar.sha1     |    1 -
 solr/licenses/apacheds-i18n-LICENSE-ASL.txt        |  341 ----
 solr/licenses/apacheds-i18n-NOTICE.txt             |   23 -
 ...pacheds-interceptor-kerberos-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptor-kerberos-LICENSE-ASL.txt  |  341 ----
 .../apacheds-interceptor-kerberos-NOTICE.txt       |   23 -
 .../apacheds-interceptors-admin-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-admin-LICENSE-ASL.txt    |  341 ----
 .../apacheds-interceptors-admin-NOTICE.txt         |   23 -
 .../apacheds-interceptors-authn-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-authn-LICENSE-ASL.txt    |  341 ----
 .../apacheds-interceptors-authn-NOTICE.txt         |   23 -
 .../apacheds-interceptors-authz-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-authz-LICENSE-ASL.txt    |  341 ----
 .../apacheds-interceptors-authz-NOTICE.txt         |   23 -
 ...cheds-interceptors-changelog-2.0.0-M15.jar.sha1 |    1 -
 ...apacheds-interceptors-changelog-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-changelog-NOTICE.txt     |   23 -
 ...heds-interceptors-collective-2.0.0-M15.jar.sha1 |    1 -
 ...pacheds-interceptors-collective-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-collective-NOTICE.txt    |   23 -
 .../apacheds-interceptors-event-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-event-LICENSE-ASL.txt    |  341 ----
 .../apacheds-interceptors-event-NOTICE.txt         |   23 -
 ...cheds-interceptors-exception-2.0.0-M15.jar.sha1 |    1 -
 ...apacheds-interceptors-exception-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-exception-NOTICE.txt     |   23 -
 ...pacheds-interceptors-journal-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-journal-LICENSE-ASL.txt  |  341 ----
 .../apacheds-interceptors-journal-NOTICE.txt       |   23 -
 ...s-interceptors-normalization-2.0.0-M15.jar.sha1 |    1 -
 ...heds-interceptors-normalization-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-normalization-NOTICE.txt |   23 -
 ...eds-interceptors-operational-2.0.0-M15.jar.sha1 |    1 -
 ...acheds-interceptors-operational-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-operational-NOTICE.txt   |   23 -
 ...acheds-interceptors-referral-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-referral-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-referral-NOTICE.txt      |   23 -
 ...apacheds-interceptors-schema-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-schema-LICENSE-ASL.txt   |  341 ----
 .../apacheds-interceptors-schema-NOTICE.txt        |   23 -
 ...pacheds-interceptors-subtree-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-subtree-LICENSE-ASL.txt  |  341 ----
 .../apacheds-interceptors-subtree-NOTICE.txt       |   23 -
 ...pacheds-interceptors-trigger-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-trigger-LICENSE-ASL.txt  |  341 ----
 .../apacheds-interceptors-trigger-NOTICE.txt       |   23 -
 .../apacheds-jdbm-partition-2.0.0-M15.jar.sha1     |    1 -
 .../apacheds-jdbm-partition-LICENSE-ASL.txt        |  341 ----
 solr/licenses/apacheds-jdbm-partition-NOTICE.txt   |   23 -
 solr/licenses/apacheds-jdbm1-2.0.0-M2.jar.sha1     |    1 -
 solr/licenses/apacheds-jdbm1-LICENSE-ASL.txt       |  341 ----
 solr/licenses/apacheds-jdbm1-NOTICE.txt            |   23 -
 .../apacheds-kerberos-codec-2.0.0-M15.jar.sha1     |    1 -
 .../apacheds-kerberos-codec-LICENSE-ASL.txt        |  341 ----
 solr/licenses/apacheds-kerberos-codec-NOTICE.txt   |   23 -
 .../apacheds-ldif-partition-2.0.0-M15.jar.sha1     |    1 -
 .../apacheds-ldif-partition-LICENSE-ASL.txt        |  341 ----
 solr/licenses/apacheds-ldif-partition-NOTICE.txt   |   23 -
 .../apacheds-mavibot-partition-2.0.0-M15.jar.sha1  |    1 -
 .../apacheds-mavibot-partition-LICENSE-ASL.txt     |  341 ----
 .../licenses/apacheds-mavibot-partition-NOTICE.txt |   23 -
 .../apacheds-protocol-kerberos-2.0.0-M15.jar.sha1  |    1 -
 .../apacheds-protocol-kerberos-LICENSE-ASL.txt     |  341 ----
 .../licenses/apacheds-protocol-kerberos-NOTICE.txt |   23 -
 .../apacheds-protocol-ldap-2.0.0-M15.jar.sha1      |    1 -
 .../apacheds-protocol-ldap-LICENSE-ASL.txt         |  341 ----
 solr/licenses/apacheds-protocol-ldap-NOTICE.txt    |   23 -
 .../apacheds-protocol-shared-2.0.0-M15.jar.sha1    |    1 -
 .../apacheds-protocol-shared-LICENSE-ASL.txt       |  341 ----
 solr/licenses/apacheds-protocol-shared-NOTICE.txt  |   23 -
 .../apacheds-xdbm-partition-2.0.0-M15.jar.sha1     |    1 -
 .../apacheds-xdbm-partition-LICENSE-ASL.txt        |  341 ----
 solr/licenses/apacheds-xdbm-partition-NOTICE.txt   |   23 -
 solr/licenses/api-all-1.0.0-M20.jar.sha1           |    1 -
 solr/licenses/api-all-LICENSE-ASL.txt              |  341 ----
 solr/licenses/api-all-NOTICE.txt                   |   23 -
 solr/licenses/avatica-core-1.10.0.jar.sha1         |    1 -
 solr/licenses/avatica-core-1.13.0.jar.sha1         |    1 +
 solr/licenses/calcite-core-1.13.0.jar.sha1         |    1 -
 solr/licenses/calcite-core-1.18.0.jar.sha1         |    1 +
 solr/licenses/calcite-linq4j-1.13.0.jar.sha1       |    1 -
 solr/licenses/calcite-linq4j-1.18.0.jar.sha1       |    1 +
 solr/licenses/commons-beanutils-1.9.3.jar.sha1     |    1 +
 .../commons-beanutils-LICENSE-ASL.txt}             |    0
 solr/licenses/commons-beanutils-NOTICE.txt         |    5 +
 solr/licenses/commons-compiler-2.7.6.jar.sha1      |    1 -
 solr/licenses/commons-compiler-3.0.9.jar.sha1      |    1 +
 solr/licenses/commons-configuration-1.6.jar.sha1   |    1 -
 .../licenses/commons-configuration2-2.1.1.jar.sha1 |    1 +
 ....txt => commons-configuration2-LICENSE-ASL.txt} |    0
 solr/licenses/commons-configuration2-NOTICE.txt    |    5 +
 solr/licenses/commons-lang3-3.6.jar.sha1           |    1 -
 solr/licenses/commons-lang3-3.8.1.jar.sha1         |    1 +
 .../licenses/commons-logging-1.1.3.jar.sha1        |    0
 ...NSE-ASL.txt => commons-logging-LICENSE-ASL.txt} |    0
 solr/licenses/commons-logging-NOTICE.txt           |    5 +
 solr/licenses/commons-text-1.4.jar.sha1            |    1 +
 .../commons-text-LICENSE-ASL.txt}                  |    0
 solr/licenses/commons-text-NOTICE.txt              |    5 +
 solr/licenses/curator-client-2.13.0.jar.sha1       |    1 +
 solr/licenses/curator-client-2.8.0.jar.sha1        |    1 -
 solr/licenses/curator-framework-2.13.0.jar.sha1    |    1 +
 solr/licenses/curator-framework-2.8.0.jar.sha1     |    1 -
 solr/licenses/curator-recipes-2.13.0.jar.sha1      |    1 +
 solr/licenses/curator-recipes-2.8.0.jar.sha1       |    1 -
 solr/licenses/ehcache-core-2.4.4.jar.sha1          |    1 -
 solr/licenses/ehcache-core-LICENSE-ASL.txt         |   15 -
 solr/licenses/guava-14.0.1.jar.sha1                |    1 -
 solr/licenses/guava-25.1-jre.jar.sha1              |    1 +
 solr/licenses/hadoop-annotations-2.7.4.jar.sha1    |    1 -
 solr/licenses/hadoop-annotations-3.2.0.jar.sha1    |    1 +
 solr/licenses/hadoop-auth-2.7.4.jar.sha1           |    1 -
 solr/licenses/hadoop-auth-3.2.0.jar.sha1           |    1 +
 solr/licenses/hadoop-common-2.7.4-tests.jar.sha1   |    1 -
 solr/licenses/hadoop-common-2.7.4.jar.sha1         |    1 -
 solr/licenses/hadoop-common-3.2.0-tests.jar.sha1   |    1 +
 solr/licenses/hadoop-common-3.2.0.jar.sha1         |    1 +
 solr/licenses/hadoop-hdfs-2.7.4-tests.jar.sha1     |    1 -
 solr/licenses/hadoop-hdfs-2.7.4.jar.sha1           |    1 -
 solr/licenses/hadoop-hdfs-3.2.0-tests.jar.sha1     |    1 +
 solr/licenses/hadoop-hdfs-3.2.0.jar.sha1           |    1 +
 solr/licenses/hadoop-hdfs-client-3.2.0.jar.sha1    |    1 +
 ...-ASL.txt => hadoop-hdfs-client-LICENSE-ASL.txt} |    0
 ...dc-NOTICE.txt => hadoop-hdfs-client-NOTICE.txt} |    0
 solr/licenses/hadoop-minicluster-3.2.0.jar.sha1    |    1 +
 ...-ASL.txt => hadoop-minicluster-LICENSE-ASL.txt} |    0
 ...dc-NOTICE.txt => hadoop-minicluster-NOTICE.txt} |    0
 solr/licenses/hadoop-minikdc-2.7.4.jar.sha1        |    1 -
 solr/licenses/hadoop-minikdc-3.2.0.jar.sha1        |    1 +
 .../licenses/htrace-core-3.2.0-incubating.jar.sha1 |    1 -
 .../htrace-core4-4.1.0-incubating.jar.sha1         |    1 +
 ...ICENSE-ASL.txt => htrace-core4-LICENSE-ASL.txt} |    0
 ...ace-core-NOTICE.txt => htrace-core4-NOTICE.txt} |    0
 solr/licenses/jackson-core-asl-1.9.13.jar.sha1     |    1 -
 solr/licenses/jackson-mapper-asl-1.9.13.jar.sha1   |    1 -
 solr/licenses/janino-2.7.6.jar.sha1                |    1 -
 solr/licenses/janino-3.0.9.jar.sha1                |    1 +
 solr/licenses/jersey-core-1.19.jar.sha1            |    1 +
 solr/licenses/jersey-core-1.9.jar.sha1             |    1 -
 solr/licenses/jersey-server-1.19.jar.sha1          |    1 +
 solr/licenses/jersey-server-1.9.jar.sha1           |    1 -
 solr/licenses/jersey-servlet-1.19.jar.sha1         |    1 +
 ...SE-CDDL.txt => jersey-servlet-LICENSE-CDDL.txt} |    0
 solr/licenses/jetty-6.1.26.jar.sha1                |    1 -
 solr/licenses/jetty-sslengine-6.1.26.jar.sha1      |    1 -
 solr/licenses/jetty-util-6.1.26.jar.sha1           |    1 -
 solr/licenses/json-path-2.4.0.jar.sha1             |    1 +
 ...e-LICENSE-ASL.txt => json-path-LICENSE-ASL.txt} |  141 +-
 ...hcache-core-NOTICE.txt => json-path-NOTICE.txt} |    0
 solr/licenses/kerb-admin-1.0.1.jar.sha1            |    1 +
 ...-LICENSE-ASL.txt => kerb-admin-LICENSE-ASL.txt} |  148 +-
 solr/licenses/kerb-admin-NOTICE.txt                |    5 +
 solr/licenses/kerb-client-1.0.1.jar.sha1           |    1 +
 ...LICENSE-ASL.txt => kerb-client-LICENSE-ASL.txt} |  148 +-
 solr/licenses/kerb-client-NOTICE.txt               |    5 +
 solr/licenses/kerb-common-1.0.1.jar.sha1           |    1 +
 ...LICENSE-ASL.txt => kerb-common-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-common-NOTICE.txt               |    5 +
 solr/licenses/kerb-core-1.0.1.jar.sha1             |    1 +
 ...e-LICENSE-ASL.txt => kerb-core-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-core-NOTICE.txt                 |    5 +
 solr/licenses/kerb-crypto-1.0.1.jar.sha1           |    1 +
 ...LICENSE-ASL.txt => kerb-crypto-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-crypto-NOTICE.txt               |    5 +
 solr/licenses/kerb-identity-1.0.1.jar.sha1         |    1 +
 ...CENSE-ASL.txt => kerb-identity-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-identity-NOTICE.txt             |    5 +
 solr/licenses/kerb-server-1.0.1.jar.sha1           |    1 +
 ...LICENSE-ASL.txt => kerb-server-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-server-NOTICE.txt               |    5 +
 solr/licenses/kerb-simplekdc-1.0.1.jar.sha1        |    1 +
 ...ENSE-ASL.txt => kerb-simplekdc-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-simplekdc-NOTICE.txt            |    5 +
 solr/licenses/kerb-util-1.0.1.jar.sha1             |    1 +
 ...e-LICENSE-ASL.txt => kerb-util-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-util-NOTICE.txt                 |    5 +
 solr/licenses/kerby-asn1-1.0.1.jar.sha1            |    1 +
 ...-LICENSE-ASL.txt => kerby-asn1-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerby-asn1-NOTICE.txt                |    5 +
 solr/licenses/kerby-config-1.0.1.jar.sha1          |    1 +
 ...ICENSE-ASL.txt => kerby-config-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerby-config-NOTICE.txt              |    5 +
 solr/licenses/kerby-kdc-1.0.1.jar.sha1             |    1 +
 ...e-LICENSE-ASL.txt => kerby-kdc-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerby-kdc-NOTICE.txt                 |    5 +
 solr/licenses/kerby-pkix-1.0.1.jar.sha1            |    1 +
 ...-LICENSE-ASL.txt => kerby-pkix-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerby-pkix-NOTICE.txt                |    5 +
 solr/licenses/kerby-util-1.0.1.jar.sha1            |    1 +
 ...-LICENSE-ASL.txt => kerby-util-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerby-util-NOTICE.txt                |    5 +
 solr/licenses/mina-core-2.0.0-M5.jar.sha1          |    1 -
 solr/licenses/netty-all-4.0.36.Final.jar.sha1      |    1 -
 solr/licenses/netty-all-4.0.52.Final.jar.sha1      |    1 +
 solr/licenses/netty-all-NOTICE.txt                 |  140 +-
 solr/licenses/protobuf-java-3.1.0.jar.sha1         |    1 -
 solr/licenses/protobuf-java-3.6.1.jar.sha1         |    1 +
 solr/licenses/re2j-1.2.jar.sha1                    |    1 +
 solr/licenses/re2j-LICENSE-BSD_LIKE.txt            |   33 +
 solr/licenses/re2j-NOTICE.txt                      |    5 +
 .../solr-ref-guide/src/aws-solrcloud-tutorial.adoc |    2 +-
 solr/solr-ref-guide/src/blockjoin-faceting.adoc    |    2 +-
 solr/solr-ref-guide/src/collections-api.adoc       |   14 +-
 solr/solr-ref-guide/src/config-sets.adoc           |    2 +-
 solr/solr-ref-guide/src/configsets-api.adoc        |    2 +-
 .../src/configuring-solrconfig-xml.adoc            |    4 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc         |    2 +-
 solr/solr-ref-guide/src/curve-fitting.adoc         |    2 +-
 ...datadir-and-directoryfactory-in-solrconfig.adoc |    2 +-
 solr/solr-ref-guide/src/distributed-requests.adoc  |   36 +-
 .../distributed-search-with-index-sharding.adoc    |    5 +-
 solr/solr-ref-guide/src/docvalues.adoc             |    2 +-
 solr/solr-ref-guide/src/dsp.adoc                   |    6 +-
 solr/solr-ref-guide/src/function-queries.adoc      |    2 +-
 .../src/getting-started-with-solrcloud.adoc        |    2 +-
 solr/solr-ref-guide/src/highlighting.adoc          |    2 +-
 .../src/implicit-requesthandlers.adoc              |    4 +-
 solr/solr-ref-guide/src/installing-solr.adoc       |    2 +-
 solr/solr-ref-guide/src/json-facet-api.adoc        |  781 +++++----
 .../src/json-faceting-domain-changes.adoc          |  256 +++
 solr/solr-ref-guide/src/json-query-dsl.adoc        |  346 +++-
 solr/solr-ref-guide/src/json-request-api.adoc      |  218 ++-
 solr/solr-ref-guide/src/language-analysis.adoc     |   30 +-
 solr/solr-ref-guide/src/machine-learning.adoc      |    4 +-
 .../src/major-changes-in-solr-7.adoc               |    2 +-
 .../src/making-and-restoring-backups.adoc          |    2 +-
 .../src/query-settings-in-solrconfig.adoc          |    2 +-
 .../solr-ref-guide/src/request-parameters-api.adoc |    4 +-
 solr/solr-ref-guide/src/response-writers.adoc      |    2 +-
 solr/solr-ref-guide/src/schemaless-mode.adoc       |    4 +-
 .../src/solr-control-script-reference.adoc         |    4 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |    4 +-
 .../src/solrcloud-autoscaling-listeners.adoc       |    2 +-
 .../src/solrcloud-autoscaling-triggers.adoc        |    2 +-
 .../src/stream-decorator-reference.adoc            |    2 +-
 .../src/stream-source-reference.adoc               |    4 +-
 solr/solr-ref-guide/src/streaming-expressions.adoc |    2 +-
 .../src/the-extended-dismax-query-parser.adoc      |    2 +-
 solr/solr-ref-guide/src/the-terms-component.adoc   |    8 +-
 solr/solr-ref-guide/src/time-series.adoc           |    2 +-
 .../src/uploading-data-with-index-handlers.adoc    |    9 +-
 solr/solr-ref-guide/src/v2-api.adoc                |    4 +-
 solr/solr-ref-guide/src/velocity-search-ui.adoc    |    2 +-
 .../src/zookeeper-access-control.adoc              |    2 +-
 .../client/solrj/FastStreamingDocsCallback.java    |   66 +
 .../org/apache/solr/client/solrj/SolrClient.java   |   52 +-
 .../solr/client/solrj/cloud/autoscaling/Row.java   |    4 +
 .../solr/client/solrj/impl/HttpSolrClient.java     |    4 +-
 .../solrj/impl/StreamingBinaryResponseParser.java  |  169 +-
 .../java/org/apache/solr/common/SolrDocument.java  |    1 +
 .../org/apache/solr/common/SolrInputField.java     |   61 +-
 .../apache/solr/common/ToleratedUpdateError.java   |    2 +-
 .../solr/common/cloud/ClusterProperties.java       |    4 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |    4 +-
 .../common/util/ByteArrayUtf8CharSequence.java     |    5 +
 .../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  |   96 +-
 .../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
 .../JsonRequestApiHeatmapFacetingTest.java         |  108 ++
 .../ref_guide_examples/JsonRequestApiTest.java     |  563 ++++++-
 .../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 +-
 .../org/apache/solr/util/BadHdfsThreadsFilter.java |    6 +-
 510 files changed, 11331 insertions(+), 14642 deletions(-)
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.7.0-cfs.zip
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.7.0-nocfs.zip
 create mode 100644 lucene/core/src/java/org/apache/lucene/index/BaseTermsEnum.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/util/bkd/BKDRadixSelector.java
 copy solr/solrj/src/java/org/apache/solr/common/util/DataInputInputStream.java => lucene/core/src/java/org/apache/lucene/util/bkd/PointValue.java (68%)
 copy solr/solrj/src/java/org/apache/solr/common/util/DataInputInputStream.java => lucene/core/src/java/org/apache/lucene/util/fst/FSTStore.java (63%)
 create mode 100644 lucene/core/src/java/org/apache/lucene/util/fst/OffHeapFSTStore.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/util/fst/OnHeapFSTStore.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/util/fst/ReverseRandomAccessReader.java
 create mode 100644 lucene/core/src/test/org/apache/lucene/search/TestTotalHits.java
 create mode 100644 lucene/core/src/test/org/apache/lucene/util/bkd/TestBKDRadixSelector.java
 copy lucene/sandbox/src/test/org/apache/lucene/document/{TestLatLonShape.java => TestLatLonShapeEncoding.java} (71%)
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/schema-inplace-required-field.xml
 create mode 100644 solr/core/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
 create mode 100644 solr/core/src/test/org/apache/hadoop/http/HttpServer2.java
 create mode 100644 solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerDiskOverFlow.java
 create mode 100644 solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesRequiredField.java
 delete mode 100644 solr/licenses/antlr-2.7.7.jar.sha1
 delete mode 100644 solr/licenses/antlr-LICENSE-PD.txt
 delete mode 100644 solr/licenses/antlr-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-core-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-core-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-core-api-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-core-api-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-core-avl-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-core-avl-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-core-shared-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-core-shared-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-core-shared-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-i18n-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-i18n-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-i18n-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptor-kerberos-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptor-kerberos-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptor-kerberos-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-admin-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-admin-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-admin-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-authn-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-authn-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-authn-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-authz-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-authz-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-authz-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-changelog-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-changelog-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-changelog-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-collective-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-collective-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-collective-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-event-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-event-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-event-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-exception-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-exception-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-exception-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-journal-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-journal-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-journal-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-normalization-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-normalization-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-normalization-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-operational-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-operational-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-operational-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-referral-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-referral-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-referral-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-schema-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-schema-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-schema-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-subtree-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-subtree-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-subtree-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-trigger-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-interceptors-trigger-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-interceptors-trigger-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-jdbm-partition-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-jdbm-partition-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-jdbm-partition-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-jdbm1-2.0.0-M2.jar.sha1
 delete mode 100644 solr/licenses/apacheds-jdbm1-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-jdbm1-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-kerberos-codec-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-kerberos-codec-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-kerberos-codec-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-ldif-partition-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-ldif-partition-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-ldif-partition-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-mavibot-partition-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-mavibot-partition-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-mavibot-partition-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-protocol-kerberos-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-protocol-kerberos-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-protocol-kerberos-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-protocol-ldap-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-protocol-ldap-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-protocol-ldap-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-protocol-shared-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-protocol-shared-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-protocol-shared-NOTICE.txt
 delete mode 100644 solr/licenses/apacheds-xdbm-partition-2.0.0-M15.jar.sha1
 delete mode 100644 solr/licenses/apacheds-xdbm-partition-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/apacheds-xdbm-partition-NOTICE.txt
 delete mode 100644 solr/licenses/api-all-1.0.0-M20.jar.sha1
 delete mode 100644 solr/licenses/api-all-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/api-all-NOTICE.txt
 delete mode 100644 solr/licenses/avatica-core-1.10.0.jar.sha1
 create mode 100644 solr/licenses/avatica-core-1.13.0.jar.sha1
 delete mode 100644 solr/licenses/calcite-core-1.13.0.jar.sha1
 create mode 100644 solr/licenses/calcite-core-1.18.0.jar.sha1
 delete mode 100644 solr/licenses/calcite-linq4j-1.13.0.jar.sha1
 create mode 100644 solr/licenses/calcite-linq4j-1.18.0.jar.sha1
 create mode 100644 solr/licenses/commons-beanutils-1.9.3.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/commons-beanutils-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 create mode 100644 solr/licenses/commons-beanutils-NOTICE.txt
 delete mode 100644 solr/licenses/commons-compiler-2.7.6.jar.sha1
 create mode 100644 solr/licenses/commons-compiler-3.0.9.jar.sha1
 delete mode 100644 solr/licenses/commons-configuration-1.6.jar.sha1
 create mode 100644 solr/licenses/commons-configuration2-2.1.1.jar.sha1
 copy solr/licenses/{commons-configuration-LICENSE-ASL.txt => commons-configuration2-LICENSE-ASL.txt} (100%)
 create mode 100644 solr/licenses/commons-configuration2-NOTICE.txt
 delete mode 100644 solr/licenses/commons-lang3-3.6.jar.sha1
 create mode 100644 solr/licenses/commons-lang3-3.8.1.jar.sha1
 copy {lucene => solr}/licenses/commons-logging-1.1.3.jar.sha1 (100%)
 copy solr/licenses/{rrd4j-LICENSE-ASL.txt => commons-logging-LICENSE-ASL.txt} (100%)
 create mode 100644 solr/licenses/commons-logging-NOTICE.txt
 create mode 100644 solr/licenses/commons-text-1.4.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/commons-text-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 create mode 100644 solr/licenses/commons-text-NOTICE.txt
 create mode 100644 solr/licenses/curator-client-2.13.0.jar.sha1
 delete mode 100644 solr/licenses/curator-client-2.8.0.jar.sha1
 create mode 100644 solr/licenses/curator-framework-2.13.0.jar.sha1
 delete mode 100644 solr/licenses/curator-framework-2.8.0.jar.sha1
 create mode 100644 solr/licenses/curator-recipes-2.13.0.jar.sha1
 delete mode 100644 solr/licenses/curator-recipes-2.8.0.jar.sha1
 delete mode 100644 solr/licenses/ehcache-core-2.4.4.jar.sha1
 delete mode 100644 solr/licenses/ehcache-core-LICENSE-ASL.txt
 delete mode 100644 solr/licenses/guava-14.0.1.jar.sha1
 create mode 100644 solr/licenses/guava-25.1-jre.jar.sha1
 delete mode 100644 solr/licenses/hadoop-annotations-2.7.4.jar.sha1
 create mode 100644 solr/licenses/hadoop-annotations-3.2.0.jar.sha1
 delete mode 100644 solr/licenses/hadoop-auth-2.7.4.jar.sha1
 create mode 100644 solr/licenses/hadoop-auth-3.2.0.jar.sha1
 delete mode 100644 solr/licenses/hadoop-common-2.7.4-tests.jar.sha1
 delete mode 100644 solr/licenses/hadoop-common-2.7.4.jar.sha1
 create mode 100644 solr/licenses/hadoop-common-3.2.0-tests.jar.sha1
 create mode 100644 solr/licenses/hadoop-common-3.2.0.jar.sha1
 delete mode 100644 solr/licenses/hadoop-hdfs-2.7.4-tests.jar.sha1
 delete mode 100644 solr/licenses/hadoop-hdfs-2.7.4.jar.sha1
 create mode 100644 solr/licenses/hadoop-hdfs-3.2.0-tests.jar.sha1
 create mode 100644 solr/licenses/hadoop-hdfs-3.2.0.jar.sha1
 create mode 100644 solr/licenses/hadoop-hdfs-client-3.2.0.jar.sha1
 copy solr/licenses/{hadoop-minikdc-LICENSE-ASL.txt => hadoop-hdfs-client-LICENSE-ASL.txt} (100%)
 copy solr/licenses/{hadoop-minikdc-NOTICE.txt => hadoop-hdfs-client-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/hadoop-minicluster-3.2.0.jar.sha1
 copy solr/licenses/{hadoop-minikdc-LICENSE-ASL.txt => hadoop-minicluster-LICENSE-ASL.txt} (100%)
 copy solr/licenses/{hadoop-minikdc-NOTICE.txt => hadoop-minicluster-NOTICE.txt} (100%)
 delete mode 100644 solr/licenses/hadoop-minikdc-2.7.4.jar.sha1
 create mode 100644 solr/licenses/hadoop-minikdc-3.2.0.jar.sha1
 delete mode 100644 solr/licenses/htrace-core-3.2.0-incubating.jar.sha1
 create mode 100644 solr/licenses/htrace-core4-4.1.0-incubating.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => htrace-core4-LICENSE-ASL.txt} (100%)
 rename solr/licenses/{htrace-core-NOTICE.txt => htrace-core4-NOTICE.txt} (100%)
 delete mode 100644 solr/licenses/jackson-core-asl-1.9.13.jar.sha1
 delete mode 100644 solr/licenses/jackson-mapper-asl-1.9.13.jar.sha1
 delete mode 100644 solr/licenses/janino-2.7.6.jar.sha1
 create mode 100644 solr/licenses/janino-3.0.9.jar.sha1
 create mode 100644 solr/licenses/jersey-core-1.19.jar.sha1
 delete mode 100644 solr/licenses/jersey-core-1.9.jar.sha1
 create mode 100644 solr/licenses/jersey-server-1.19.jar.sha1
 delete mode 100644 solr/licenses/jersey-server-1.9.jar.sha1
 create mode 100644 solr/licenses/jersey-servlet-1.19.jar.sha1
 copy solr/licenses/{jersey-server-LICENSE-CDDL.txt => jersey-servlet-LICENSE-CDDL.txt} (100%)
 delete mode 100644 solr/licenses/jetty-6.1.26.jar.sha1
 delete mode 100644 solr/licenses/jetty-sslengine-6.1.26.jar.sha1
 delete mode 100644 solr/licenses/jetty-util-6.1.26.jar.sha1
 create mode 100644 solr/licenses/json-path-2.4.0.jar.sha1
 rename solr/licenses/{apacheds-core-LICENSE-ASL.txt => json-path-LICENSE-ASL.txt} (58%)
 rename solr/licenses/{ehcache-core-NOTICE.txt => json-path-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/kerb-admin-1.0.1.jar.sha1
 rename solr/licenses/{apacheds-core-api-LICENSE-ASL.txt => kerb-admin-LICENSE-ASL.txt} (58%)
 create mode 100644 solr/licenses/kerb-admin-NOTICE.txt
 create mode 100644 solr/licenses/kerb-client-1.0.1.jar.sha1
 rename solr/licenses/{apacheds-core-avl-LICENSE-ASL.txt => kerb-client-LICENSE-ASL.txt} (58%)
 create mode 100644 solr/licenses/kerb-client-NOTICE.txt
 create mode 100644 solr/licenses/kerb-common-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerb-common-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerb-common-NOTICE.txt
 create mode 100644 solr/licenses/kerb-core-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerb-core-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerb-core-NOTICE.txt
 create mode 100644 solr/licenses/kerb-crypto-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerb-crypto-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerb-crypto-NOTICE.txt
 create mode 100644 solr/licenses/kerb-identity-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerb-identity-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerb-identity-NOTICE.txt
 create mode 100644 solr/licenses/kerb-server-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerb-server-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerb-server-NOTICE.txt
 create mode 100644 solr/licenses/kerb-simplekdc-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerb-simplekdc-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerb-simplekdc-NOTICE.txt
 create mode 100644 solr/licenses/kerb-util-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerb-util-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerb-util-NOTICE.txt
 create mode 100644 solr/licenses/kerby-asn1-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerby-asn1-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerby-asn1-NOTICE.txt
 create mode 100644 solr/licenses/kerby-config-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerby-config-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerby-config-NOTICE.txt
 create mode 100644 solr/licenses/kerby-kdc-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerby-kdc-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerby-kdc-NOTICE.txt
 create mode 100644 solr/licenses/kerby-pkix-1.0.1.jar.sha1
 copy solr/licenses/{htrace-core-LICENSE-ASL.txt => kerby-pkix-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerby-pkix-NOTICE.txt
 create mode 100644 solr/licenses/kerby-util-1.0.1.jar.sha1
 rename solr/licenses/{htrace-core-LICENSE-ASL.txt => kerby-util-LICENSE-ASL.txt} (89%)
 create mode 100644 solr/licenses/kerby-util-NOTICE.txt
 delete mode 100644 solr/licenses/mina-core-2.0.0-M5.jar.sha1
 delete mode 100644 solr/licenses/netty-all-4.0.36.Final.jar.sha1
 create mode 100644 solr/licenses/netty-all-4.0.52.Final.jar.sha1
 delete mode 100644 solr/licenses/protobuf-java-3.1.0.jar.sha1
 create mode 100644 solr/licenses/protobuf-java-3.6.1.jar.sha1
 create mode 100644 solr/licenses/re2j-1.2.jar.sha1
 create mode 100644 solr/licenses/re2j-LICENSE-BSD_LIKE.txt
 create mode 100644 solr/licenses/re2j-NOTICE.txt
 create mode 100644 solr/solr-ref-guide/src/json-faceting-domain-changes.adoc
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/FastStreamingDocsCallback.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/common/util/DataEntry.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/common/util/FastJavaBinDecoder.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/common/util/StringBytes.java
 create mode 100644 solr/solrj/src/test-files/solrj/javabin_sample.bin
 create mode 100644 solr/solrj/src/test/org/apache/solr/client/ref_guide_examples/JsonRequestApiHeatmapFacetingTest.java
 create mode 100644 solr/solrj/src/test/org/apache/solr/common/util/TestFastJavabinDecoder.java


[lucene-solr] 03/03: Merge branch 'master' into jira/solr-11127

Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 565bbbd2f0ef35981d60eab96a94dff308f41fa1
Merge: 801aecd 86fe24c
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Feb 20 11:27:59 2019 -0800

    Merge branch 'master' into jira/solr-11127

 lucene/CHANGES.txt                                 |  17 +
 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 +-
 .../lucene/index/TestBackwardsCompatibility.java   |   4 +-
 .../apache/lucene/index/unsupported.7.7.0-cfs.zip  | Bin 0 -> 15541 bytes
 .../lucene/index/unsupported.7.7.0-nocfs.zip       | Bin 0 -> 15543 bytes
 .../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/SimpleTextBKDWriter.java     |  69 +-
 .../codecs/simpletext/SimpleTextFieldsReader.java  |   3 +-
 .../simpletext/SimpleTextTermVectorsReader.java    |   8 +-
 .../lucene/codecs/PushPostingsWriterBase.java      |   2 +-
 .../codecs/blocktree/BlockTreeTermsReader.java     |   9 +-
 .../lucene/codecs/blocktree/FieldReader.java       |  11 +-
 .../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 +-
 .../apache/lucene/store/ByteBufferIndexInput.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 +-
 .../apache/lucene/util/bkd/BKDRadixSelector.java   | 336 ++++++---
 .../java/org/apache/lucene/util/bkd/BKDWriter.java |  62 +-
 .../apache/lucene/util/bkd/HeapPointReader.java    |  68 +-
 .../apache/lucene/util/bkd/HeapPointWriter.java    | 124 +--
 .../apache/lucene/util/bkd/OfflinePointReader.java |  66 +-
 .../apache/lucene/util/bkd/OfflinePointWriter.java |  22 +-
 .../org/apache/lucene/util/bkd/PointReader.java    |  11 +-
 .../org/apache/lucene/util/bkd/PointValue.java     |  20 +-
 .../org/apache/lucene/util/bkd/PointWriter.java    |   9 +-
 .../src/java/org/apache/lucene/util/fst/FST.java   |  41 +-
 .../java/org/apache/lucene/util/fst/FSTStore.java  |  18 +-
 .../apache/lucene/util/fst/OffHeapFSTStore.java    |  69 ++
 .../org/apache/lucene/util/fst/OnHeapFSTStore.java |  97 +++
 .../lucene/util/fst/ReverseRandomAccessReader.java |  63 ++
 .../src/java/org/apache/lucene/util/fst/Util.java  |   2 +-
 .../util/graph/GraphTokenStreamFiniteStrings.java  |  17 +-
 .../test/org/apache/lucene/index/TestCodecs.java   |   7 +-
 .../lucene/util/bkd/TestBKDRadixSelector.java      |  76 +-
 .../graph/TestGraphTokenStreamFiniteStrings.java   |  48 +-
 .../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 +-
 lucene/ivy-versions.properties                     |  11 +-
 .../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 +-
 .../apache/lucene/document/TestLatLonShape.java    | 532 -------------
 ...tLonShape.java => TestLatLonShapeEncoding.java} | 381 +---------
 .../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                                   |  46 ++
 solr/bin/solr                                      |  11 -
 solr/bin/solr.cmd                                  |  10 +-
 .../dataimport/TestContentStreamDataSource.java    |   2 +-
 ...geIdentifierUpdateProcessorFactoryTestCase.java |  26 +-
 solr/core/ivy.xml                                  |   1 +
 .../java/org/apache/solr/cloud/ZkController.java   |  18 +-
 .../apache/solr/cloud/api/collections/Assign.java  |   4 +-
 .../OverseerCollectionMessageHandler.java          |   2 +-
 .../cloud/api/collections/TimeRoutedAlias.java     |   4 +-
 .../java/org/apache/solr/core/CoreContainer.java   |  13 +-
 .../solr/handler/AnalysisRequestHandlerBase.java   |   4 +-
 .../solr/handler/component/HighlightComponent.java |   4 +-
 .../handler/component/RealTimeGetComponent.java    |  25 +-
 .../solr/handler/component/StatsValuesFactory.java |   3 +-
 .../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    |  10 +-
 .../apache/solr/update/StreamingSolrClients.java   |   2 +-
 .../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 +-
 .../TestDistributedStatsComponentCardinality.java  |   3 +-
 .../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/licenses/avatica-core-1.10.0.jar.sha1         |   1 -
 solr/licenses/avatica-core-1.13.0.jar.sha1         |   1 +
 solr/licenses/calcite-core-1.13.0.jar.sha1         |   1 -
 solr/licenses/calcite-core-1.18.0.jar.sha1         |   1 +
 solr/licenses/calcite-linq4j-1.13.0.jar.sha1       |   1 -
 solr/licenses/calcite-linq4j-1.18.0.jar.sha1       |   1 +
 solr/licenses/commons-compiler-2.7.6.jar.sha1      |   1 -
 solr/licenses/commons-compiler-3.0.9.jar.sha1      |   1 +
 solr/licenses/curator-client-2.13.0.jar.sha1       |   1 +
 solr/licenses/curator-client-2.8.0.jar.sha1        |   1 -
 solr/licenses/curator-framework-2.13.0.jar.sha1    |   1 +
 solr/licenses/curator-framework-2.8.0.jar.sha1     |   1 -
 solr/licenses/curator-recipes-2.13.0.jar.sha1      |   1 +
 solr/licenses/curator-recipes-2.8.0.jar.sha1       |   1 -
 solr/licenses/guava-14.0.1.jar.sha1                |   1 -
 solr/licenses/guava-25.1-jre.jar.sha1              |   1 +
 solr/licenses/janino-2.7.6.jar.sha1                |   1 -
 solr/licenses/janino-3.0.9.jar.sha1                |   1 +
 solr/licenses/json-path-2.4.0.jar.sha1             |   1 +
 solr/licenses/json-path-LICENSE-ASL.txt            | 202 +++++
 solr/licenses/json-path-NOTICE.txt                 |   0
 .../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 +
 .../org/apache/solr/common/SolrInputField.java     |  61 +-
 .../apache/solr/common/ToleratedUpdateError.java   |   2 +-
 .../solr/common/cloud/ClusterProperties.java       |   4 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |   4 +-
 .../common/util/ByteArrayUtf8CharSequence.java     |   5 +
 .../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  |  96 +--
 .../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 +-
 226 files changed, 3674 insertions(+), 2130 deletions(-)



[lucene-solr] 02/03: Moving forward step by step...

Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 801aecdf9f16e266d71f8294947bccb0cd57e193
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Feb 13 13:53:02 2019 +0100

    Moving forward step by step...
---
 .../api/collections/ReindexCollectionCmd.java      | 125 +++++++++++++++++----
 .../solr/handler/admin/CollectionsHandler.java     |  10 +-
 2 files changed, 111 insertions(+), 24 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
index 0b9efd6..f8f5930 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/ReindexCollectionCmd.java
@@ -26,7 +26,6 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrResponse;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -42,7 +41,6 @@ import org.apache.solr.common.params.CommonAdminParams;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.CoreAdminParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.common.util.Utils;
 import org.apache.solr.util.TimeOut;
@@ -50,13 +48,37 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- *
+ * Reindex a collection, usually in order to change the index schema.
+ * <p>WARNING: Reindexing is a potentially lossy operation - some indexed data that is not available as
+ * stored fields may be irretrievably lost, so users should use this command with caution, evaluating
+ * the potential impact by using different source and target collection names first, and preserving
+ * the source collection until the evaluation is complete.</p>
+ * <p>Reindexing follows these steps:</p>
+ * <ol>
+ *    <li>create a temporary collection using the most recent schema of the source collection
+ *    (or the one specified in the parameters, which must already exist).</li>
+ *    <li>copy the source documents to the temporary collection, reconstructing them from their stored
+ *    fields and reindexing them using the specified schema. NOTE: some data
+ *    loss may occur if the original stored field data is not available!</li>
+ *    <li>if the target collection name is not specified
+ *    then the same name as the source is assumed and at this step the source collection is permanently removed.</li>
+ *    <li>create the target collection from scratch with the specified name (or the same as source if not
+ *    specified), but using the new specified schema. NOTE: if the target name was not specified or is the same
+ *    as the source collection then the original collection has been deleted in the previous step and it's
+ *    not possible to roll-back the changes if the process is interrupted. The (possibly incomplete) data
+ *    is still available in the temporary collection.</li>
+ *    <li>copy the documents from the temporary collection to the target collection, using the specified schema.</li>
+ *    <li>delete temporary collection(s) and optionally delete the source collection if it still exists.</li>
+ * </ol>
  */
 public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cmd {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   public static final String ABORT = "abort";
-  public static final String COL_PREFIX = ".reindex_";
+  public static final String KEEP_SOURCE = "keepSource";
+  public static final String TARGET = "target";
+  public static final String TMP_COL_PREFIX = ".reindex_";
+  public static final String CHK_COL_PREFIX = ".reindex_ck_";
   public static final String REINDEX_PROP = CollectionAdminRequest.PROPERTY_PREFIX + "reindex";
   public static final String REINDEX_PHASE_PROP = CollectionAdminRequest.PROPERTY_PREFIX + "reindex_phase";
   public static final String READONLY_PROP = CollectionAdminRequest.PROPERTY_PREFIX + ZkStateReader.READ_ONLY_PROP;
@@ -77,7 +99,11 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
       if (p == null) {
         return null;
       }
-      return states.get(p.toLowerCase(Locale.ROOT));
+      p = p.toLowerCase(Locale.ROOT);
+      if (p.startsWith(CollectionAdminRequest.PROPERTY_PREFIX)) {
+        p = p.substring(CollectionAdminRequest.PROPERTY_PREFIX.length());
+      }
+      return states.get(p);
     }
     static Map<String, State> states = Collections.unmodifiableMap(
         Stream.of(State.values()).collect(Collectors.toMap(State::toLower, Function.identity())));
@@ -93,10 +119,18 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
     log.info("*** called: {}", message);
 
     String collection = message.getStr(CommonParams.NAME);
-    boolean abort = message.getBool(ABORT, false);
     if (collection == null || clusterState.getCollectionOrNull(collection) == null) {
       throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Collection name must be specified and must exist");
     }
+    String target = message.getStr(TARGET);
+    if (target == null) {
+      target = collection;
+    }
+    boolean keepSource = message.getBool(KEEP_SOURCE, false);
+    if (keepSource && target.equals(collection)) {
+      throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Can't specify keepSource=true when target is the same as source");
+    }
+    boolean abort = message.getBool(ABORT, false);
     DocCollection coll = clusterState.getCollection(collection);
     if (abort) {
       ZkNodeProps props = new ZkNodeProps(
@@ -105,6 +139,7 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
           REINDEX_PROP, State.ABORTED.toLower());
       ocmh.overseer.offerStateUpdate(Utils.toJSON(props));
       results.add(State.ABORTED.toLower(), collection);
+      // if needed the cleanup will be performed by the running instance of the command
       return;
     }
     // check it's not already running
@@ -112,12 +147,13 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
     if (state == State.RUNNING) {
       throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Reindex is already running for collection " + collection);
     }
-    // set the flag
+    // set the running flag
     ZkNodeProps props = new ZkNodeProps(
         Overseer.QUEUE_OPERATION, CollectionParams.CollectionAction.MODIFYCOLLECTION.toLower(),
         ZkStateReader.COLLECTION_PROP, collection,
         REINDEX_PROP, State.RUNNING.toLower());
     ocmh.overseer.offerStateUpdate(Utils.toJSON(props));
+
     boolean aborted = false;
     Integer rf = coll.getReplicationFactor();
     Integer numNrt = coll.getNumNrtReplicas();
@@ -126,22 +162,15 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
     int numShards = coll.getActiveSlices().size();
 
     String configName = message.getStr(ZkStateReader.CONFIGNAME_PROP, ocmh.zkStateReader.readConfigName(collection));
-    String tmpCollection = COL_PREFIX + collection;
+    String tmpCollection = TMP_COL_PREFIX + collection;
+    String chkCollection = CHK_COL_PREFIX + collection;
 
     try {
-      // 0. set up temp collection - delete first if necessary
+      // 0. set up temp and checkpoint collections - delete first if necessary
       NamedList<Object> cmdResults = new NamedList<>();
       ZkNodeProps cmd;
       if (clusterState.getCollectionOrNull(tmpCollection) != null) {
-        // delete any aliases and the collection
-        ocmh.zkStateReader.aliasesManager.update();
-        String alias = DeleteCollectionCmd.referencedByAlias(tmpCollection, ocmh.zkStateReader.getAliases());
-        if (alias != null) {
-          // delete the alias
-          cmd = new ZkNodeProps(CommonParams.NAME, alias);
-          ocmh.commandMap.get(CollectionParams.CollectionAction.DELETEALIAS).call(clusterState, cmd, cmdResults);
-          // nocommit error checking
-        }
+        // delete the tmp collection
         cmd = new ZkNodeProps(
             CommonParams.NAME, tmpCollection,
             CoreAdminParams.DELETE_METRICS_HISTORY, "true"
@@ -149,6 +178,21 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
         ocmh.commandMap.get(CollectionParams.CollectionAction.DELETE).call(clusterState, cmd, cmdResults);
         // nocommit error checking
       }
+      if (clusterState.getCollectionOrNull(chkCollection) != null) {
+        // delete the checkpoint collection
+        cmd = new ZkNodeProps(
+            CommonParams.NAME, chkCollection,
+            CoreAdminParams.DELETE_METRICS_HISTORY, "true"
+        );
+        ocmh.commandMap.get(CollectionParams.CollectionAction.DELETE).call(clusterState, cmd, cmdResults);
+        // nocommit error checking
+      }
+
+      if (maybeAbort(collection)) {
+        aborted = true;
+        return;
+      }
+
       // create the tmp collection - use RF=1
       cmd = new ZkNodeProps(
           CommonParams.NAME, tmpCollection,
@@ -159,18 +203,29 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
       );
       ocmh.commandMap.get(CollectionParams.CollectionAction.CREATE).call(clusterState, cmd, cmdResults);
       // nocommit error checking
-      // wait for a while until we see the collection
+
+      // create the checkpoint collection - use RF=1 and 1 shard
+      cmd = new ZkNodeProps(
+          CommonParams.NAME, chkCollection,
+          ZkStateReader.NUM_SHARDS_PROP, "1",
+          ZkStateReader.REPLICATION_FACTOR, "1",
+          CollectionAdminParams.COLL_CONF, configName,
+          CommonAdminParams.WAIT_FOR_FINAL_STATE, "true"
+      );
+      ocmh.commandMap.get(CollectionParams.CollectionAction.CREATE).call(clusterState, cmd, cmdResults);
+      // nocommit error checking
+      // wait for a while until we see both collections
       TimeOut waitUntil = new TimeOut(30, TimeUnit.SECONDS, ocmh.timeSource);
       boolean created = false;
       while (! waitUntil.hasTimedOut()) {
         waitUntil.sleep(100);
         // this also refreshes our local var clusterState
         clusterState = ocmh.cloudManager.getClusterStateProvider().getClusterState();
-        created = clusterState.hasCollection(tmpCollection);
+        created = clusterState.hasCollection(tmpCollection) && clusterState.hasCollection(chkCollection);
         if(created) break;
       }
       if (!created) {
-        throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Could not fully create collection: " + tmpCollection);
+        throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Could not fully create temporary collection(s)");
       }
       if (maybeAbort(collection)) {
         aborted = true;
@@ -184,19 +239,43 @@ public class ReindexCollectionCmd implements OverseerCollectionMessageHandler.Cm
       ocmh.overseer.offerStateUpdate(Utils.toJSON(props));
 
       // 2. copy the documents to tmp
+      // Recipe taken from: http://joelsolr.blogspot.com/2016/10/solr-63-batch-jobs-parallel-etl-and.html
       ModifiableSolrParams q = new ModifiableSolrParams();
       q.set(CommonParams.QT, "/stream");
-      q.set("expr", "daemon(id=\"" + tmpCollection + "\")");
+      q.set("expr",
+          "daemon(id=\"" + tmpCollection + "\"," +
+          "terminate=\"true\"," +
+          "commit(" + tmpCollection + "," +
+            "update(" + tmpCollection + "," +
+              "batchSize=100," +
+              "topic(" + chkCollection + "," +
+                  collection + "," +
+                  "q=\"*:*\"," +
+                  "fl=\"*\"," +
+                  "id=\"topic_" + tmpCollection + "\"," +
+              // some of the documents eg. in .system contain large blobs
+                  "rows=\"100\"," +
+                  "initialCheckpoint=\"0\"))))");
       SolrResponse rsp = ocmh.cloudManager.request(new QueryRequest(q));
 
-      // 3. delete source collection
+      // wait for the daemon to finish
+
+      // 3. if target is the same then now delete source collection
 
       // 4. copy from tmp to source collection
 
+      // wait for the daemon to finish
+
+      // 5. optionally delete the source collection
+
       // nocommit error checking
     } finally {
       if (aborted) {
         // nocommit - cleanup
+
+        // 1. kill the daemons
+        // 2. cleanup tmp / chk collections IFF the source collection still exists and is not empty
+        // 3. cleanup collection state
         results.add(State.ABORTED.toLower(), collection);
       }
     }
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index 1316fa0..7b7b1e5 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -52,6 +52,7 @@ import org.apache.solr.cloud.OverseerTaskQueue.QueueEvent;
 import org.apache.solr.cloud.ZkController.NotInClusterStateException;
 import org.apache.solr.cloud.ZkController;
 import org.apache.solr.cloud.ZkShardTerms;
+import org.apache.solr.cloud.api.collections.ReindexCollectionCmd;
 import org.apache.solr.cloud.overseer.SliceMutator;
 import org.apache.solr.cloud.rule.ReplicaAssigner;
 import org.apache.solr.cloud.rule.Rule;
@@ -524,7 +525,14 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
 
     RELOAD_OP(RELOAD, (req, rsp, h) -> copy(req.getParams().required(), null, NAME)),
 
-    REINDEX_COLLECTION_OP(REINDEX_COLLECTION, (req, rsp, h) -> copy(req.getParams().required(), null, NAME)),
+    REINDEX_COLLECTION_OP(REINDEX_COLLECTION, (req, rsp, h) -> {
+      Map<String, Object> m = copy(req.getParams().required(), null, NAME);
+      copy(req.getParams(), m,
+          ReindexCollectionCmd.ABORT,
+          ReindexCollectionCmd.KEEP_SOURCE,
+          ReindexCollectionCmd.TARGET);
+      return m;
+    }),
 
     SYNCSHARD_OP(SYNCSHARD, (req, rsp, h) -> {
       String collection = req.getParams().required().get("collection");


[lucene-solr] 01/03: Merge branch 'master' into jira/solr-11127

Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 70a01fa327d7a2e7c0053f813f0a9897acaf9dbc
Merge: 800cd70 242ff88
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Feb 12 12:40:49 2019 +0100

    Merge branch 'master' into jira/solr-11127

 dev-tools/doap/lucene.rdf                          |    7 +
 dev-tools/doap/solr.rdf                            |    7 +
 .../maven/solr/core/src/test/pom.xml.template      |    1 +
 dev-tools/scripts/buildAndPushRelease.py           |    2 +-
 lucene/CHANGES.txt                                 |   29 +
 lucene/MIGRATE.txt                                 |    7 +
 .../apache/lucene/analysis/ko/KoreanTokenizer.java |    2 +-
 .../codecs/lucene70/Lucene70DocValuesProducer.java |    5 +
 .../lucene/codecs/blockterms/BlockTermsReader.java |    5 +
 .../lucene/codecs/memory/DirectPostingsFormat.java |    5 +
 .../lucene/codecs/memory/FSTOrdTermsReader.java    |    5 +
 .../lucene/codecs/memory/FSTTermsReader.java       |    5 +
 .../codecs/simpletext/SimpleTextBKDWriter.java     |  521 ++----
 .../codecs/simpletext/SimpleTextPointsWriter.java  |    4 +-
 .../simpletext/SimpleTextTermVectorsReader.java    |    5 +
 .../compressing/CompressingTermVectorsReader.java  |    5 +
 .../codecs/lucene60/Lucene60PointsWriter.java      |   10 +-
 .../codecs/lucene80/Lucene80DocValuesProducer.java |    5 +
 .../src/java/org/apache/lucene/geo/EdgeTree.java   |   85 +-
 .../src/java/org/apache/lucene/geo/GeoUtils.java   |   23 +-
 .../src/java/org/apache/lucene/geo/Polygon2D.java  |   49 +-
 .../org/apache/lucene/index/FilterLeafReader.java  |    5 +
 .../org/apache/lucene/index/FreqProxFields.java    |    5 +
 .../java/org/apache/lucene/index/TermsEnum.java    |   25 +-
 .../java/org/apache/lucene/search/TotalHits.java   |   17 +
 .../apache/lucene/store/NRTCachingDirectory.java   |    2 +-
 .../src/java/org/apache/lucene/util/Version.java   |    7 +
 .../apache/lucene/util/bkd/BKDRadixSelector.java   |  386 +++++
 .../java/org/apache/lucene/util/bkd/BKDWriter.java |  627 ++------
 .../apache/lucene/util/bkd/HeapPointReader.java    |   53 +-
 .../apache/lucene/util/bkd/HeapPointWriter.java    |  118 +-
 .../apache/lucene/util/bkd/OfflinePointReader.java |  211 +--
 .../apache/lucene/util/bkd/OfflinePointWriter.java |   81 +-
 .../org/apache/lucene/util/bkd/PointReader.java    |   50 +-
 .../org/apache/lucene/util/bkd/PointWriter.java    |   18 +-
 .../test/org/apache/lucene/index/TestCodecs.java   |    5 +
 .../org/apache/lucene/search/TestSynonymQuery.java |    3 +-
 .../apache/lucene/search/TestTopDocsCollector.java |    2 +-
 .../org/apache/lucene/search/TestTopDocsMerge.java |   12 +-
 .../lucene/search/TestTopFieldCollector.java       |   12 +-
 .../org/apache/lucene/search/TestTotalHits.java    |   56 +
 .../apache/lucene/util/bkd/Test2BBKDPoints.java    |    4 +-
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |   30 +-
 .../lucene/util/bkd/TestBKDRadixSelector.java      |  317 ++++
 lucene/ivy-versions.properties                     |   85 +-
 .../queries/function/FunctionScoreQuery.java       |    7 +
 .../queries/function/TestFunctionScoreQuery.java   |   24 +
 .../src/java/org/apache/lucene/geo/Line2D.java     |   15 +
 .../apache/lucene/document/TestLatLonShape.java    |  133 ++
 .../org/apache/lucene/search/TestBM25FQuery.java   |    3 +-
 .../codecs/ramonly/RAMOnlyPostingsFormat.java      |    5 +
 .../java/org/apache/lucene/index/RandomCodec.java  |   10 +-
 .../apache/lucene/index/RandomPostingsTester.java  |    5 +
 .../tools/src/groovy/check-source-patterns.groovy  |    1 +
 solr/CHANGES.txt                                   |   57 +-
 solr/bin/solr                                      |   19 +-
 solr/core/build.xml                                |    1 +
 solr/core/ivy.xml                                  |   93 +-
 .../java/org/apache/solr/cloud/ZkController.java   |    4 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |    6 +
 .../java/org/apache/solr/handler/IndexFetcher.java |  108 +-
 .../apache/solr/handler/ReplicationHandler.java    |    9 +
 .../apache/solr/request/SolrQueryRequestBase.java  |   32 +-
 .../org/apache/solr/search/facet/FacetModule.java  |    8 +-
 .../apache/solr/search/facet/FacetProcessor.java   |   39 +-
 .../org/apache/solr/search/facet/FacetRange.java   |   29 +-
 .../org/apache/solr/search/facet/FacetRequest.java |   92 +-
 .../org/apache/solr/uninverting/DocTermOrds.java   |    5 +
 .../apache/solr/update/DefaultSolrCoreState.java   |    6 +-
 .../processor/DistributedUpdateProcessor.java      |    9 +-
 .../src/java/org/apache/solr/util/FSHDFSUtils.java |    3 +-
 .../java/org/apache/solr/util/RedactionUtils.java  |   29 +
 .../src/java/org/apache/solr/util/SolrCLI.java     |  297 ++++
 .../datanode/fsdataset/impl/BlockPoolSlice.java    | 1044 ++++++++++++
 .../test/org/apache/hadoop/http/HttpServer2.java   | 1685 ++++++++++++++++++++
 .../apache/solr/cloud/LeaderTragicEventTest.java   |    3 +-
 .../solr/cloud/RestartWhileUpdatingTest.java       |    7 +-
 .../solr/cloud/TestSolrCloudWithKerberosAlt.java   |   12 -
 .../cloud/TestStressCloudBlindAtomicUpdates.java   |   25 +-
 .../solr/cloud/TriLevelCompositeIdRoutingTest.java |  166 +-
 .../org/apache/solr/cloud/hdfs/HdfsTestUtil.java   |  166 +-
 .../solr/handler/TestReplicationHandler.java       |   10 +-
 .../TestReplicationHandlerDiskOverFlow.java        |  190 +++
 .../solr/handler/export/TestExportWriter.java      |    2 +-
 .../solr/response/TestCustomDocTransformer.java    |    3 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |  115 +-
 .../apache/solr/security/JWTAuthPluginTest.java    |    5 +-
 .../hadoop/TestSolrCloudWithHadoopAuthPlugin.java  |    3 -
 .../security/hadoop/TestZkAclsWithHadoopAuth.java  |    1 -
 .../apache/solr/store/hdfs/HdfsDirectoryTest.java  |    2 +-
 .../org/apache/solr/util/OrderedExecutorTest.java  |  159 +-
 solr/licenses/antlr-2.7.7.jar.sha1                 |    1 -
 solr/licenses/antlr-LICENSE-PD.txt                 |   31 -
 solr/licenses/antlr-NOTICE.txt                     |    1 -
 solr/licenses/apacheds-core-2.0.0-M15.jar.sha1     |    1 -
 solr/licenses/apacheds-core-NOTICE.txt             |   23 -
 solr/licenses/apacheds-core-api-2.0.0-M15.jar.sha1 |    1 -
 solr/licenses/apacheds-core-api-NOTICE.txt         |   23 -
 solr/licenses/apacheds-core-avl-2.0.0-M15.jar.sha1 |    1 -
 solr/licenses/apacheds-core-avl-NOTICE.txt         |   23 -
 .../apacheds-core-shared-2.0.0-M15.jar.sha1        |    1 -
 solr/licenses/apacheds-core-shared-NOTICE.txt      |   23 -
 solr/licenses/apacheds-i18n-2.0.0-M15.jar.sha1     |    1 -
 solr/licenses/apacheds-i18n-LICENSE-ASL.txt        |  341 ----
 solr/licenses/apacheds-i18n-NOTICE.txt             |   23 -
 ...pacheds-interceptor-kerberos-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptor-kerberos-LICENSE-ASL.txt  |  341 ----
 .../apacheds-interceptor-kerberos-NOTICE.txt       |   23 -
 .../apacheds-interceptors-admin-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-admin-LICENSE-ASL.txt    |  341 ----
 .../apacheds-interceptors-admin-NOTICE.txt         |   23 -
 .../apacheds-interceptors-authn-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-authn-LICENSE-ASL.txt    |  341 ----
 .../apacheds-interceptors-authn-NOTICE.txt         |   23 -
 .../apacheds-interceptors-authz-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-authz-LICENSE-ASL.txt    |  341 ----
 .../apacheds-interceptors-authz-NOTICE.txt         |   23 -
 ...cheds-interceptors-changelog-2.0.0-M15.jar.sha1 |    1 -
 ...apacheds-interceptors-changelog-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-changelog-NOTICE.txt     |   23 -
 ...heds-interceptors-collective-2.0.0-M15.jar.sha1 |    1 -
 ...pacheds-interceptors-collective-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-collective-NOTICE.txt    |   23 -
 .../apacheds-interceptors-event-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-event-LICENSE-ASL.txt    |  341 ----
 .../apacheds-interceptors-event-NOTICE.txt         |   23 -
 ...cheds-interceptors-exception-2.0.0-M15.jar.sha1 |    1 -
 ...apacheds-interceptors-exception-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-exception-NOTICE.txt     |   23 -
 ...pacheds-interceptors-journal-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-journal-LICENSE-ASL.txt  |  341 ----
 .../apacheds-interceptors-journal-NOTICE.txt       |   23 -
 ...s-interceptors-normalization-2.0.0-M15.jar.sha1 |    1 -
 ...heds-interceptors-normalization-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-normalization-NOTICE.txt |   23 -
 ...eds-interceptors-operational-2.0.0-M15.jar.sha1 |    1 -
 ...acheds-interceptors-operational-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-operational-NOTICE.txt   |   23 -
 ...acheds-interceptors-referral-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-referral-LICENSE-ASL.txt |  341 ----
 .../apacheds-interceptors-referral-NOTICE.txt      |   23 -
 ...apacheds-interceptors-schema-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-schema-LICENSE-ASL.txt   |  341 ----
 .../apacheds-interceptors-schema-NOTICE.txt        |   23 -
 ...pacheds-interceptors-subtree-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-subtree-LICENSE-ASL.txt  |  341 ----
 .../apacheds-interceptors-subtree-NOTICE.txt       |   23 -
 ...pacheds-interceptors-trigger-2.0.0-M15.jar.sha1 |    1 -
 .../apacheds-interceptors-trigger-LICENSE-ASL.txt  |  341 ----
 .../apacheds-interceptors-trigger-NOTICE.txt       |   23 -
 .../apacheds-jdbm-partition-2.0.0-M15.jar.sha1     |    1 -
 .../apacheds-jdbm-partition-LICENSE-ASL.txt        |  341 ----
 solr/licenses/apacheds-jdbm-partition-NOTICE.txt   |   23 -
 solr/licenses/apacheds-jdbm1-2.0.0-M2.jar.sha1     |    1 -
 solr/licenses/apacheds-jdbm1-LICENSE-ASL.txt       |  341 ----
 solr/licenses/apacheds-jdbm1-NOTICE.txt            |   23 -
 .../apacheds-kerberos-codec-2.0.0-M15.jar.sha1     |    1 -
 .../apacheds-kerberos-codec-LICENSE-ASL.txt        |  341 ----
 solr/licenses/apacheds-kerberos-codec-NOTICE.txt   |   23 -
 .../apacheds-ldif-partition-2.0.0-M15.jar.sha1     |    1 -
 .../apacheds-ldif-partition-LICENSE-ASL.txt        |  341 ----
 solr/licenses/apacheds-ldif-partition-NOTICE.txt   |   23 -
 .../apacheds-mavibot-partition-2.0.0-M15.jar.sha1  |    1 -
 .../apacheds-mavibot-partition-LICENSE-ASL.txt     |  341 ----
 .../licenses/apacheds-mavibot-partition-NOTICE.txt |   23 -
 .../apacheds-protocol-kerberos-2.0.0-M15.jar.sha1  |    1 -
 .../apacheds-protocol-kerberos-LICENSE-ASL.txt     |  341 ----
 .../licenses/apacheds-protocol-kerberos-NOTICE.txt |   23 -
 .../apacheds-protocol-ldap-2.0.0-M15.jar.sha1      |    1 -
 .../apacheds-protocol-ldap-LICENSE-ASL.txt         |  341 ----
 solr/licenses/apacheds-protocol-ldap-NOTICE.txt    |   23 -
 .../apacheds-protocol-shared-2.0.0-M15.jar.sha1    |    1 -
 .../apacheds-protocol-shared-LICENSE-ASL.txt       |  341 ----
 solr/licenses/apacheds-protocol-shared-NOTICE.txt  |   23 -
 .../apacheds-xdbm-partition-2.0.0-M15.jar.sha1     |    1 -
 .../apacheds-xdbm-partition-LICENSE-ASL.txt        |  341 ----
 solr/licenses/apacheds-xdbm-partition-NOTICE.txt   |   23 -
 solr/licenses/api-all-1.0.0-M20.jar.sha1           |    1 -
 solr/licenses/api-all-LICENSE-ASL.txt              |  341 ----
 solr/licenses/api-all-NOTICE.txt                   |   23 -
 solr/licenses/commons-beanutils-1.9.3.jar.sha1     |    1 +
 ...E-ASL.txt => commons-beanutils-LICENSE-ASL.txt} |  139 --
 solr/licenses/commons-beanutils-NOTICE.txt         |    5 +
 solr/licenses/commons-configuration-1.6.jar.sha1   |    1 -
 .../licenses/commons-configuration2-2.1.1.jar.sha1 |    1 +
 ....txt => commons-configuration2-LICENSE-ASL.txt} |  231 ++-
 solr/licenses/commons-configuration2-NOTICE.txt    |    5 +
 solr/licenses/commons-lang3-3.6.jar.sha1           |    1 -
 solr/licenses/commons-lang3-3.8.1.jar.sha1         |    1 +
 solr/licenses/commons-logging-1.1.3.jar.sha1       |    1 +
 ...NSE-ASL.txt => commons-logging-LICENSE-ASL.txt} |   30 +-
 solr/licenses/commons-logging-NOTICE.txt           |    5 +
 solr/licenses/commons-text-1.4.jar.sha1            |    1 +
 ...ICENSE-ASL.txt => commons-text-LICENSE-ASL.txt} |  139 --
 solr/licenses/commons-text-NOTICE.txt              |    5 +
 solr/licenses/ehcache-core-2.4.4.jar.sha1          |    1 -
 solr/licenses/ehcache-core-LICENSE-ASL.txt         |   15 -
 solr/licenses/ehcache-core-NOTICE.txt              |    0
 solr/licenses/hadoop-annotations-2.7.4.jar.sha1    |    1 -
 solr/licenses/hadoop-annotations-3.2.0.jar.sha1    |    1 +
 solr/licenses/hadoop-auth-2.7.4.jar.sha1           |    1 -
 solr/licenses/hadoop-auth-3.2.0.jar.sha1           |    1 +
 solr/licenses/hadoop-common-2.7.4-tests.jar.sha1   |    1 -
 solr/licenses/hadoop-common-2.7.4.jar.sha1         |    1 -
 solr/licenses/hadoop-common-3.2.0-tests.jar.sha1   |    1 +
 solr/licenses/hadoop-common-3.2.0.jar.sha1         |    1 +
 solr/licenses/hadoop-hdfs-2.7.4-tests.jar.sha1     |    1 -
 solr/licenses/hadoop-hdfs-2.7.4.jar.sha1           |    1 -
 solr/licenses/hadoop-hdfs-3.2.0-tests.jar.sha1     |    1 +
 solr/licenses/hadoop-hdfs-3.2.0.jar.sha1           |    1 +
 solr/licenses/hadoop-hdfs-client-3.2.0.jar.sha1    |    1 +
 ...-ASL.txt => hadoop-hdfs-client-LICENSE-ASL.txt} |  177 +-
 solr/licenses/hadoop-hdfs-client-NOTICE.txt        |    2 +
 solr/licenses/hadoop-minicluster-3.2.0.jar.sha1    |    1 +
 ...-ASL.txt => hadoop-minicluster-LICENSE-ASL.txt} |  177 +-
 solr/licenses/hadoop-minicluster-NOTICE.txt        |    2 +
 solr/licenses/hadoop-minikdc-2.7.4.jar.sha1        |    1 -
 solr/licenses/hadoop-minikdc-3.2.0.jar.sha1        |    1 +
 .../licenses/htrace-core-3.2.0-incubating.jar.sha1 |    1 -
 .../htrace-core4-4.1.0-incubating.jar.sha1         |    1 +
 ...ICENSE-ASL.txt => htrace-core4-LICENSE-ASL.txt} |    0
 ...ace-core-NOTICE.txt => htrace-core4-NOTICE.txt} |    0
 solr/licenses/jackson-core-asl-1.9.13.jar.sha1     |    1 -
 solr/licenses/jackson-mapper-asl-1.9.13.jar.sha1   |    1 -
 solr/licenses/jersey-core-1.19.jar.sha1            |    1 +
 solr/licenses/jersey-core-1.9.jar.sha1             |    1 -
 solr/licenses/jersey-server-1.19.jar.sha1          |    1 +
 solr/licenses/jersey-server-1.9.jar.sha1           |    1 -
 solr/licenses/jersey-servlet-1.19.jar.sha1         |    1 +
 solr/licenses/jersey-servlet-LICENSE-CDDL.txt      |   85 +
 solr/licenses/jetty-6.1.26.jar.sha1                |    1 -
 solr/licenses/jetty-sslengine-6.1.26.jar.sha1      |    1 -
 solr/licenses/jetty-util-6.1.26.jar.sha1           |    1 -
 solr/licenses/kerb-admin-1.0.1.jar.sha1            |    1 +
 ...-LICENSE-ASL.txt => kerb-admin-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-admin-NOTICE.txt                |    5 +
 solr/licenses/kerb-client-1.0.1.jar.sha1           |    1 +
 ...LICENSE-ASL.txt => kerb-client-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-client-NOTICE.txt               |    5 +
 solr/licenses/kerb-common-1.0.1.jar.sha1           |    1 +
 ...LICENSE-ASL.txt => kerb-common-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-common-NOTICE.txt               |    5 +
 solr/licenses/kerb-core-1.0.1.jar.sha1             |    1 +
 ...e-LICENSE-ASL.txt => kerb-core-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-core-NOTICE.txt                 |    5 +
 solr/licenses/kerb-crypto-1.0.1.jar.sha1           |    1 +
 ...LICENSE-ASL.txt => kerb-crypto-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-crypto-NOTICE.txt               |    5 +
 solr/licenses/kerb-identity-1.0.1.jar.sha1         |    1 +
 ...CENSE-ASL.txt => kerb-identity-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-identity-NOTICE.txt             |    5 +
 solr/licenses/kerb-server-1.0.1.jar.sha1           |    1 +
 ...LICENSE-ASL.txt => kerb-server-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-server-NOTICE.txt               |    5 +
 solr/licenses/kerb-simplekdc-1.0.1.jar.sha1        |    1 +
 ...ENSE-ASL.txt => kerb-simplekdc-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-simplekdc-NOTICE.txt            |    5 +
 solr/licenses/kerb-util-1.0.1.jar.sha1             |    1 +
 ...e-LICENSE-ASL.txt => kerb-util-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerb-util-NOTICE.txt                 |    5 +
 solr/licenses/kerby-asn1-1.0.1.jar.sha1            |    1 +
 ...-LICENSE-ASL.txt => kerby-asn1-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerby-asn1-NOTICE.txt                |    5 +
 solr/licenses/kerby-config-1.0.1.jar.sha1          |    1 +
 ...ICENSE-ASL.txt => kerby-config-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerby-config-NOTICE.txt              |    5 +
 solr/licenses/kerby-kdc-1.0.1.jar.sha1             |    1 +
 ...e-LICENSE-ASL.txt => kerby-kdc-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerby-kdc-NOTICE.txt                 |    5 +
 solr/licenses/kerby-pkix-1.0.1.jar.sha1            |    1 +
 ...-LICENSE-ASL.txt => kerby-pkix-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerby-pkix-NOTICE.txt                |    5 +
 solr/licenses/kerby-util-1.0.1.jar.sha1            |    1 +
 ...-LICENSE-ASL.txt => kerby-util-LICENSE-ASL.txt} |   31 +-
 solr/licenses/kerby-util-NOTICE.txt                |    5 +
 solr/licenses/mina-core-2.0.0-M5.jar.sha1          |    1 -
 solr/licenses/netty-all-4.0.36.Final.jar.sha1      |    1 -
 solr/licenses/netty-all-4.0.52.Final.jar.sha1      |    1 +
 solr/licenses/netty-all-NOTICE.txt                 |  140 +-
 solr/licenses/protobuf-java-3.1.0.jar.sha1         |    1 -
 solr/licenses/protobuf-java-3.6.1.jar.sha1         |    1 +
 solr/licenses/re2j-1.2.jar.sha1                    |    1 +
 solr/licenses/re2j-LICENSE-BSD_LIKE.txt            |   33 +
 solr/licenses/re2j-NOTICE.txt                      |    5 +
 solr/solr-ref-guide/src/blockjoin-faceting.adoc    |    2 +-
 solr/solr-ref-guide/src/collections-api.adoc       |   14 +-
 solr/solr-ref-guide/src/config-sets.adoc           |    2 +-
 solr/solr-ref-guide/src/configsets-api.adoc        |    2 +-
 .../src/configuring-solrconfig-xml.adoc            |    4 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc         |    2 +-
 ...datadir-and-directoryfactory-in-solrconfig.adoc |    2 +-
 solr/solr-ref-guide/src/docvalues.adoc             |    2 +-
 solr/solr-ref-guide/src/function-queries.adoc      |    2 +-
 .../src/implicit-requesthandlers.adoc              |    2 +-
 solr/solr-ref-guide/src/json-facet-api.adoc        |  781 +++++----
 .../src/json-faceting-domain-changes.adoc          |  256 +++
 solr/solr-ref-guide/src/json-query-dsl.adoc        |  346 +++-
 solr/solr-ref-guide/src/json-request-api.adoc      |  218 ++-
 solr/solr-ref-guide/src/language-analysis.adoc     |   30 +-
 .../src/major-changes-in-solr-7.adoc               |    2 +-
 .../src/making-and-restoring-backups.adoc          |    2 +-
 .../src/query-settings-in-solrconfig.adoc          |    2 +-
 .../solr-ref-guide/src/request-parameters-api.adoc |    4 +-
 solr/solr-ref-guide/src/response-writers.adoc      |    2 +-
 solr/solr-ref-guide/src/schemaless-mode.adoc       |    4 +-
 .../src/solr-control-script-reference.adoc         |    2 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |    4 +-
 .../src/solrcloud-autoscaling-listeners.adoc       |    2 +-
 .../src/solrcloud-autoscaling-triggers.adoc        |    2 +-
 .../src/stream-decorator-reference.adoc            |    2 +-
 .../src/stream-source-reference.adoc               |    4 +-
 .../src/the-extended-dismax-query-parser.adoc      |    2 +-
 .../src/uploading-data-with-index-handlers.adoc    |    9 +-
 solr/solr-ref-guide/src/v2-api.adoc                |    4 +-
 solr/solr-ref-guide/src/velocity-search-ui.adoc    |    2 +-
 .../src/zookeeper-access-control.adoc              |    2 +-
 .../org/apache/solr/client/solrj/SolrClient.java   |   38 +-
 .../solr/client/solrj/cloud/autoscaling/Row.java   |    4 +
 .../JsonRequestApiHeatmapFacetingTest.java         |  108 ++
 .../ref_guide_examples/JsonRequestApiTest.java     |  563 ++++++-
 .../org/apache/solr/util/BadHdfsThreadsFilter.java |    6 +-
 321 files changed, 8579 insertions(+), 12795 deletions(-)