You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2019/04/07 12:31:14 UTC
[lucene-solr] 34/34: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/lucene-solr into
jira/lucene-2562-luke-swing-3
This is an automated email from the ASF dual-hosted git repository.
uschindler pushed a commit to branch jira/lucene-2562-luke-swing-3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 846f3d33d0b7fb770d4739aa74b16fd9296ae1f2
Merge: 6e424f5 ef7be67
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Sun Apr 7 13:02:07 2019 +0200
Merge branch 'master' of https://gitbox.apache.org/repos/asf/lucene-solr into jira/lucene-2562-luke-swing-3
dev-tools/doap/lucene.rdf | 11 +-
dev-tools/doap/solr.rdf | 7 +
lucene/CHANGES.txt | 30 +
.../miscellaneous/WordDelimiterGraphFilter.java | 13 +-
.../TestWordDelimiterGraphFilter.java | 19 +-
.../lucene/index/TestBackwardsCompatibility.java | 2 +
.../apache/lucene/index/unsupported.6.6.6-cfs.zip | Bin 0 -> 15880 bytes
.../lucene/index/unsupported.6.6.6-nocfs.zip | Bin 0 -> 15856 bytes
.../simpletext/SimpleTextCompoundFormat.java | 27 +-
.../codecs/blocktree/BlockTreeTermsReader.java | 6 +-
.../lucene/codecs/blocktree/FieldReader.java | 34 +-
.../codecs/lucene50/Lucene50CompoundReader.java | 6 +
.../codecs/lucene50/Lucene50PostingsFormat.java | 53 +-
.../lucene/codecs/lucene80/Lucene80Codec.java | 11 +-
.../apache/lucene/search/ConstantScoreQuery.java | 27 +-
.../apache/lucene/search/DoubleValuesSource.java | 25 +-
.../org/apache/lucene/search/LongValuesSource.java | 26 +-
.../apache/lucene/store/ByteBuffersDirectory.java | 7 +
.../java/org/apache/lucene/store/Directory.java | 5 +-
.../org/apache/lucene/store/FilterDirectory.java | 2 +-
.../codecs/lucene50/TestBlockPostingsFormat.java | 118 +-
...tLucene50StoredFieldsFormatHighCompression.java | 12 +-
.../org/apache/lucene/index/TestIndexWriter.java | 39 +
.../lucene/index/TestIndexWriterOnVMError.java | 2 +-
.../lucene/search/TestConstantScoreScorer.java | 38 +
.../lucene/search/TestDoubleValuesSource.java | 38 +-
.../apache/lucene/search/TestLongValuesSource.java | 39 +-
.../lucene/facet/range/TestRangeFacetCounts.java | 4 +-
lucene/ivy-versions.properties | 15 +-
.../lucene/search/join/ToParentBlockJoinQuery.java | 30 +-
.../apache/lucene/search/join/TestBlockJoin.java | 6 +-
.../lucene/search/join/TestBlockJoinScorer.java | 111 ++
.../lucene/queries/function/ValueSource.java | 3 +-
.../apache/lucene/queries/mlt/MoreLikeThis.java | 16 +-
.../lucene/queries/function/TestValueSources.java | 6 +
.../lucene/queries/mlt/TestMoreLikeThis.java | 193 ++-
.../queryparser/xml/SpanNearQueryWithoutSlop.xml | 21 +
.../lucene/queryparser/xml/TestCoreParser.java | 16 +
.../search/intervals/BlockIntervalsSource.java | 142 ++
.../intervals/ConjunctionIntervalsSource.java | 53 +-
.../intervals/ContainedByIntervalsSource.java | 93 +
.../intervals/ContainingIntervalsSource.java | 90 +
.../intervals/DifferenceIntervalFunction.java | 235 ---
.../intervals/DifferenceIntervalsSource.java | 41 +-
.../intervals/DisjunctionIntervalsSource.java | 33 +-
.../lucene/search/intervals/Disjunctions.java | 100 ++
.../search/intervals/ExtendedIntervalsSource.java | 12 +
.../search/intervals/FilteredIntervalsSource.java | 57 +-
...sSource.java => FilteringIntervalIterator.java} | 44 +-
.../intervals/FixedFieldIntervalsSource.java | 12 +
.../lucene/search/intervals/IntervalFilter.java | 2 +-
.../lucene/search/intervals/IntervalFunction.java | 501 ------
.../apache/lucene/search/intervals/Intervals.java | 109 +-
.../lucene/search/intervals/IntervalsSource.java | 8 +
.../MinimizingConjunctionIntervalsSource.java | 133 --
.../MinimizingConjunctionMatchesIterator.java | 100 ++
.../MinimumShouldMatchIntervalsSource.java | 6 +
.../search/intervals/MultiTermIntervalsSource.java | 7 +
.../NoRewriteDisjunctionIntervalsSource.java | 20 +-
.../intervals/NonOverlappingIntervalsSource.java | 81 +
.../intervals/NotContainedByIntervalsSource.java | 83 +
.../intervals/NotContainingIntervalsSource.java | 86 +
.../search/intervals/OffsetIntervalsSource.java | 7 +
.../search/intervals/OrderedIntervalsSource.java | 155 ++
.../intervals/OverlappingIntervalsSource.java | 89 +
.../PayloadFilteredTermIntervalsSource.java | 7 +
.../{IntervalFilter.java => RelativeIterator.java} | 61 +-
.../search/intervals/TermIntervalsSource.java | 7 +
.../search/intervals/UnorderedIntervalsSource.java | 240 +++
.../search/intervals/TestDisjunctionRewrites.java | 215 +++
.../lucene/search/intervals/TestIntervalQuery.java | 56 +-
.../lucene/search/intervals/TestIntervals.java | 22 +-
.../search/intervals/TestSimplifications.java | 30 +-
.../codecs/cheapbastard/CheapBastardCodec.java | 3 +-
.../mockrandom/MockRandomPostingsFormat.java | 3 +-
.../lucene/index/BaseMergePolicyTestCase.java | 4 +
.../java/org/apache/lucene/index/RandomCodec.java | 5 +-
.../util/TestRuleSetupAndRestoreClassEnv.java | 4 +-
.../src/java/org/apache/lucene/util/TestUtil.java | 4 +-
solr/CHANGES.txt | 63 +-
solr/common-build.xml | 37 +-
.../handler/extraction/XLSXResponseWriter.java | 95 +-
.../extraction/solr/collection1/conf/schema.xml | 9 +
.../handler/extraction/TestXLSXResponseWriter.java | 93 +-
solr/contrib/velocity/ivy.xml | 11 +-
.../solr/response/SolrParamResourceLoader.java | 18 +-
.../apache/solr/response/SolrVelocityLogger.java | 114 --
.../solr/response/SolrVelocityResourceLoader.java | 10 +-
.../solr/response/VelocityResponseWriter.java | 39 +-
solr/contrib/velocity/src/resources/_macros.vm | 4 +-
.../velocity/src/resources/velocity/footer.vm | 2 +-
.../solr/velocity/VelocityResponseWriterTest.java | 11 +-
solr/core/ivy.xml | 1 -
.../client/solrj/embedded/JettySolrRunner.java | 98 +-
.../core/src/java/org/apache/solr/cloud/ZkCLI.java | 47 +-
.../java/org/apache/solr/cloud/ZkController.java | 85 +-
.../cloud/autoscaling/OverseerTriggerThread.java | 33 +-
.../java/org/apache/solr/core/ConfigOverlay.java | 4 -
.../java/org/apache/solr/core/CoreContainer.java | 58 +-
.../org/apache/solr/core/HdfsDirectoryFactory.java | 35 +-
.../org/apache/solr/core/SchemaCodecFactory.java | 3 +-
.../backup/repository/HdfsBackupRepository.java | 18 +-
.../solr/core/snapshots/SolrSnapshotsTool.java | 47 +-
.../org/apache/solr/index/hdfs/CheckHdfsIndex.java | 15 +-
.../apache/solr/internal/csv/writer/CSVConfig.java | 283 ---
.../solr/internal/csv/writer/CSVConfigGuesser.java | 185 --
.../apache/solr/internal/csv/writer/CSVField.java | 108 --
.../apache/solr/internal/csv/writer/CSVWriter.java | 132 --
.../solr/parser/QueryParserTokenManager.java | 26 +-
.../apache/solr/response/CSVResponseWriter.java | 93 +-
.../solr/response/TabularResponseWriter.java | 149 ++
.../java/org/apache/solr/response/XMLWriter.java | 18 +-
.../transform/ExplainAugmenterFactory.java | 23 +-
.../org/apache/solr/schema/AbstractEnumField.java | 12 +
.../src/java/org/apache/solr/schema/FieldType.java | 3 +
.../java/org/apache/solr/search/ReturnFields.java | 7 +
.../org/apache/solr/search/SolrReturnFields.java | 28 +-
.../apache/solr/search/mlt/CloudMLTQParser.java | 3 +-
.../java/org/apache/solr/security/AuditEvent.java | 476 ++++++
.../apache/solr/security/AuditLoggerPlugin.java | 400 +++++
.../solr/security/MultiDestinationAuditLogger.java | 138 ++
.../security/RuleBasedAuthorizationPlugin.java | 112 +-
.../solr/security/SolrLogAuditLoggerPlugin.java | 79 +
.../java/org/apache/solr/servlet/HttpSolrCall.java | 44 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 21 +
.../org/apache/solr/store/hdfs/HdfsDirectory.java | 9 +-
.../java/org/apache/solr/update/CommitTracker.java | 2 +-
.../java/org/apache/solr/update/HdfsUpdateLog.java | 13 +-
.../java/org/apache/solr/update/UpdateHandler.java | 30 +-
.../update/processor/URLClassifyProcessor.java | 41 +-
.../core/src/java/org/apache/solr/util/CLIO.java | 29 +-
.../src/java/org/apache/solr/util/CryptoKeys.java | 10 +-
.../org/apache/solr/util/RecordingJSONParser.java | 7 +-
.../java/org/apache/solr/util/SimplePostTool.java | 121 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 498 +++---
.../solr/configsets/cloud-dynamic/conf/schema.xml | 2 +
.../{cloud-dynamic => sql}/conf/schema.xml | 24 +-
.../solr/configsets/sql/conf/solrconfig.xml | 48 +
.../solr/security/auditlog_plugin_security.json | 9 +
.../apache/solr/analysis/TokenizerChainTest.java | 1 +
.../org/apache/solr/cloud/CleanupOldIndexTest.java | 6 +-
.../org/apache/solr/cloud/DeleteReplicaTest.java | 2 +-
.../solr/cloud/LeaderElectionIntegrationTest.java | 10 +-
.../org/apache/solr/cloud/LeaderElectionTest.java | 106 +-
.../solr/cloud/LegacyCloudClusterPropTest.java | 2 +-
.../test/org/apache/solr/cloud/OverseerTest.java | 196 +--
.../org/apache/solr/cloud/RollingRestartTest.java | 12 +-
.../apache/solr/cloud/SaslZkACLProviderTest.java | 10 +-
.../org/apache/solr/cloud/TestPullReplica.java | 128 +-
.../org/apache/solr/cloud/TestTlogReplica.java | 144 +-
.../org/apache/solr/cloud/TestWithCollection.java | 2 +-
.../src/test/org/apache/solr/cloud/ZkCLITest.java | 54 +-
.../apache/solr/core/HdfsDirectoryFactoryTest.java | 18 +
.../org/apache/solr/handler/TestSQLHandler.java | 1804 +++++++-------------
.../internal/csv/writer/CSVConfigGuesserTest.java | 87 -
.../solr/internal/csv/writer/CSVConfigTest.java | 98 --
.../solr/internal/csv/writer/CSVFieldTest.java | 46 -
.../solr/internal/csv/writer/CSVWriterTest.java | 54 -
.../solr/response/TestCSVResponseWriter.java | 24 +-
.../apache/solr/search/facet/TestJsonFacets.java | 22 +-
.../solr/security/AuditLoggerIntegrationTest.java | 398 +++++
.../solr/security/AuditLoggerPluginTest.java | 176 ++
.../solr/security/CallbackAuditLoggerPlugin.java | 76 +
.../solr/security/MockAuditLoggerPlugin.java | 55 +
.../security/MultiDestinationAuditLoggerTest.java | 82 +
.../security/SolrLogAuditLoggerPluginTest.java | 72 +
.../security/TestRuleBasedAuthorizationPlugin.java | 145 +-
.../uninverting/TestDocTermOrdsUninvertLimit.java | 6 +-
.../org/apache/solr/update/AddBlockUpdateTest.java | 303 ++--
.../processor/AtomicUpdateRemovalJavabinTest.java | 134 ++
.../test/org/apache/solr/util/AuthToolTest.java | 76 +
.../test/org/apache/solr/util/UtilsToolTest.java | 14 +
solr/example/files/conf/velocity/hit.vm | 2 +-
solr/example/files/conf/velocity/macros.vm | 4 +-
solr/licenses/commons-lang-2.6.jar.sha1 | 1 -
solr/licenses/commons-lang-LICENSE-ASL.txt | 202 ---
solr/licenses/commons-lang-NOTICE.txt | 5 -
solr/licenses/dom4j-1.6.1.jar.sha1 | 1 -
solr/licenses/dom4j-LICENSE-BSD_LIKE.txt | 40 -
solr/licenses/dom4j-NOTICE.txt | 1 -
solr/licenses/jackcess-LICENSE-ASL.txt | 305 ----
solr/licenses/jackcess-encrypt-LICENSE-ASL.txt | 305 ----
solr/licenses/jackson-annotations-2.9.6.jar.sha1 | 1 -
solr/licenses/jackson-annotations-2.9.8.jar.sha1 | 1 +
solr/licenses/jackson-core-2.9.6.jar.sha1 | 1 -
solr/licenses/jackson-core-2.9.8.jar.sha1 | 1 +
solr/licenses/jackson-databind-2.9.6.jar.sha1 | 1 -
solr/licenses/jackson-databind-2.9.8.jar.sha1 | 1 +
.../jackson-dataformat-smile-2.9.6.jar.sha1 | 1 -
.../jackson-dataformat-smile-2.9.8.jar.sha1 | 1 +
solr/licenses/poi-LICENSE-ASL.txt | 480 +++---
solr/licenses/poi-NOTICE.txt | 23 +-
solr/licenses/poi-ooxml-LICENSE-ASL.txt | 480 +++---
solr/licenses/poi-ooxml-NOTICE.txt | 23 +-
solr/licenses/poi-ooxml-schemas-LICENSE-ASL.txt | 480 +++---
solr/licenses/poi-ooxml-schemas-NOTICE.txt | 23 +-
solr/licenses/poi-scratchpad-LICENSE-ASL.txt | 480 +++---
solr/licenses/poi-scratchpad-NOTICE.txt | 23 +-
solr/licenses/velocity-1.7.jar.sha1 | 1 -
solr/licenses/velocity-engine-core-2.0.jar.sha1 | 1 +
...SL.txt => velocity-engine-core-LICENSE-ASL.txt} | 0
...-NOTICE.txt => velocity-engine-core-NOTICE.txt} | 0
solr/licenses/velocity-tools-2.0.jar.sha1 | 1 -
solr/licenses/velocity-tools-generic-3.0.jar.sha1 | 1 +
....txt => velocity-tools-generic-LICENSE-ASL.txt} | 0
...OTICE.txt => velocity-tools-generic-NOTICE.txt} | 0
solr/licenses/velocity-tools-view-3.0.jar.sha1 | 1 +
...ASL.txt => velocity-tools-view-LICENSE-ASL.txt} | 0
...s-NOTICE.txt => velocity-tools-view-NOTICE.txt} | 0
solr/licenses/velocity-tools-view-jsp-3.0.jar.sha1 | 1 +
...txt => velocity-tools-view-jsp-LICENSE-ASL.txt} | 0
...TICE.txt => velocity-tools-view-jsp-NOTICE.txt} | 0
solr/licenses/zookeeper-3.4.13.jar.sha1 | 1 -
solr/licenses/zookeeper-3.4.14.jar.sha1 | 1 +
.../conf/velocity/VM_global_library.vm | 10 +-
.../conf/velocity/did_you_mean.vm | 2 +-
.../conf/velocity/footer.vm | 4 +-
.../conf/velocity/richtext_doc.vm | 2 +-
solr/solr-ref-guide/build.xml | 2 +-
solr/solr-ref-guide/src/_config.yml.template | 2 +-
solr/solr-ref-guide/src/aliases.adoc | 14 +-
solr/solr-ref-guide/src/audit-logging.adoc | 154 ++
.../src/basic-authentication-plugin.adoc | 21 +-
solr/solr-ref-guide/src/cdcr-architecture.adoc | 2 +
solr/solr-ref-guide/src/reindexing.adoc | 34 +-
.../src/rule-based-authorization-plugin.adoc | 5 +
solr/solr-ref-guide/src/securing-solr.adoc | 3 +-
.../src/solr-system-requirements.adoc | 72 +-
.../src/stream-decorator-reference.adoc | 4 +-
.../src/velocity-response-writer.adoc | 1 -
.../solr/client/solrj/cloud/SocketProxy.java | 124 +-
.../solr/client/solrj/impl/XMLResponseParser.java | 84 +-
.../solr/client/solrj/io/stream/JDBCStream.java | 24 +-
.../solr/client/solrj/io/stream/ZplotStream.java | 1 -
.../solr/client/solrj/request/LukeRequest.java | 22 +-
.../solrj/response/json/HeatmapJsonFacet.java | 11 +-
.../org/apache/solr/common/cloud/SolrZkClient.java | 19 +-
.../solr/common/util/FastJavaBinDecoder.java | 9 -
.../client/solrj/io/stream/JDBCStreamTest.java | 5 +-
.../client/solrj/request/TestLukeRequest.java} | 37 +-
solr/test-framework/build.xml | 17 +-
.../solr/cloud/AbstractDistribZkTestBase.java | 40 +-
.../apache/solr/cloud/SolrCloudAuthTestCase.java | 49 +-
.../java/org/apache/solr/cloud/ZkTestServer.java | 62 +-
244 files changed, 9147 insertions(+), 7057 deletions(-)