You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/11/03 14:41:07 UTC
[20/20] lucene-solr:jira/solr-8593: Merge branch
'apache-https-master' into jira/solr-8593
Merge branch 'apache-https-master' into jira/solr-8593
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5f3b4237
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5f3b4237
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5f3b4237
Branch: refs/heads/jira/solr-8593
Commit: 5f3b4237e0921356360e59955fef47514db1daa4
Parents: 28fb585 213a2a1
Author: Kevin Risden <kr...@apache.org>
Authored: Thu Nov 3 09:40:29 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Thu Nov 3 09:40:29 2016 -0500
----------------------------------------------------------------------
dev-tools/idea/.idea/modules.xml | 3 +-
dev-tools/idea/.idea/workspace.xml | 72 +-
dev-tools/idea/solr/contrib/ltr/ltr.iml | 37 +
.../maven/solr/contrib/ltr/pom.xml.template | 80 +
dev-tools/maven/solr/contrib/pom.xml.template | 1 +
.../index/TestBackwardsCompatibility.java | 1 +
.../lucene/index/TestManyPointsInOldIndex.java | 74 +
.../org/apache/lucene/index/manypointsindex.zip | Bin 0 -> 3739 bytes
.../org/apache/lucene/index/CheckIndex.java | 31 +-
.../java/org/apache/lucene/util/Constants.java | 10 +-
.../org/apache/lucene/util/bkd/BKDReader.java | 48 +-
solr/CHANGES.txt | 6 +
solr/contrib/ltr/README.md | 406 +++++
solr/contrib/ltr/README.txt | 1 +
solr/contrib/ltr/build.xml | 30 +
solr/contrib/ltr/example/config.json | 14 +
solr/contrib/ltr/example/libsvm_formatter.py | 124 ++
solr/contrib/ltr/example/solrconfig.xml | 1722 ++++++++++++++++++
.../ltr/example/techproducts-features.json | 26 +
.../contrib/ltr/example/techproducts-model.json | 18 +
.../ltr/example/train_and_upload_demo_model.py | 163 ++
solr/contrib/ltr/example/user_queries.txt | 8 +
solr/contrib/ltr/ivy.xml | 32 +
.../src/java/org/apache/solr/ltr/DocInfo.java | 42 +
.../java/org/apache/solr/ltr/FeatureLogger.java | 193 ++
.../java/org/apache/solr/ltr/LTRRescorer.java | 249 +++
.../org/apache/solr/ltr/LTRScoringQuery.java | 738 ++++++++
.../org/apache/solr/ltr/LTRThreadModule.java | 163 ++
.../solr/ltr/SolrQueryRequestContextUtils.java | 83 +
.../org/apache/solr/ltr/feature/Feature.java | 335 ++++
.../solr/ltr/feature/FeatureException.java | 31 +
.../solr/ltr/feature/FieldLengthFeature.java | 152 ++
.../solr/ltr/feature/FieldValueFeature.java | 141 ++
.../solr/ltr/feature/OriginalScoreFeature.java | 118 ++
.../apache/solr/ltr/feature/SolrFeature.java | 320 ++++
.../apache/solr/ltr/feature/ValueFeature.java | 148 ++
.../apache/solr/ltr/feature/package-info.java | 21 +
.../apache/solr/ltr/model/LTRScoringModel.java | 298 +++
.../org/apache/solr/ltr/model/LinearModel.java | 147 ++
.../apache/solr/ltr/model/ModelException.java | 31 +
.../ltr/model/MultipleAdditiveTreesModel.java | 377 ++++
.../org/apache/solr/ltr/model/package-info.java | 21 +
.../solr/ltr/norm/IdentityNormalizer.java | 53 +
.../apache/solr/ltr/norm/MinMaxNormalizer.java | 107 ++
.../org/apache/solr/ltr/norm/Normalizer.java | 64 +
.../solr/ltr/norm/NormalizerException.java | 31 +
.../solr/ltr/norm/StandardNormalizer.java | 99 +
.../org/apache/solr/ltr/norm/package-info.java | 23 +
.../java/org/apache/solr/ltr/package-info.java | 45 +
.../org/apache/solr/ltr/store/FeatureStore.java | 67 +
.../org/apache/solr/ltr/store/ModelStore.java | 74 +
.../org/apache/solr/ltr/store/package-info.java | 21 +
.../ltr/store/rest/ManagedFeatureStore.java | 215 +++
.../solr/ltr/store/rest/ManagedModelStore.java | 319 ++++
.../solr/ltr/store/rest/package-info.java | 22 +
.../LTRFeatureLoggerTransformerFactory.java | 254 +++
.../solr/response/transform/package-info.java | 23 +
.../apache/solr/search/LTRQParserPlugin.java | 233 +++
.../org/apache/solr/search/package-info.java | 23 +
solr/contrib/ltr/src/java/overview.html | 91 +
.../featureExamples/comp_features.json | 37 +
.../featureExamples/external_features.json | 51 +
...external_features_for_sparse_processing.json | 18 +
.../featureExamples/features-linear-efi.json | 17 +
.../featureExamples/features-linear.json | 51 +
.../features-store-test-model.json | 51 +
.../test-files/featureExamples/fq_features.json | 16 +
.../multipleadditivetreesmodel_features.json | 16 +
.../contrib/ltr/src/test-files/log4j.properties | 32 +
.../modelExamples/external_model.json | 12 +
.../modelExamples/external_model_store.json | 13 +
.../src/test-files/modelExamples/fq-model.json | 20 +
.../modelExamples/linear-model-efi.json | 14 +
.../test-files/modelExamples/linear-model.json | 30 +
.../multipleadditivetreesmodel.json | 38 +
...tivetreesmodel_external_binary_features.json | 38 +
.../multipleadditivetreesmodel_no_feature.json | 24 +
.../multipleadditivetreesmodel_no_features.json | 14 +
.../multipleadditivetreesmodel_no_left.json | 22 +
.../multipleadditivetreesmodel_no_params.json | 8 +
.../multipleadditivetreesmodel_no_right.json | 22 +
...multipleadditivetreesmodel_no_threshold.json | 24 +
.../multipleadditivetreesmodel_no_tree.json | 15 +
.../multipleadditivetreesmodel_no_trees.json | 10 +
.../multipleadditivetreesmodel_no_weight.json | 24 +
.../test-files/solr/collection1/conf/schema.xml | 88 +
.../solr/collection1/conf/solrconfig-ltr.xml | 65 +
.../collection1/conf/solrconfig-ltr_Th10_10.xml | 69 +
.../collection1/conf/solrconfig-multiseg.xml | 62 +
.../solr/collection1/conf/stopwords.txt | 16 +
.../solr/collection1/conf/synonyms.txt | 28 +
solr/contrib/ltr/src/test-files/solr/solr.xml | 42 +
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 211 +++
.../apache/solr/ltr/TestLTRQParserExplain.java | 152 ++
.../apache/solr/ltr/TestLTRQParserPlugin.java | 114 ++
.../solr/ltr/TestLTRReRankingPipeline.java | 300 +++
.../apache/solr/ltr/TestLTRScoringQuery.java | 319 ++++
.../org/apache/solr/ltr/TestLTRWithFacet.java | 103 ++
.../org/apache/solr/ltr/TestLTRWithSort.java | 102 ++
.../solr/ltr/TestParallelWeightCreation.java | 77 +
.../org/apache/solr/ltr/TestRerankBase.java | 429 +++++
.../solr/ltr/TestSelectiveWeightCreation.java | 251 +++
.../ltr/feature/TestEdisMaxSolrFeature.java | 76 +
.../solr/ltr/feature/TestExternalFeatures.java | 157 ++
.../ltr/feature/TestExternalValueFeatures.java | 86 +
...stFeatureExtractionFromMultipleSegments.java | 105 ++
.../solr/ltr/feature/TestFeatureLogging.java | 254 +++
.../ltr/feature/TestFeatureLtrScoringModel.java | 71 +
.../solr/ltr/feature/TestFeatureStore.java | 106 ++
.../ltr/feature/TestFieldLengthFeature.java | 156 ++
.../solr/ltr/feature/TestFieldValueFeature.java | 173 ++
.../solr/ltr/feature/TestFilterSolrFeature.java | 105 ++
.../ltr/feature/TestNoMatchSolrFeature.java | 192 ++
.../ltr/feature/TestOriginalScoreFeature.java | 148 ++
.../solr/ltr/feature/TestRankingFeature.java | 123 ++
.../ltr/feature/TestUserTermScoreWithQ.java | 74 +
.../ltr/feature/TestUserTermScorerQuery.java | 74 +
.../ltr/feature/TestUserTermScorereQDF.java | 75 +
.../solr/ltr/feature/TestValueFeature.java | 165 ++
.../apache/solr/ltr/model/TestLinearModel.java | 207 +++
.../model/TestMultipleAdditiveTreesModel.java | 246 +++
.../solr/ltr/norm/TestMinMaxNormalizer.java | 120 ++
.../solr/ltr/norm/TestStandardNormalizer.java | 132 ++
.../ltr/store/rest/TestManagedFeatureStore.java | 36 +
.../solr/ltr/store/rest/TestModelManager.java | 163 ++
.../store/rest/TestModelManagerPersistence.java | 121 ++
.../solr/response/JSONResponseWriter.java | 17 +-
.../apache/solr/response/PHPResponseWriter.java | 8 +
.../solr/response/SmileResponseWriter.java | 5 +
.../solr/response/TextResponseWriter.java | 43 +-
.../solr/search/facet/FacetProcessor.java | 30 +-
.../apache/solr/search/facet/FacetRequest.java | 39 +-
.../apache/solr/update/HdfsTransactionLog.java | 3 +-
solr/core/src/resources/ImplicitPlugins.json | 8 +-
.../solr/cloud/hdfs/HdfsRecoveryZkTest.java | 2 +
.../apache/solr/response/JSONWriterTest.java | 23 +-
.../solr/search/facet/TestJsonFacets.java | 20 +-
.../solr/spelling/SpellCheckCollatorTest.java | 9 +-
.../org/apache/solr/client/solrj/io/Tuple.java | 10 +-
.../client/solrj/io/stream/JSONTupleStream.java | 3 +-
.../solr/client/solrj/io/stream/SolrStream.java | 43 +-
.../client/solrj/io/stream/TupleStream.java | 53 +-
.../solrj/io/stream/TupleStreamParser.java | 27 +
.../solrj/io/stream/expr/Explanation.java | 19 +-
.../solrj/io/stream/expr/StreamExplanation.java | 7 +-
145 files changed, 14699 insertions(+), 159 deletions(-)
----------------------------------------------------------------------