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 2017/01/05 12:24:02 UTC

[3/3] lucene-solr:jira/solr-9856: Merge branch 'master' into jira/solr-9856

Merge branch 'master' into jira/solr-9856


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

Branch: refs/heads/jira/solr-9856
Commit: c21fbd6ff035495fed4f425b941260680d65ebe8
Parents: b415389 7ef6a81
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Thu Jan 5 13:23:32 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Thu Jan 5 13:23:32 2017 +0100

----------------------------------------------------------------------
 solr/CHANGES.txt                                |  33 +-
 solr/contrib/ltr/README.md                      | 390 +------------------
 solr/contrib/ltr/example/README.md              |  60 +++
 solr/contrib/ltr/example/config.json            |  13 +-
 solr/contrib/ltr/example/exampleFeatures.json   |  26 ++
 solr/contrib/ltr/example/libsvm_formatter.py    |  12 +-
 .../ltr/example/techproducts-features.json      |  26 --
 .../contrib/ltr/example/techproducts-model.json |  18 -
 .../ltr/example/train_and_upload_demo_model.py  | 143 ++++---
 .../ltr/store/rest/ManagedFeatureStore.java     |   3 -
 .../solr/ltr/store/rest/ManagedModelStore.java  |   6 +-
 .../multipleadditivetreesmodel.json             |   2 +-
 .../org/apache/solr/ltr/TestRerankBase.java     |   9 +-
 .../model/TestMultipleAdditiveTreesModel.java   |   9 +-
 .../solr/ltr/store/rest/TestModelManager.java   |  47 ++-
 .../store/rest/TestModelManagerPersistence.java |   4 +-
 .../src/java/org/apache/solr/core/SolrCore.java |  20 +
 .../org/apache/solr/handler/GraphHandler.java   |   3 +-
 .../apache/solr/handler/ReplicationHandler.java |  20 +-
 .../apache/solr/handler/RequestHandlerBase.java |   5 +-
 .../org/apache/solr/handler/StreamHandler.java  |  20 +-
 .../solr/handler/admin/CoreAdminHandler.java    |   6 +-
 .../solr/handler/admin/MetricsHandler.java      |  16 +-
 .../component/HttpShardHandlerFactory.java      |  46 +--
 .../solr/metrics/SolrCoreMetricManager.java     |   9 +-
 .../apache/solr/metrics/SolrMetricProducer.java |  12 +-
 .../apache/solr/parser/SolrQueryParserBase.java |  26 +-
 .../request/PerSegmentSingleValuedFaceting.java |   9 +-
 .../org/apache/solr/request/SimpleFacets.java   |  37 +-
 .../solr/search/ComplexPhraseQParserPlugin.java |  70 +++-
 .../apache/solr/search/facet/PercentileAgg.java |   7 +-
 .../org/apache/solr/search/facet/SlotAcc.java   |   5 +-
 .../java/org/apache/solr/update/PeerSync.java   |   8 +-
 .../apache/solr/update/UpdateShardHandler.java  |  14 +-
 .../stats/InstrumentedHttpRequestExecutor.java  |  42 +-
 ...entedPoolingHttpClientConnectionManager.java |  43 +-
 .../org/apache/solr/util/stats/MetricUtils.java |  13 +-
 .../solr/handler/admin/MetricsHandlerTest.java  |  35 +-
 .../solr/metrics/SolrCoreMetricManagerTest.java |   7 +-
 .../solr/metrics/SolrMetricTestUtils.java       |  47 +--
 .../apache/solr/request/SimpleFacetsTest.java   |  12 +-
 .../TestComplexPhraseLeadingWildcard.java       | 113 ++++++
 .../solr/search/facet/TestJsonFacets.java       |  44 ++-
 .../solr/client/solrj/io/ops/AndOperation.java  | 101 +++++
 .../client/solrj/io/ops/BooleanOperation.java   |  26 ++
 .../client/solrj/io/ops/EqualsOperation.java    |  70 ++++
 .../io/ops/GreaterThanEqualToOperation.java     |  70 ++++
 .../solrj/io/ops/GreaterThanOperation.java      |  70 ++++
 .../solr/client/solrj/io/ops/LeafOperation.java |  68 ++++
 .../solrj/io/ops/LessThanEqualToOperation.java  |  70 ++++
 .../client/solrj/io/ops/LessThanOperation.java  |  70 ++++
 .../solr/client/solrj/io/ops/NotOperation.java  |  87 +++++
 .../solr/client/solrj/io/ops/OrOperation.java   |  71 ++++
 .../client/solrj/io/stream/HavingStream.java    | 173 ++++++++
 .../solrj/io/stream/StreamExpressionTest.java   | 237 +++++++++++
 .../java/org/apache/solr/SolrTestCaseHS.java    |   4 +
 56 files changed, 1783 insertions(+), 824 deletions(-)
----------------------------------------------------------------------