You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2019/11/14 12:22:31 UTC
[lucene-solr] 01/03: Merge branch 'master' into jira/solr-13662-3
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr-13662-3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 6cda9b7da7f50edf2a68cafd40a2e7531b5f4542
Merge: a0d3691 07101ed
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Thu Nov 14 17:04:13 2019 +0530
Merge branch 'master' into jira/solr-13662-3
lucene/CHANGES.txt | 16 +-
.../analysis/synonym/WordnetSynonymParser.java | 4 +-
.../analysis/synonym/TestSolrSynonymParser.java | 23 +
.../analysis/synonym/TestWordnetSynonymParser.java | 5 +
.../analysis/ja/dict/TokenInfoDictionary$fst.dat | Bin 1698570 -> 1707541 bytes
.../analysis/ko/dict/TokenInfoDictionary$fst.dat | Bin 5640903 -> 6009053 bytes
.../codecs/blocktreeords/OrdsSegmentTermsEnum.java | 2 +-
lucene/common-build.xml | 2 +-
.../src/java/org/apache/lucene/geo/GeoUtils.java | 9 +-
.../src/java/org/apache/lucene/geo/Rectangle.java | 15 +-
.../org/apache/lucene/search/LRUQueryCache.java | 49 +-
.../src/java/org/apache/lucene/util/BitUtil.java | 125 ++++
.../java/org/apache/lucene/util/SloppyMath.java | 31 +-
.../java/org/apache/lucene/util/fst/Builder.java | 114 +++-
.../org/apache/lucene/util/fst/BytesStore.java | 21 +
.../src/java/org/apache/lucene/util/fst/FST.java | 717 +++++++++++++++------
.../java/org/apache/lucene/util/fst/FSTEnum.java | 236 ++++---
.../java/org/apache/lucene/util/fst/NodeHash.java | 17 +-
.../src/java/org/apache/lucene/util/fst/Util.java | 29 +-
.../apache/lucene/search/TestLRUQueryCache.java | 154 ++++-
.../TestUsageTrackingFilterCachingPolicy.java | 2 +-
.../test/org/apache/lucene/util/TestBitUtil.java | 85 +++
.../test/org/apache/lucene/util/fst/TestFSTs.java | 33 +-
.../org/apache/lucene/util/fst/TestFstDirect.java | 105 ---
.../lucene/util/fst/TestFstDirectAddressing.java | 212 ++++++
.../test/org/apache/lucene/util/fst/TestUtil.java | 21 +-
.../lucene/demo/facet/DistanceFacetsExample.java | 27 +-
.../apache/lucene/search/DocValuesTermsQuery.java | 14 +
.../test/org/apache/lucene/geo/ShapeTestUtil.java | 5 +-
.../apache/lucene/spatial3d/geom/GeoPathTest.java | 16 +-
.../java/org/apache/lucene/geo/EarthDebugger.java | 4 +-
.../java/org/apache/lucene/geo/GeoTestUtil.java | 8 +-
.../org/apache/lucene/util/LuceneTestCase.java | 2 +-
lucene/tools/forbiddenApis/lucene.txt | 4 -
lucene/tools/forbiddenApis/solr.txt | 4 +
solr/CHANGES.txt | 20 +-
.../solr/handler/dataimport/DataImportHandler.java | 2 +-
.../src/java/org/apache/solr/api/AnnotatedApi.java | 3 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 5 +-
.../java/org/apache/solr/core/CoreContainer.java | 26 +-
.../org/apache/solr/core/HdfsDirectoryFactory.java | 5 +
.../solr/core/IndexDeletionPolicyWrapper.java | 388 ++++++++---
.../src/java/org/apache/solr/core/SolrCore.java | 50 +-
.../java/org/apache/solr/core/SolrInfoBean.java | 55 +-
.../apache/solr/filestore/DistribPackageStore.java | 27 +-
.../org/apache/solr/filestore/PackageStore.java | 2 +
.../org/apache/solr/filestore/PackageStoreAPI.java | 13 +-
.../apache/solr/handler/ReplicationHandler.java | 192 +++---
.../apache/solr/handler/RequestHandlerBase.java | 26 +-
.../java/org/apache/solr/handler/SnapShooter.java | 105 +--
.../org/apache/solr/handler/admin/ColStatus.java | 5 +
.../solr/handler/admin/CreateSnapshotOp.java | 31 +-
.../solr/handler/admin/PluginInfoHandler.java | 4 +-
.../solr/handler/admin/SolrInfoMBeanHandler.java | 4 +-
.../solr/handler/component/SearchComponent.java | 18 +-
.../solr/handler/component/SuggestComponent.java | 4 +-
.../solr/handler/component/TermsComponent.java | 2 +-
.../solr/highlight/HighlightingPluginBase.java | 10 +-
.../apache/solr/metrics/SolrCoreMetricManager.java | 27 +-
.../org/apache/solr/metrics/SolrMetricManager.java | 36 +-
.../apache/solr/metrics/SolrMetricProducer.java | 10 +-
.../apache/solr/metrics/SolrMetricsContext.java | 94 ++-
.../src/java/org/apache/solr/pkg/PackageAPI.java | 23 +-
.../java/org/apache/solr/pkg/PackageLoader.java | 9 +-
.../java/org/apache/solr/pkg/package-info.java} | 4 +-
.../solr/schema/RptWithGeometrySpatialField.java | 13 +-
.../java/org/apache/solr/search/CaffeineCache.java | 31 +-
.../java/org/apache/solr/search/FastLRUCache.java | 19 +-
.../src/java/org/apache/solr/search/LFUCache.java | 18 +-
.../src/java/org/apache/solr/search/LRUCache.java | 69 +-
.../java/org/apache/solr/search/QParserPlugin.java | 11 +-
.../src/java/org/apache/solr/search/SolrCache.java | 19 +-
.../org/apache/solr/search/SolrCacheHolder.java | 26 +-
.../apache/solr/search/SolrDocumentFetcher.java | 52 +-
.../org/apache/solr/search/SolrFieldCacheBean.java | 13 +-
.../org/apache/solr/search/SolrIndexSearcher.java | 37 +-
.../apache/solr/search/facet/UnInvertedField.java | 117 ++--
.../solr/search/join/BlockJoinParentQParser.java | 21 +-
.../apache/solr/security/AuditLoggerPlugin.java | 28 +-
.../apache/solr/security/AuthenticationPlugin.java | 24 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 2 +-
.../apache/solr/servlet/SolrRequestParsers.java | 13 +-
.../org/apache/solr/store/blockcache/Metrics.java | 10 +-
.../solr/store/hdfs/HdfsLocalityReporter.java | 16 +-
.../apache/solr/update/DirectUpdateHandler2.java | 47 +-
.../src/java/org/apache/solr/update/PeerSync.java | 13 +-
.../org/apache/solr/update/PeerSyncWithLeader.java | 13 +-
.../org/apache/solr/update/SolrIndexWriter.java | 24 +-
.../java/org/apache/solr/update/UpdateHandler.java | 11 +-
.../src/java/org/apache/solr/update/UpdateLog.java | 19 +-
.../org/apache/solr/update/UpdateShardHandler.java | 10 +-
.../org/apache/solr/util/ConcurrentLFUCache.java | 53 +-
.../org/apache/solr/util/ConcurrentLRUCache.java | 51 +-
.../solr/util/SolrJacksonAnnotationInspector.java | 6 +
.../stats/InstrumentedHttpListenerFactory.java | 7 +-
...rumentedPoolingHttpClientConnectionManager.java | 18 +-
.../org/apache/solr/util/stats/MetricUtils.java | 10 +-
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 14 +
.../cloud/TestSolrCloudWithDelegationTokens.java | 64 +-
.../org/apache/solr/cloud/TestTlogReplica.java | 6 +-
.../org/apache/solr/cloud/ZkShardTermsTest.java | 2 +-
.../test/org/apache/solr/core/MockInfoBean.java | 7 +-
.../core/MockQuerySenderListenerReqHandler.java | 2 +-
.../org/apache/solr/core/RequestHandlersTest.java | 5 +-
.../org/apache/solr/handler/TestCoreBackup.java | 331 +++++++++-
.../solr/handler/TestReplicationHandler.java | 60 +-
.../solr/handler/TestStressThreadBackup.java | 419 ++++++++++++
.../solr/handler/admin/MBeansHandlerTest.java | 20 +-
.../solr/handler/admin/MetricsHandlerTest.java | 2 +-
.../apache/solr/metrics/SolrMetricTestUtils.java | 9 +-
.../metrics/reporters/SolrJmxReporterTest.java | 66 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 12 +
.../org/apache/solr/search/TestSolrCachePerf.java | 143 ++++
.../solr/search/join/TestNestedDocsSort.java | 4 +-
solr/solr-ref-guide/src/collection-management.adoc | 2 +-
.../src/making-and-restoring-backups.adoc | 6 +
solr/solr-ref-guide/src/solr-packages.adoc | 383 +++++++++++
.../src/the-well-configured-solr-instance.adoc | 4 +-
.../solrj/impl/DelegationTokenHttpSolrClient.java | 2 +-
.../beans/{pakage-info.java => package-info.java} | 0
.../annotation/package-info.java} | 4 +-
.../client/solrj/io/stream/MathExpressionTest.java | 43 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 15 -
123 files changed, 4320 insertions(+), 1437 deletions(-)
diff --cc solr/core/src/java/org/apache/solr/pkg/PackageAPI.java
index bf48d34,8327d36..3b00544
--- a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java
+++ b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java
@@@ -187,11 -186,8 +192,10 @@@ public class PackageAPI
public PkgVersion(Package.AddVersion addVersion) {
this.version = addVersion.version;
this.files = addVersion.files;
+ this.manifest = addVersion.manifest;
+ this.manifestSHA512 = addVersion.manifestSHA512;
}
-
@Override
public boolean equals(Object obj) {
if (obj instanceof PkgVersion) {