You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/07/25 08:34:01 UTC

[19/33] lucene-solr:jira/http2: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr into jira/http2

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr into jira/http2


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

Branch: refs/heads/jira/http2
Commit: 1d1ef152d33fda8364bd72f5f27947871481eb7d
Parents: 3358d93 55bfadb
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Jul 23 14:22:37 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Jul 23 14:22:37 2018 +0700

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   13 +-
 lucene/MIGRATE.txt                              |    7 +
 lucene/analysis/opennlp/build.xml               |   16 +-
 lucene/analysis/opennlp/ivy.xml                 |    1 -
 .../lucene/analysis/opennlp/en-test-chunker.bin |  Bin 89915 -> 89914 bytes
 .../analysis/opennlp/en-test-lemmatizer.bin     |  Bin 7370 -> 7370 bytes
 .../analysis/opennlp/en-test-ner-person.bin     |  Bin 1700 -> 0 bytes
 .../lucene/analysis/opennlp/en-test-ner.bin     |  Bin 0 -> 2049 bytes
 .../analysis/opennlp/en-test-pos-maxent.bin     |  Bin 18424 -> 18494 bytes
 .../lucene/analysis/opennlp/en-test-sent.bin    |  Bin 1050 -> 1051 bytes
 .../analysis/opennlp/en-test-tokenizer.bin      |  Bin 15096 -> 15100 bytes
 .../opennlp/src/tools/test-model-data/ner.txt   |  143 ++
 .../src/tools/test-model-data/ner_flashman.txt  |  143 --
 .../lucene/benchmark/byTask/tasks/ReadTask.java |    7 -
 .../byTask/tasks/SearchWithSortTask.java        |    9 -
 .../org/apache/lucene/search/IndexSearcher.java |    8 +-
 .../org/apache/lucene/search/SortRescorer.java  |   21 +-
 .../apache/lucene/search/TopFieldCollector.java |  118 +-
 .../apache/lucene/index/TestIndexSorting.java   |    4 +-
 .../org/apache/lucene/search/TestBoolean2.java  |    8 +-
 .../lucene/search/TestElevationComparator.java  |    2 +-
 .../apache/lucene/search/TestSortRandom.java    |    2 +-
 .../apache/lucene/search/TestTopDocsMerge.java  |    4 +-
 .../lucene/search/TestTopFieldCollector.java    |  179 +-
 .../TestTopFieldCollectorEarlyTermination.java  |    5 +-
 .../apache/lucene/util/TestPriorityQueue.java   |  170 +-
 .../org/apache/lucene/facet/DrillSideways.java  |   16 +-
 .../apache/lucene/facet/FacetsCollector.java    |    4 +-
 .../search/grouping/BlockGroupingCollector.java |    2 +-
 .../lucene/search/grouping/GroupingSearch.java  |   17 +-
 .../search/grouping/TopGroupsCollector.java     |   11 +-
 .../lucene/search/grouping/TestGrouping.java    |   55 +-
 .../highlight/TokenStreamFromTermVector.java    |    8 -
 lucene/ivy-versions.properties                  |    3 +-
 lucene/licenses/opennlp-maxent-3.0.3.jar.sha1   |    1 -
 lucene/licenses/opennlp-maxent-LICENSE-ASL.txt  |  202 --
 lucene/licenses/opennlp-maxent-NOTICE.txt       |    6 -
 lucene/licenses/opennlp-tools-1.8.4.jar.sha1    |    1 -
 lucene/licenses/opennlp-tools-1.9.0.jar.sha1    |    1 +
 .../apache/lucene/document/TestLatLonShape.java |   37 +-
 .../analyzing/AnalyzingInfixSuggester.java      |    2 +-
 solr/CHANGES.txt                                |    9 +
 solr/contrib/analysis-extras/ivy.xml            |    1 -
 .../collection1/conf/en-test-ner-person.bin     |  Bin 1700 -> 0 bytes
 .../solr/collection1/conf/en-test-ner.bin       |  Bin 0 -> 2049 bytes
 .../solr/collection1/conf/en-test-sent.bin      |  Bin 1050 -> 1051 bytes
 .../solr/collection1/conf/en-test-tokenizer.bin |  Bin 15096 -> 15100 bytes
 .../conf/solrconfig-opennlp-extract.xml         |   30 +-
 .../TestSolrEntityProcessorEndToEnd.java        |    3 +-
 .../org/apache/solr/handler/ExportHandler.java  |    1 +
 .../org/apache/solr/handler/ExportWriter.java   | 1764 ------------------
 .../solr/handler/component/ExpandComponent.java |    4 +-
 .../solr/handler/component/QueryComponent.java  |    1 +
 .../solr/handler/export/BoolFieldWriter.java    |   52 +
 .../solr/handler/export/DateFieldWriter.java    |   46 +
 .../apache/solr/handler/export/DoubeValue.java  |   81 +
 .../apache/solr/handler/export/DoubleCmp.java   |   43 +
 .../solr/handler/export/DoubleFieldWriter.java  |   45 +
 .../solr/handler/export/ExportWriter.java       |  448 +++++
 .../apache/solr/handler/export/FieldWriter.java |   27 +
 .../apache/solr/handler/export/FloatCmp.java    |   44 +
 .../solr/handler/export/FloatFieldWriter.java   |   45 +
 .../apache/solr/handler/export/FloatValue.java  |   78 +
 .../org/apache/solr/handler/export/IntComp.java |   45 +
 .../solr/handler/export/IntFieldWriter.java     |   45 +
 .../apache/solr/handler/export/IntValue.java    |   77 +
 .../org/apache/solr/handler/export/LongCmp.java |   45 +
 .../solr/handler/export/LongFieldWriter.java    |   45 +
 .../apache/solr/handler/export/LongValue.java   |   78 +
 .../solr/handler/export/MultiFieldWriter.java   |  104 ++
 .../solr/handler/export/PriorityQueue.java      |  218 +++
 .../org/apache/solr/handler/export/SortDoc.java |  114 ++
 .../apache/solr/handler/export/SortQueue.java   |   52 +
 .../apache/solr/handler/export/SortValue.java   |   30 +
 .../solr/handler/export/StringFieldWriter.java  |   52 +
 .../apache/solr/handler/export/StringValue.java |   99 +
 .../solr/handler/export/package-info.java       |   23 +
 .../java/org/apache/solr/search/Grouping.java   |   24 +-
 .../org/apache/solr/search/ReRankCollector.java |   15 +-
 .../search/SignificantTermsQParserPlugin.java   |   14 +-
 .../apache/solr/search/SolrIndexSearcher.java   |    9 +-
 .../apache/solr/search/grouping/Command.java    |    7 +
 .../solr/search/grouping/CommandHandler.java    |    4 +
 .../distributed/command/QueryCommand.java       |   14 +-
 .../command/TopGroupsFieldCommand.java          |   42 +-
 .../processor/DistributedUpdateProcessor.java   |   19 +-
 .../collection1/conf/schema-sortingresponse.xml |    5 +-
 .../apache/solr/cloud/MoveReplicaHDFSTest.java  |    1 +
 .../apache/solr/cloud/MultiThreadedOCPTest.java |    2 +-
 .../solr/cloud/ReplicationFactorTest.java       |    1 +
 .../cloud/SharedFSAutoReplicaFailoverTest.java  |    3 +
 .../apache/solr/cloud/TestCloudRecovery.java    |    1 +
 .../cloud/TestPullReplicaErrorHandling.java     |    3 +-
 .../TestStressCloudBlindAtomicUpdates.java      |    1 +
 .../AbstractCloudBackupRestoreTestCase.java     |   20 +-
 .../HdfsAutoAddReplicasIntegrationTest.java     |    1 +
 .../cloud/autoscaling/ScheduledTriggerTest.java |    1 +
 .../sim/TestSimDistributedQueue.java            |    2 +-
 .../autoscaling/sim/TestTriggerIntegration.java |    2 +-
 .../cloud/hdfs/HdfsBasicDistributedZk2Test.java |    3 +-
 .../cloud/hdfs/HdfsBasicDistributedZkTest.java  |    3 +-
 ...HdfsTlogReplayBufferedWhileIndexingTest.java |    2 +
 .../apache/solr/core/TestDynamicLoading.java    |    1 +
 .../solr/handler/TestReplicationHandler.java    |    3 +-
 .../admin/MetricsHistoryHandlerTest.java        |    2 +
 .../solr/handler/export/TestExportWriter.java   |  749 ++++++++
 .../apache/solr/response/TestExportWriter.java  |  370 ----
 .../test/org/apache/solr/search/TestSort.java   |    3 +-
 .../TestSolrCloudWithHadoopAuthPlugin.java      |    3 +-
 .../uninverting/TestFieldCacheSortRandom.java   |    4 +-
 .../DistributedUpdateProcessorTest.java         |   54 +
 .../processor/TestNamedUpdateProcessors.java    |    1 +
 solr/licenses/opennlp-maxent-3.0.3.jar.sha1     |    1 -
 solr/licenses/opennlp-maxent-LICENSE-ASL.txt    |  202 --
 solr/licenses/opennlp-maxent-NOTICE.txt         |    6 -
 solr/licenses/opennlp-tools-1.8.4.jar.sha1      |    1 -
 solr/licenses/opennlp-tools-1.9.0.jar.sha1      |    1 +
 .../src/exporting-result-sets.adoc              |    3 +-
 .../src/parallel-sql-interface.adoc             |    4 -
 solr/solr-ref-guide/src/result-grouping.adoc    |    9 +-
 .../org/apache/solr/common/SolrException.java   |    2 +-
 .../solrj/io/stream/MathExpressionTest.java     |    1 +
 .../solrj/io/stream/StreamDecoratorTest.java    |    1 +
 .../cloud/TestCollectionStateWatchers.java      |   10 +-
 124 files changed, 3458 insertions(+), 3147 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1d1ef152/lucene/ivy-versions.properties
----------------------------------------------------------------------