You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/02/15 20:47:38 UTC
[26/50] lucene-solr:master: 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/918fd97f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/918fd97f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/918fd97f
Branch: refs/heads/master
Commit: 918fd97fd0fdd66e845ee58fc6643cd375f06677
Parents: 1c2eabd b37a72d
Author: Kevin Risden <kr...@apache.org>
Authored: Tue Dec 20 10:39:21 2016 -0600
Committer: Kevin Risden <kr...@apache.org>
Committed: Tue Dec 20 10:39:21 2016 -0600
----------------------------------------------------------------------
.../dot.settings/org.eclipse.jdt.core.prefs | 1 +
.../idea/solr/contrib/analytics/analytics.iml | 1 +
lucene/CHANGES.txt | 9 +
.../CompressingStoredFieldsWriter.java | 68 +-
.../lucene50/Lucene50StoredFieldsFormat.java | 2 +-
.../codecs/lucene60/Lucene60PointsWriter.java | 11 +-
.../lucene/index/BinaryDocValuesWriter.java | 39 +-
.../lucene/index/DefaultIndexingChain.java | 116 +-
.../org/apache/lucene/index/DocConsumer.java | 2 +-
.../apache/lucene/index/DocValuesWriter.java | 4 +-
.../lucene/index/DocumentsWriterPerThread.java | 31 +-
.../lucene/index/FreqProxTermsWriter.java | 8 +-
.../org/apache/lucene/index/IndexWriter.java | 8 +-
.../org/apache/lucene/index/MergeState.java | 8 +-
.../apache/lucene/index/NormValuesWriter.java | 17 +-
.../lucene/index/NumericDocValuesWriter.java | 51 +-
.../apache/lucene/index/PointValuesWriter.java | 96 +-
.../lucene/index/SortedDocValuesWriter.java | 76 +-
.../index/SortedNumericDocValuesWriter.java | 64 +-
.../lucene/index/SortedSetDocValuesWriter.java | 98 +-
.../java/org/apache/lucene/index/Sorter.java | 57 +-
.../apache/lucene/index/SortingLeafReader.java | 21 +-
.../index/SortingStoredFieldsConsumer.java | 206 +++
.../index/SortingTermVectorsConsumer.java | 181 ++
.../lucene/index/StoredFieldsConsumer.java | 85 +
.../lucene/index/TermVectorsConsumer.java | 7 +-
.../java/org/apache/lucene/index/TermsHash.java | 4 +-
.../TrackingTmpOutputDirectoryWrapper.java | 53 +
.../apache/lucene/index/TestIndexSorting.java | 2 -
.../org/apache/lucene/facet/FacetQuery.java | 52 +
.../apache/lucene/facet/MultiFacetQuery.java | 61 +
.../org/apache/lucene/facet/TestFacetQuery.java | 103 ++
lucene/ivy-versions.properties | 2 +
.../apache/lucene/search/DocValuesStats.java | 215 ++-
.../search/TestDocValuesStatsCollector.java | 271 ++-
.../asserting/AssertingLiveDocsFormat.java | 9 +-
lucene/tools/javadoc/ecj.javadocs.prefs | 2 +-
solr/CHANGES.txt | 26 +
.../plugin/AnalyticsStatisticsCollector.java | 4 +-
.../solr/collection1/conf/solrconfig.xml | 5 -
solr/contrib/ltr/README.md | 36 +-
solr/contrib/ltr/example/solrconfig.xml | 1722 ------------------
.../org/apache/solr/ltr/CSVFeatureLogger.java | 62 +
.../java/org/apache/solr/ltr/FeatureLogger.java | 134 +-
.../java/org/apache/solr/ltr/LTRRescorer.java | 2 +-
.../org/apache/solr/ltr/LTRScoringQuery.java | 2 +-
.../solr/ltr/SolrQueryRequestContextUtils.java | 6 +-
.../org/apache/solr/ltr/model/LinearModel.java | 10 +
.../ltr/model/MultipleAdditiveTreesModel.java | 5 +
.../LTRFeatureLoggerTransformerFactory.java | 105 +-
solr/contrib/ltr/src/java/overview.html | 2 +-
.../solr/collection1/conf/solrconfig-ltr.xml | 5 +-
.../collection1/conf/solrconfig-ltr_Th10_10.xml | 5 +-
.../collection1/conf/solrconfig-multiseg.xml | 12 +-
.../apache/solr/ltr/FeatureLoggerTestUtils.java | 44 +
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 17 +-
.../solr/ltr/TestSelectiveWeightCreation.java | 11 +-
.../solr/ltr/feature/TestExternalFeatures.java | 12 +-
.../ltr/feature/TestExternalValueFeatures.java | 4 +-
.../solr/ltr/feature/TestFeatureLogging.java | 99 +-
.../solr/ltr/feature/TestFieldValueFeature.java | 13 +-
.../solr/ltr/feature/TestFilterSolrFeature.java | 6 +-
.../ltr/feature/TestNoMatchSolrFeature.java | 6 +-
.../ltr/feature/TestOriginalScoreFeature.java | 9 +-
.../solr/solrcloud/conf/solrconfig.xml | 11 -
.../solr/SolrMorphlineZkAliasTest.java | 7 -
solr/core/ivy.xml | 1 -
.../org/apache/solr/cloud/CreateAliasCmd.java | 21 +-
.../apache/solr/cloud/OverseerStatusCmd.java | 4 +-
.../org/apache/solr/core/CoreContainer.java | 66 +-
.../java/org/apache/solr/core/NodeConfig.java | 18 +-
.../java/org/apache/solr/core/PluginInfo.java | 4 +-
.../java/org/apache/solr/core/SolrConfig.java | 2 +-
.../src/java/org/apache/solr/core/SolrCore.java | 161 +-
.../org/apache/solr/core/SolrInfoMBean.java | 10 +-
.../org/apache/solr/core/SolrXmlConfig.java | 14 +-
.../apache/solr/handler/RequestHandlerBase.java | 58 +-
.../solr/handler/admin/CollectionsHandler.java | 2 +-
.../solr/handler/admin/MetricsHandler.java | 164 ++
.../solr/metrics/SolrCoreMetricManager.java | 154 ++
.../org/apache/solr/metrics/SolrMetricInfo.java | 104 ++
.../apache/solr/metrics/SolrMetricManager.java | 669 +++++++
.../apache/solr/metrics/SolrMetricProducer.java | 38 +
.../apache/solr/metrics/SolrMetricReporter.java | 83 +
.../org/apache/solr/metrics/package-info.java | 23 +
.../solr/metrics/reporters/SolrJmxReporter.java | 284 +++
.../solr/metrics/reporters/package-info.java | 22 +
.../security/AttributeOnlyServletContext.java | 291 +++
.../ConfigurableInternodeAuthHadoopPlugin.java | 68 +
.../security/DelegationTokenKerberosFilter.java | 6 +-
.../solr/security/GenericHadoopAuthPlugin.java | 266 +++
.../apache/solr/security/HadoopAuthFilter.java | 198 ++
.../apache/solr/security/HadoopAuthPlugin.java | 241 +++
.../apache/solr/security/KerberosFilter.java | 6 +-
.../apache/solr/security/KerberosPlugin.java | 314 +---
.../solr/security/PermissionNameProvider.java | 1 +
...tContinuesRecorderAuthenticationHandler.java | 71 +
.../apache/solr/servlet/SolrDispatchFilter.java | 27 +
.../src/java/org/apache/solr/util/JmxUtil.java | 78 +
.../org/apache/solr/util/stats/MetricUtils.java | 144 ++
.../org/apache/solr/util/stats/TimerUtils.java | 58 -
.../solr/collection1/conf/solrconfig_perf.xml | 1 -
.../solr/security/hadoop_kerberos_config.json | 16 +
.../hadoop_simple_auth_with_delegation.json | 29 +
.../src/test-files/solr/solr-metricreporter.xml | 57 +
.../apache/solr/cloud/AliasIntegrationTest.java | 50 +-
.../TestSolrCloudWithSecureImpersonation.java | 8 +-
.../solr/handler/admin/MetricsHandlerTest.java | 97 +
.../solr/metrics/SolrCoreMetricManagerTest.java | 172 ++
.../solr/metrics/SolrMetricManagerTest.java | 273 +++
.../solr/metrics/SolrMetricReporterTest.java | 69 +
.../solr/metrics/SolrMetricTestUtils.java | 140 ++
.../metrics/SolrMetricsIntegrationTest.java | 143 ++
.../metrics/reporters/MockMetricReporter.java | 80 +
.../metrics/reporters/SolrJmxReporterTest.java | 156 ++
.../org/apache/solr/search/TestRealTimeGet.java | 2 +-
.../apache/solr/search/TestStressLucene.java | 2 +-
.../apache/solr/search/TestStressRecovery.java | 2 +-
.../apache/solr/search/TestStressReorder.java | 5 +-
.../solr/search/TestStressUserVersions.java | 4 +-
.../apache/solr/search/TestStressVersions.java | 2 +-
.../solr/security/hadoop/ImpersonationUtil.java | 73 +
.../hadoop/ImpersonatorCollectionsHandler.java | 60 +
.../hadoop/TestDelegationWithHadoopAuth.java | 400 ++++
.../hadoop/TestImpersonationWithHadoopAuth.java | 215 +++
.../TestSolrCloudWithHadoopAuthPlugin.java | 136 ++
.../apache/solr/util/stats/MetricUtilsTest.java | 58 +
.../apache/solr/util/stats/TimerUtilsTest.java | 58 -
.../example-DIH/solr/db/conf/solrconfig.xml | 11 -
.../example-DIH/solr/mail/conf/solrconfig.xml | 11 -
.../example-DIH/solr/rss/conf/solrconfig.xml | 11 -
.../example-DIH/solr/solr/conf/solrconfig.xml | 11 -
.../example-DIH/solr/tika/conf/solrconfig.xml | 11 -
solr/example/files/conf/solrconfig.xml | 11 -
solr/licenses/metrics-jetty-LICENSE-ASL.txt | 203 +++
solr/licenses/metrics-jetty-NOTICE.txt | 12 +
solr/licenses/metrics-jetty9-3.1.2.jar.sha1 | 1 +
solr/licenses/metrics-json-LICENSE-ASL.txt | 203 +++
solr/licenses/metrics-json-NOTICE.txt | 12 +
solr/licenses/metrics-jvm-3.1.2.jar.sha1 | 1 +
solr/licenses/metrics-jvm-LICENSE-ASL.txt | 203 +++
solr/licenses/metrics-jvm-NOTICE.txt | 12 +
solr/licenses/metrics-servlets-LICENSE-ASL.txt | 203 +++
solr/licenses/metrics-servlets-NOTICE.txt | 12 +
solr/server/build.xml | 4 +-
solr/server/etc/jetty.xml | 20 +-
solr/server/ivy.xml | 11 +-
.../basic_configs/conf/solrconfig.xml | 11 -
.../conf/solrconfig.xml | 11 -
.../conf/solrconfig.xml | 65 +-
.../impl/DelegationTokenHttpSolrClient.java | 34 +-
.../solrj/impl/HttpClientBuilderFactory.java | 41 +
.../solr/client/solrj/impl/HttpSolrClient.java | 56 +-
.../solrj/impl/Krb5HttpClientBuilder.java | 10 +-
.../apache/solr/common/params/CommonParams.java | 4 +-
.../solr/client/solrj/LargeVolumeTestBase.java | 3 +-
.../solr/client/solrj/SolrExampleTestBase.java | 1 -
.../solrj/impl/BasicHttpSolrClientTest.java | 31 +
.../solr/client/solrj/io/sql/JdbcTest.java | 7 +-
.../client/solrj/io/stream/JDBCStreamTest.java | 9 +-
.../solrj/io/stream/StreamExpressionTest.java | 7 +-
.../client/solrj/io/stream/StreamingTest.java | 10 +-
.../java/org/apache/solr/SolrJettyTestBase.java | 2 -
.../java/org/apache/solr/SolrTestCaseJ4.java | 2 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 29 +-
.../apache/solr/cloud/SolrCloudTestCase.java | 30 +-
.../java/org/apache/solr/util/TestHarness.java | 9 +
167 files changed, 8847 insertions(+), 2890 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/918fd97f/lucene/ivy-versions.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/918fd97f/solr/core/ivy.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/918fd97f/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/918fd97f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/918fd97f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
----------------------------------------------------------------------