You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/06/05 09:51:11 UTC

[10/19] lucene-solr:master: sequence numbers: merge master

sequence numbers: merge master


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

Branch: refs/heads/master
Commit: 293314bf6da06ab57c63112f2dcd76c93b1799d2
Parents: 59311a4 ecec524
Author: Mike McCandless <mi...@apache.org>
Authored: Mon May 30 04:33:27 2016 -0400
Committer: Mike McCandless <mi...@apache.org>
Committed: Mon May 30 04:33:27 2016 -0400

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   5 +-
 .../index/TestBackwardsCompatibility.java       |   4 +-
 .../org/apache/lucene/index/index.6.0.1-cfs.zip | Bin 0 -> 13734 bytes
 .../apache/lucene/index/index.6.0.1-nocfs.zip   | Bin 0 -> 13735 bytes
 .../apache/lucene/util/BytesRefComparator.java  |  55 +++++
 .../lucene/util/FixedLengthBytesRefArray.java   |  29 +++
 .../org/apache/lucene/util/MSBRadixSorter.java  | 219 +++++++++++++++++++
 .../lucene/util/StringMSBRadixSorter.java       | 158 ++-----------
 .../org/apache/lucene/util/bkd/BKDWriter.java   | 113 ++++------
 .../apache/lucene/util/TestMSBRadixSorter.java  | 117 ++++++++++
 .../lucene/document/TestHalfFloatPoint.java     |   2 +-
 .../prefix/tree/DateRangePrefixTreeTest.java    |   7 +-
 solr/CHANGES.txt                                |  13 ++
 .../apache/solr/handler/RequestHandlerBase.java |  29 ++-
 .../solr/highlight/DefaultSolrHighlighter.java  | 103 ++++++---
 .../solr/spelling/SpellCheckCollator.java       |   3 +
 .../org/apache/solr/util/SolrPluginUtils.java   |  14 +-
 .../cloud/DistribJoinFromCollectionTest.java    | 144 ++++++------
 .../apache/solr/highlight/HighlighterTest.java  |  82 ++++++-
 .../TestSubQueryTransformerDistrib.java         |  69 ++++--
 .../search/join/BlockJoinFacetDistribTest.java  |  97 +++++---
 .../solr/spelling/SpellCheckCollatorTest.java   |  30 +++
 .../apache/solr/util/SolrPluginUtilsTest.java   |  28 +++
 .../solr/common/params/HighlightParams.java     |   1 +
 24 files changed, 948 insertions(+), 374 deletions(-)
----------------------------------------------------------------------