You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2019/01/24 10:39:18 UTC
[lucene-solr] branch master-deprecations updated (f2ff5ce ->
8f74653)
This is an automated email from the ASF dual-hosted git repository.
romseygeek pushed a change to branch master-deprecations
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from f2ff5ce Tidy up lucene deprecations file; add solr deprecations file
add d965b35 LUCENE-8636: TestPointQueries times out on nightly (decreased big range to 50k, excluded simple text codec).
add d970375 SOLR-12923: add a latch to TestTriggerListener to harden test that use it so they can deterministically know when all events have been proceeded
add f083473 LUCENE-8636: follow-up speedups and cleanups.
add d4e016a LUCENE-8474: (partial) removal of accesses to RAMFile and RAMDirectory streams. Removal of GrowableByteArrayDataOutput.
add b7f99fe SOLR-13137: NPE when /admin/zookeeper/status endpoint hit in standalone mode
add 8b54b20 SOLR-12770: Make it possible to configure a host whitelist for distributed search
add 09778b2 LUCENE-8641: add awaits fix to stop jenkins from creating subsequent alerts for this problem.
add a826649 LUCENE-8633: Remove term weighting from IntervalQuery scores
add e35adf6 LUCENE-8639: Prevent new threadstates from being created while we cut over to a new delete queue (#535)
add 9926b45 LUCENE-8643: TestLatLonLineShapeQueries.testRandomBig fails with suite timeout (simple text codec used, decreased iteration counts).
add a16f083 LUCENE-8642, LUCENE-8641: correct RamUsageTester.sizeOf's handling of ByteBuffers. Throw exceptions on denied reflection to catch problems early. This affects tests only.
add f2352e9 Revert "LUCENE-8642, LUCENE-8641: correct RamUsageTester.sizeOf's handling of ByteBuffers. Throw exceptions on denied reflection to catch problems early. This affects tests only."
add e515a91 SOLR-13116: Add Admin UI login support for Kerberos
add 70dd3ee LUCENE-8581: Unreference LatLonPoint.BYTES from LatLonShape & Rectangle2D.
add 8e7a135 Upgrade CHANGES.txt for http2 changes
add 75a7827 Add note about removing of LIR in Solr 8
add efef89a LUCENE-8642: RamUsageTester.sizeOf ignores arrays and collections if --illegal-access=deny.
add 6326800 SOLR-13053: Adding test for assert that times nodes were removed and added was actually restored
add c0d8b75 SOLR-13144: Reference guide section on IndexUpgraderTool needs to be updated
add 68ed797 SOLR-13145 fail faster and more clearly when Jekyll is not available for ref guide build
add c13645b LUCENE-8585: Create jump-tables for DocValues at index-time
add 512cfd8 Fix parameter name in example
add 73d1b07 LUCENE-8585: fix precommit failure
add f140971 Ref Guide: fix typos and clarify some language for autoscaling docs
add c518384 SOLR-13139: removing illegal date range syntax from the ref guide.
add a692d05 SOLR-13091: REBALANCELEADERS is broken
add cbfc9cc SOLR-13146: Allow derivatives to be computed for the oscillate Stream Evaluator
add 28d54d5 fixed invalid CSS files in Solr's Angular UI
add 8b1c729 Fixed Spelling.
add 054814e docs(intelliJSetup): Mention the link related to project-setup in IDE
add 60aef38 SOLR-11998:RebalanceLeaders API broken response format with wt=JSON
add 01dfe7b LUCENE-8649: LatLonShape's within and disjoint queries can return false positives with indexed multi-shapes
add 732281c SOLR-131476: Add movingMAD Stream Evaluator
add 2aa2c16 SOLR-131476: Add double value to test vector
add e68697a SOLR-13156: documenting functionality gap.
add 87d68c8 LUCENE-8645: Intervals.fixField()
add 7d7ab14 LUCENE-8646: Multi-term intervals
new 856c983 Remove deprecated ResourceLoader constructors
new 8f74653 Merge branch '9-classpathrl' into master-deprecations
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 7 +-
lucene/CHANGES.txt | 19 +
.../analysis/util/ClasspathResourceLoader.java | 18 -
.../analysis/util/FilesystemResourceLoader.java | 16 -
.../util/TestFilesystemResourceLoader.java | 2 +-
.../apache/lucene/codecs/lucene70/IndexedDISI.java | 0
.../codecs/lucene70/Lucene70DocValuesConsumer.java | 31 +-
.../codecs/lucene70/Lucene70DocValuesFormat.java | 0
.../codecs/lucene70/Lucene70DocValuesProducer.java | 0
.../codecs/lucene70/Lucene70NormsConsumer.java | 0
.../codecs/lucene70/Lucene70NormsFormat.java | 0
.../codecs/lucene70/Lucene70NormsProducer.java | 0
.../org.apache.lucene.codecs.DocValuesFormat | 1 +
.../lucene/codecs/lucene70/TestIndexedDISI.java | 0
.../lucene70/TestLucene70DocValuesFormat.java | 35 +-
.../codecs/lucene70/TestLucene70NormsFormat.java | 0
.../byTask/tasks/AnalyzerFactoryTask.java | 22 +-
.../lucene/codecs/blockterms/BlockTermsWriter.java | 22 +-
.../blockterms/FixedGapTermsIndexWriter.java | 23 +-
.../blocktreeords/OrdsBlockTreeTermsWriter.java | 36 +-
.../lucene/codecs/memory/DirectPostingsFormat.java | 14 +-
.../lucene/codecs/memory/FSTOrdTermsWriter.java | 49 +-
.../lucene/codecs/memory/FSTTermsWriter.java | 12 +-
.../lucene/codecs/MultiLevelSkipListWriter.java | 19 +-
.../codecs/blocktree/BlockTreeTermsWriter.java | 35 +-
.../compressing/CompressingStoredFieldsWriter.java | 36 +-
.../compressing/CompressingTermVectorsWriter.java | 20 +-
.../lucene/codecs/lucene50/Lucene50SkipWriter.java | 13 +-
.../lucene/codecs/lucene50/package-info.java | 2 +-
.../lucene/codecs/lucene60/package-info.java | 2 +-
.../lucene/codecs/lucene70/package-info.java | 387 +----------
.../apache/lucene/codecs/lucene80/IndexedDISI.java | 632 ++++++++++++++++++
.../lucene/codecs/lucene80/Lucene80Codec.java | 7 +-
.../Lucene80DocValuesConsumer.java} | 274 ++++----
.../Lucene80DocValuesFormat.java} | 34 +-
.../Lucene80DocValuesProducer.java} | 216 +++---
.../Lucene80NormsConsumer.java} | 34 +-
.../Lucene80NormsFormat.java} | 18 +-
.../Lucene80NormsProducer.java} | 49 +-
.../lucene/codecs/lucene80/package-info.java | 12 +-
.../org/apache/lucene/index/DocumentsWriter.java | 4 +-
.../lucene/index/DocumentsWriterFlushControl.java | 21 +-
.../lucene/index/DocumentsWriterPerThreadPool.java | 30 +-
.../apache/lucene/index/FrozenBufferedUpdates.java | 1 +
.../lucene/index/NumericDocValuesFieldUpdates.java | 6 +-
.../org/apache/lucene/index/PrefixCodedTerms.java | 69 +-
.../org/apache/lucene/index/SortingLeafReader.java | 29 +-
.../lucene/store/GrowableByteArrayDataOutput.java | 102 ---
.../src/java/org/apache/lucene/util/IOUtils.java | 3 +-
.../java/org/apache/lucene/util/bkd/BKDWriter.java | 38 +-
.../src/java/org/apache/lucene/util/fst/FST.java | 10 +-
.../org.apache.lucene.codecs.DocValuesFormat | 2 +-
.../org/apache/lucene/codecs/TestCodecUtil.java | 102 +--
.../lucene/codecs/lucene80/TestIndexedDISI.java | 522 +++++++++++++++
.../TestLucene80DocValuesFormat.java} | 156 +++--
.../TestLucene80NormsFormat.java} | 7 +-
.../org/apache/lucene/index/TestDocValues.java | 6 +-
.../org/apache/lucene/index/TestIndexWriter.java | 34 +
.../lucene/index/TestIndexWriterOnDiskFull.java | 2 +-
.../apache/lucene/search/TermInSetQueryTest.java | 4 +-
.../org/apache/lucene/search/TestPointQueries.java | 42 +-
.../lucene/store/BaseDataOutputTestCase.java | 1 -
.../lucene/store/TestByteBuffersDataInput.java | 3 +-
.../lucene/store/TestByteBuffersDataOutput.java | 1 -
.../store/TestGrowableByteArrayDataOutput.java | 80 ---
.../org/apache/lucene/store/TestHugeRamFile.java | 102 ---
.../org/apache/lucene/store/TestRAMDirectory.java | 189 ------
.../apache/lucene/replicator/nrt/PrimaryNode.java | 24 +-
.../lucene/replicator/nrt/SimpleTransLog.java | 15 +-
.../idversion/VersionBlockTreeTermsWriter.java | 34 +-
.../org/apache/lucene/document/LatLonShape.java | 2 +-
.../document/LatLonShapeBoundingBoxQuery.java | 2 +-
.../lucene/document/LatLonShapeLineQuery.java | 2 +-
.../lucene/document/LatLonShapePolygonQuery.java | 2 +-
.../apache/lucene/document/LatLonShapeQuery.java | 48 +-
.../java/org/apache/lucene/geo/Rectangle2D.java | 5 +-
.../intervals/ConjunctionIntervalsSource.java | 9 +
.../intervals/DifferenceIntervalsSource.java | 5 +
.../intervals/DisjunctionIntervalsSource.java | 11 +-
.../search/intervals/ExtendedIntervalsSource.java | 9 +
.../search/intervals/FilteredIntervalsSource.java | 5 +
.../FilteringConjunctionIntervalsSource.java} | 25 +-
...sSource.java => FixedFieldIntervalsSource.java} | 41 +-
.../lucene/search/intervals/IntervalQuery.java | 93 ++-
.../search/intervals/IntervalScoreFunction.java | 162 +++++
.../lucene/search/intervals/IntervalScorer.java | 36 +-
.../apache/lucene/search/intervals/Intervals.java | 51 +-
.../lucene/search/intervals/IntervalsSource.java | 7 +-
.../MinimumShouldMatchIntervalsSource.java | 14 +
.../search/intervals/MultiTermIntervalsSource.java | 120 ++++
.../search/intervals/OffsetIntervalsSource.java | 5 +
.../search/intervals/TermIntervalsSource.java | 13 +
.../lucene/document/BaseLatLonShapeTestCase.java | 62 +-
.../document/TestLatLonLineShapeQueries.java | 3 +-
.../document/TestLatLonMultiLineShapeQueries.java | 124 ++++
.../document/TestLatLonMultiPointShapeQueries.java | 124 ++++
.../TestLatLonMultiPolygonShapeQueries.java | 136 ++++
.../document/TestLatLonPointShapeQueries.java | 2 +-
.../document/TestLatLonPolygonShapeQueries.java | 2 +-
.../org/apache/lucene/geo/TestRectangle2D.java | 7 +-
.../lucene/search/intervals/TestIntervalQuery.java | 51 ++
.../lucene/search/intervals/TestIntervals.java | 90 +++
.../lucene/index/BaseDocValuesFormatTestCase.java | 19 +-
.../lucene/index/BaseIndexFileFormatTestCase.java | 27 +-
.../apache/lucene/store/BaseDirectoryTestCase.java | 26 +-
.../apache/lucene/store/MockDirectoryWrapper.java | 47 +-
.../lucene/store/MockIndexOutputWrapper.java | 6 +-
.../org/apache/lucene/util/RamUsageTester.java | 181 ++---
.../src/java/org/apache/lucene/util/TestUtil.java | 4 +-
solr/CHANGES.txt | 45 +-
solr/bin/solr.in.cmd | 6 +
solr/bin/solr.in.sh | 5 +
.../apache/solr/schema/TestICUCollationField.java | 2 +-
.../apache/solr/cloud/ExclusiveSliceProperty.java | 20 +
.../solr/handler/admin/RebalanceLeaders.java | 383 ++++++++---
.../solr/handler/admin/ZookeeperStatusHandler.java | 9 +-
.../solr/handler/component/HttpShardHandler.java | 39 +-
.../handler/component/HttpShardHandlerFactory.java | 174 ++++-
.../solr/handler/component/TermsComponent.java | 40 +-
.../solr/collection1/conf/schema_codec.xml | 2 +-
solr/core/src/test-files/solr/solr.xml | 1 +
.../test/org/apache/solr/TestTolerantSearch.java | 2 +
.../apache/solr/cloud/TestRebalanceLeaders.java | 738 ++++++++++++++-------
.../autoscaling/sim/TestSimTriggerIntegration.java | 125 ++--
.../component/CustomTermsComponentTest.java | 257 +++++++
.../component/DistributedDebugComponentTest.java | 2 +
.../handler/component/ShardsWhitelistTest.java | 264 ++++++++
.../component/TestHttpShardHandlerFactory.java | 202 +++++-
.../org/apache/solr/search/TestSmileRequest.java | 2 +
.../solr/search/facet/TestJsonFacetRefinement.java | 2 +
.../apache/solr/search/facet/TestJsonFacets.java | 38 +-
.../apache/solr/search/json/TestJsonRequest.java | 2 +
.../solr/update/TestInPlaceUpdatesDistrib.java | 2 +-
solr/server/solr/solr.xml | 1 +
solr/solr-ref-guide/build.xml | 2 +-
solr/solr-ref-guide/src/collections-api.adoc | 95 ++-
solr/solr-ref-guide/src/distributed-requests.adoc | 8 +-
.../distributed-search-with-index-sharding.adoc | 3 +
solr/solr-ref-guide/src/faceting.adoc | 2 +
solr/solr-ref-guide/src/indexupgrader-tool.adoc | 10 +-
.../src/solrcloud-autoscaling-overview.adoc | 8 +-
.../solrcloud-autoscaling-policy-preferences.adoc | 6 +-
.../src/solrcloud-autoscaling-triggers.adoc | 3 +-
solr/solr-ref-guide/src/the-terms-component.adoc | 2 +
solr/solr-ref-guide/src/working-with-dates.adoc | 3 +-
.../java/org/apache/solr/client/solrj/io/Lang.java | 1 +
.../client/solrj/io/eval/MovingMADEvaluator.java | 71 ++
.../client/solrj/io/eval/OscillateEvaluator.java | 7 +-
solr/solrj/src/test-files/solrj/solr/solr.xml | 1 +
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../client/solrj/io/stream/MathExpressionTest.java | 29 +-
.../apache/solr/BaseDistributedSearchTestCase.java | 12 +
.../src/java/org/apache/solr/SolrTestCaseHS.java | 22 +
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 13 +
.../apache/solr/cloud/MiniSolrCloudCluster.java | 3 +
solr/webapp/web/css/angular/analysis.css | 2 +-
solr/webapp/web/css/angular/common.css | 4 +-
solr/webapp/web/css/angular/dataimport.css | 2 +-
solr/webapp/web/css/angular/login.css | 6 +
solr/webapp/web/js/angular/controllers/login.js | 12 +-
solr/webapp/web/partials/login.html | 18 +-
161 files changed, 5615 insertions(+), 2409 deletions(-)
rename lucene/{core => backward-codecs}/src/java/org/apache/lucene/codecs/lucene70/IndexedDISI.java (100%)
copy lucene/{core => backward-codecs}/src/java/org/apache/lucene/codecs/lucene70/Lucene70DocValuesConsumer.java (95%)
copy lucene/{core => backward-codecs}/src/java/org/apache/lucene/codecs/lucene70/Lucene70DocValuesFormat.java (100%)
copy lucene/{core => backward-codecs}/src/java/org/apache/lucene/codecs/lucene70/Lucene70DocValuesProducer.java (100%)
copy lucene/{core => backward-codecs}/src/java/org/apache/lucene/codecs/lucene70/Lucene70NormsConsumer.java (100%)
copy lucene/{core => backward-codecs}/src/java/org/apache/lucene/codecs/lucene70/Lucene70NormsFormat.java (100%)
copy lucene/{core => backward-codecs}/src/java/org/apache/lucene/codecs/lucene70/Lucene70NormsProducer.java (100%)
rename lucene/{core => backward-codecs}/src/test/org/apache/lucene/codecs/lucene70/TestIndexedDISI.java (100%)
copy lucene/{core => backward-codecs}/src/test/org/apache/lucene/codecs/lucene70/TestLucene70DocValuesFormat.java (96%)
copy lucene/{core => backward-codecs}/src/test/org/apache/lucene/codecs/lucene70/TestLucene70NormsFormat.java (100%)
create mode 100644 lucene/core/src/java/org/apache/lucene/codecs/lucene80/IndexedDISI.java
rename lucene/core/src/java/org/apache/lucene/codecs/{lucene70/Lucene70DocValuesConsumer.java => lucene80/Lucene80DocValuesConsumer.java} (68%)
rename lucene/core/src/java/org/apache/lucene/codecs/{lucene70/Lucene70DocValuesFormat.java => lucene80/Lucene80DocValuesFormat.java} (84%)
rename lucene/core/src/java/org/apache/lucene/codecs/{lucene70/Lucene70DocValuesProducer.java => lucene80/Lucene80DocValuesProducer.java} (89%)
rename lucene/core/src/java/org/apache/lucene/codecs/{lucene70/Lucene70NormsConsumer.java => lucene80/Lucene80NormsConsumer.java} (81%)
rename lucene/core/src/java/org/apache/lucene/codecs/{lucene70/Lucene70NormsFormat.java => lucene80/Lucene80NormsFormat.java} (88%)
rename lucene/core/src/java/org/apache/lucene/codecs/{lucene70/Lucene70NormsProducer.java => lucene80/Lucene80NormsProducer.java} (87%)
delete mode 100644 lucene/core/src/java/org/apache/lucene/store/GrowableByteArrayDataOutput.java
create mode 100644 lucene/core/src/test/org/apache/lucene/codecs/lucene80/TestIndexedDISI.java
rename lucene/core/src/test/org/apache/lucene/codecs/{lucene70/TestLucene70DocValuesFormat.java => lucene80/TestLucene80DocValuesFormat.java} (83%)
copy lucene/core/src/test/org/apache/lucene/codecs/{lucene70/TestLucene70NormsFormat.java => lucene80/TestLucene80NormsFormat.java} (84%)
delete mode 100644 lucene/core/src/test/org/apache/lucene/store/TestGrowableByteArrayDataOutput.java
delete mode 100644 lucene/core/src/test/org/apache/lucene/store/TestHugeRamFile.java
delete mode 100644 lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java
rename lucene/{core/src/test/org/apache/lucene/codecs/lucene70/TestLucene70NormsFormat.java => sandbox/src/java/org/apache/lucene/search/intervals/FilteringConjunctionIntervalsSource.java} (58%)
copy lucene/sandbox/src/java/org/apache/lucene/search/intervals/{ExtendedIntervalsSource.java => FixedFieldIntervalsSource.java} (62%)
create mode 100644 lucene/sandbox/src/java/org/apache/lucene/search/intervals/IntervalScoreFunction.java
create mode 100644 lucene/sandbox/src/java/org/apache/lucene/search/intervals/MultiTermIntervalsSource.java
create mode 100644 lucene/sandbox/src/test/org/apache/lucene/document/TestLatLonMultiLineShapeQueries.java
create mode 100644 lucene/sandbox/src/test/org/apache/lucene/document/TestLatLonMultiPointShapeQueries.java
create mode 100644 lucene/sandbox/src/test/org/apache/lucene/document/TestLatLonMultiPolygonShapeQueries.java
create mode 100644 solr/core/src/test/org/apache/solr/handler/component/CustomTermsComponentTest.java
create mode 100644 solr/core/src/test/org/apache/solr/handler/component/ShardsWhitelistTest.java
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingMADEvaluator.java
[lucene-solr] 01/02: Remove deprecated ResourceLoader constructors
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
romseygeek pushed a commit to branch master-deprecations
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 856c9830f8b4e4fcc95a583942b944c7a5827631
Author: Alan Woodward <ro...@apache.org>
AuthorDate: Thu Jan 24 10:35:22 2019 +0000
Remove deprecated ResourceLoader constructors
---
.../analysis/util/ClasspathResourceLoader.java | 18 ------------------
.../analysis/util/FilesystemResourceLoader.java | 16 ----------------
.../util/TestFilesystemResourceLoader.java | 2 +-
.../byTask/tasks/AnalyzerFactoryTask.java | 22 +++++++++++-----------
.../apache/solr/schema/TestICUCollationField.java | 2 +-
5 files changed, 13 insertions(+), 47 deletions(-)
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java
index 4ee9212..014f329 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java
@@ -20,8 +20,6 @@ package org.apache.lucene.analysis.util;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.lucene.util.SuppressForbidden;
-
/**
* Simple {@link ResourceLoader} that uses {@link ClassLoader#getResourceAsStream(String)}
* and {@link Class#forName(String,boolean,ClassLoader)} to open resources and
@@ -30,22 +28,6 @@ import org.apache.lucene.util.SuppressForbidden;
public final class ClasspathResourceLoader implements ResourceLoader {
private final Class<?> clazz;
private final ClassLoader loader;
-
- /**
- * Creates an instance using the context classloader to load resources and classes.
- * Resource paths must be absolute.
- *
- * @deprecated You should not use this ctor, because it uses the thread's context
- * class loader, which is bad programming style. Please specify a reference class or
- * a {@link ClassLoader} instead.
- * @see #ClasspathResourceLoader(ClassLoader)
- * @see #ClasspathResourceLoader(Class)
- */
- @Deprecated
- @SuppressForbidden(reason = "Deprecated method uses thread's context classloader, but there for backwards compatibility")
- public ClasspathResourceLoader() {
- this(Thread.currentThread().getContextClassLoader());
- }
/**
* Creates an instance using the given classloader to load Resources and classes.
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java
index 4fbaa6d..6d0e608 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java
@@ -40,22 +40,6 @@ import java.nio.file.Path;
public final class FilesystemResourceLoader implements ResourceLoader {
private final Path baseDirectory;
private final ResourceLoader delegate;
-
- /**
- * Creates a resource loader that resolves resources against the given
- * base directory (may be {@code null} to refer to CWD).
- * Files not found in file system and class lookups are delegated to context
- * classloader.
- *
- * @deprecated You should not use this ctor, because it uses the thread's context
- * class loader as fallback for resource lookups, which is bad programming style.
- * Please specify a {@link ClassLoader} instead.
- * @see #FilesystemResourceLoader(Path, ClassLoader)
- */
- @Deprecated
- public FilesystemResourceLoader(Path baseDirectory) {
- this(baseDirectory, new ClasspathResourceLoader());
- }
/**
* Creates a resource loader that resolves resources against the given
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
index eaa6174..8858302 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
@@ -63,7 +63,7 @@ public class TestFilesystemResourceLoader extends LuceneTestCase {
IOUtils.closeWhileHandlingException(os);
}
- ResourceLoader rl = new FilesystemResourceLoader(base);
+ ResourceLoader rl = new FilesystemResourceLoader(base, TestFilesystemResourceLoader.class.getClassLoader());
assertEquals("foobar", WordlistLoader.getLines(rl.openResource("template.txt"), StandardCharsets.UTF_8).get(0));
// Same with full path name:
String fullPath = base.resolve("template.txt").toAbsolutePath().toString();
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
index 051a8fc..9f6cabf 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
@@ -17,16 +17,6 @@
package org.apache.lucene.benchmark.byTask.tasks;
-import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
-import org.apache.lucene.analysis.util.CharFilterFactory;
-import org.apache.lucene.analysis.util.FilesystemResourceLoader;
-import org.apache.lucene.analysis.util.ResourceLoaderAware;
-import org.apache.lucene.analysis.util.TokenFilterFactory;
-import org.apache.lucene.analysis.util.TokenizerFactory;
-import org.apache.lucene.benchmark.byTask.PerfRunData;
-import org.apache.lucene.benchmark.byTask.utils.AnalyzerFactory;
-import org.apache.lucene.util.Version;
-
import java.io.StreamTokenizer;
import java.io.StringReader;
import java.nio.file.Files;
@@ -38,6 +28,16 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
+import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
+import org.apache.lucene.analysis.util.CharFilterFactory;
+import org.apache.lucene.analysis.util.FilesystemResourceLoader;
+import org.apache.lucene.analysis.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
+import org.apache.lucene.analysis.util.TokenizerFactory;
+import org.apache.lucene.benchmark.byTask.PerfRunData;
+import org.apache.lucene.benchmark.byTask.utils.AnalyzerFactory;
+import org.apache.lucene.util.Version;
+
/**
* Analyzer factory construction task. The name given to the constructed factory may
* be given to NewAnalyzerTask, which will call AnalyzerFactory.create().
@@ -372,7 +372,7 @@ public class AnalyzerFactoryTask extends PerfTask {
if (!Files.isDirectory(baseDir)) {
baseDir = Paths.get(".");
}
- ((ResourceLoaderAware)instance).inform(new FilesystemResourceLoader(baseDir));
+ ((ResourceLoaderAware)instance).inform(new FilesystemResourceLoader(baseDir, AnalyzerFactoryTask.class.getClassLoader()));
}
if (CharFilterFactory.class.isAssignableFrom(clazz)) {
charFilterFactories.add((CharFilterFactory)instance);
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
index f164080..9d04c1a 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
@@ -92,7 +92,7 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
if (random().nextBoolean()) {
loader = new StringMockResourceLoader(tailoredRules);
} else {
- loader = new FilesystemResourceLoader(confDir.toPath());
+ loader = new FilesystemResourceLoader(confDir.toPath(), TestICUCollationField.class.getClassLoader());
}
final Collator readCollator = ICUCollationField.createFromRules(osFileName, loader);
assertEquals(tailoredCollator, readCollator);
[lucene-solr] 02/02: Merge branch '9-classpathrl' into
master-deprecations
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
romseygeek pushed a commit to branch master-deprecations
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 8f74653bd70054900af97e6401fc5dd7077ab72e
Merge: f2ff5ce 856c983
Author: Alan Woodward <ro...@apache.org>
AuthorDate: Thu Jan 24 10:35:43 2019 +0000
Merge branch '9-classpathrl' into master-deprecations
README.md | 7 +-
lucene/CHANGES.txt | 19 +
.../analysis/util/ClasspathResourceLoader.java | 18 -
.../analysis/util/FilesystemResourceLoader.java | 16 -
.../util/TestFilesystemResourceLoader.java | 2 +-
.../apache/lucene/codecs/lucene70/IndexedDISI.java | 0
.../codecs/lucene70/Lucene70DocValuesConsumer.java | 31 +-
.../codecs/lucene70/Lucene70DocValuesFormat.java | 0
.../codecs/lucene70/Lucene70DocValuesProducer.java | 0
.../codecs/lucene70/Lucene70NormsConsumer.java | 0
.../codecs/lucene70/Lucene70NormsFormat.java | 0
.../codecs/lucene70/Lucene70NormsProducer.java | 0
.../org.apache.lucene.codecs.DocValuesFormat | 1 +
.../lucene/codecs/lucene70/TestIndexedDISI.java | 0
.../lucene70/TestLucene70DocValuesFormat.java | 35 +-
.../codecs/lucene70/TestLucene70NormsFormat.java | 0
.../byTask/tasks/AnalyzerFactoryTask.java | 22 +-
.../lucene/codecs/blockterms/BlockTermsWriter.java | 22 +-
.../blockterms/FixedGapTermsIndexWriter.java | 23 +-
.../blocktreeords/OrdsBlockTreeTermsWriter.java | 36 +-
.../lucene/codecs/memory/DirectPostingsFormat.java | 14 +-
.../lucene/codecs/memory/FSTOrdTermsWriter.java | 49 +-
.../lucene/codecs/memory/FSTTermsWriter.java | 12 +-
.../lucene/codecs/MultiLevelSkipListWriter.java | 19 +-
.../codecs/blocktree/BlockTreeTermsWriter.java | 35 +-
.../compressing/CompressingStoredFieldsWriter.java | 36 +-
.../compressing/CompressingTermVectorsWriter.java | 20 +-
.../lucene/codecs/lucene50/Lucene50SkipWriter.java | 13 +-
.../lucene/codecs/lucene50/package-info.java | 2 +-
.../lucene/codecs/lucene60/package-info.java | 2 +-
.../lucene/codecs/lucene70/package-info.java | 387 +----------
.../apache/lucene/codecs/lucene80/IndexedDISI.java | 632 ++++++++++++++++++
.../lucene/codecs/lucene80/Lucene80Codec.java | 7 +-
.../Lucene80DocValuesConsumer.java} | 274 ++++----
.../Lucene80DocValuesFormat.java} | 34 +-
.../Lucene80DocValuesProducer.java} | 216 +++---
.../Lucene80NormsConsumer.java} | 34 +-
.../Lucene80NormsFormat.java} | 18 +-
.../Lucene80NormsProducer.java} | 49 +-
.../lucene/codecs/lucene80/package-info.java | 12 +-
.../org/apache/lucene/index/DocumentsWriter.java | 4 +-
.../lucene/index/DocumentsWriterFlushControl.java | 21 +-
.../lucene/index/DocumentsWriterPerThreadPool.java | 30 +-
.../apache/lucene/index/FrozenBufferedUpdates.java | 1 +
.../lucene/index/NumericDocValuesFieldUpdates.java | 6 +-
.../org/apache/lucene/index/PrefixCodedTerms.java | 69 +-
.../org/apache/lucene/index/SortingLeafReader.java | 29 +-
.../lucene/store/GrowableByteArrayDataOutput.java | 102 ---
.../src/java/org/apache/lucene/util/IOUtils.java | 3 +-
.../java/org/apache/lucene/util/bkd/BKDWriter.java | 38 +-
.../src/java/org/apache/lucene/util/fst/FST.java | 10 +-
.../org.apache.lucene.codecs.DocValuesFormat | 2 +-
.../org/apache/lucene/codecs/TestCodecUtil.java | 102 +--
.../lucene/codecs/lucene80/TestIndexedDISI.java | 522 +++++++++++++++
.../TestLucene80DocValuesFormat.java} | 156 +++--
.../TestLucene80NormsFormat.java} | 7 +-
.../org/apache/lucene/index/TestDocValues.java | 6 +-
.../org/apache/lucene/index/TestIndexWriter.java | 34 +
.../lucene/index/TestIndexWriterOnDiskFull.java | 2 +-
.../apache/lucene/search/TermInSetQueryTest.java | 4 +-
.../org/apache/lucene/search/TestPointQueries.java | 42 +-
.../lucene/store/BaseDataOutputTestCase.java | 1 -
.../lucene/store/TestByteBuffersDataInput.java | 3 +-
.../lucene/store/TestByteBuffersDataOutput.java | 1 -
.../store/TestGrowableByteArrayDataOutput.java | 80 ---
.../org/apache/lucene/store/TestHugeRamFile.java | 102 ---
.../org/apache/lucene/store/TestRAMDirectory.java | 189 ------
.../apache/lucene/replicator/nrt/PrimaryNode.java | 24 +-
.../lucene/replicator/nrt/SimpleTransLog.java | 15 +-
.../idversion/VersionBlockTreeTermsWriter.java | 34 +-
.../org/apache/lucene/document/LatLonShape.java | 2 +-
.../document/LatLonShapeBoundingBoxQuery.java | 2 +-
.../lucene/document/LatLonShapeLineQuery.java | 2 +-
.../lucene/document/LatLonShapePolygonQuery.java | 2 +-
.../apache/lucene/document/LatLonShapeQuery.java | 48 +-
.../java/org/apache/lucene/geo/Rectangle2D.java | 5 +-
.../intervals/ConjunctionIntervalsSource.java | 9 +
.../intervals/DifferenceIntervalsSource.java | 5 +
.../intervals/DisjunctionIntervalsSource.java | 11 +-
.../search/intervals/ExtendedIntervalsSource.java | 9 +
.../search/intervals/FilteredIntervalsSource.java | 5 +
.../FilteringConjunctionIntervalsSource.java} | 25 +-
...sSource.java => FixedFieldIntervalsSource.java} | 41 +-
.../lucene/search/intervals/IntervalQuery.java | 93 ++-
.../search/intervals/IntervalScoreFunction.java | 162 +++++
.../lucene/search/intervals/IntervalScorer.java | 36 +-
.../apache/lucene/search/intervals/Intervals.java | 51 +-
.../lucene/search/intervals/IntervalsSource.java | 7 +-
.../MinimumShouldMatchIntervalsSource.java | 14 +
.../search/intervals/MultiTermIntervalsSource.java | 120 ++++
.../search/intervals/OffsetIntervalsSource.java | 5 +
.../search/intervals/TermIntervalsSource.java | 13 +
.../lucene/document/BaseLatLonShapeTestCase.java | 62 +-
.../document/TestLatLonLineShapeQueries.java | 3 +-
.../document/TestLatLonMultiLineShapeQueries.java | 124 ++++
.../document/TestLatLonMultiPointShapeQueries.java | 124 ++++
.../TestLatLonMultiPolygonShapeQueries.java | 136 ++++
.../document/TestLatLonPointShapeQueries.java | 2 +-
.../document/TestLatLonPolygonShapeQueries.java | 2 +-
.../org/apache/lucene/geo/TestRectangle2D.java | 7 +-
.../lucene/search/intervals/TestIntervalQuery.java | 51 ++
.../lucene/search/intervals/TestIntervals.java | 90 +++
.../lucene/index/BaseDocValuesFormatTestCase.java | 19 +-
.../lucene/index/BaseIndexFileFormatTestCase.java | 27 +-
.../apache/lucene/store/BaseDirectoryTestCase.java | 26 +-
.../apache/lucene/store/MockDirectoryWrapper.java | 47 +-
.../lucene/store/MockIndexOutputWrapper.java | 6 +-
.../org/apache/lucene/util/RamUsageTester.java | 181 ++---
.../src/java/org/apache/lucene/util/TestUtil.java | 4 +-
solr/CHANGES.txt | 45 +-
solr/bin/solr.in.cmd | 6 +
solr/bin/solr.in.sh | 5 +
.../apache/solr/schema/TestICUCollationField.java | 2 +-
.../apache/solr/cloud/ExclusiveSliceProperty.java | 20 +
.../solr/handler/admin/RebalanceLeaders.java | 383 ++++++++---
.../solr/handler/admin/ZookeeperStatusHandler.java | 9 +-
.../solr/handler/component/HttpShardHandler.java | 39 +-
.../handler/component/HttpShardHandlerFactory.java | 174 ++++-
.../solr/handler/component/TermsComponent.java | 40 +-
.../solr/collection1/conf/schema_codec.xml | 2 +-
solr/core/src/test-files/solr/solr.xml | 1 +
.../test/org/apache/solr/TestTolerantSearch.java | 2 +
.../apache/solr/cloud/TestRebalanceLeaders.java | 738 ++++++++++++++-------
.../autoscaling/sim/TestSimTriggerIntegration.java | 125 ++--
.../component/CustomTermsComponentTest.java | 257 +++++++
.../component/DistributedDebugComponentTest.java | 2 +
.../handler/component/ShardsWhitelistTest.java | 264 ++++++++
.../component/TestHttpShardHandlerFactory.java | 202 +++++-
.../org/apache/solr/search/TestSmileRequest.java | 2 +
.../solr/search/facet/TestJsonFacetRefinement.java | 2 +
.../apache/solr/search/facet/TestJsonFacets.java | 38 +-
.../apache/solr/search/json/TestJsonRequest.java | 2 +
.../solr/update/TestInPlaceUpdatesDistrib.java | 2 +-
solr/server/solr/solr.xml | 1 +
solr/solr-ref-guide/build.xml | 2 +-
solr/solr-ref-guide/src/collections-api.adoc | 95 ++-
solr/solr-ref-guide/src/distributed-requests.adoc | 8 +-
.../distributed-search-with-index-sharding.adoc | 3 +
solr/solr-ref-guide/src/faceting.adoc | 2 +
solr/solr-ref-guide/src/indexupgrader-tool.adoc | 10 +-
.../src/solrcloud-autoscaling-overview.adoc | 8 +-
.../solrcloud-autoscaling-policy-preferences.adoc | 6 +-
.../src/solrcloud-autoscaling-triggers.adoc | 3 +-
solr/solr-ref-guide/src/the-terms-component.adoc | 2 +
solr/solr-ref-guide/src/working-with-dates.adoc | 3 +-
.../java/org/apache/solr/client/solrj/io/Lang.java | 1 +
.../client/solrj/io/eval/MovingMADEvaluator.java | 71 ++
.../client/solrj/io/eval/OscillateEvaluator.java | 7 +-
solr/solrj/src/test-files/solrj/solr/solr.xml | 1 +
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../client/solrj/io/stream/MathExpressionTest.java | 29 +-
.../apache/solr/BaseDistributedSearchTestCase.java | 12 +
.../src/java/org/apache/solr/SolrTestCaseHS.java | 22 +
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 13 +
.../apache/solr/cloud/MiniSolrCloudCluster.java | 3 +
solr/webapp/web/css/angular/analysis.css | 2 +-
solr/webapp/web/css/angular/common.css | 4 +-
solr/webapp/web/css/angular/dataimport.css | 2 +-
solr/webapp/web/css/angular/login.css | 6 +
solr/webapp/web/js/angular/controllers/login.js | 12 +-
solr/webapp/web/partials/login.html | 18 +-
161 files changed, 5615 insertions(+), 2409 deletions(-)