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 2014/12/01 18:02:51 UTC
svn commit: r1642713 [1/3] - in /lucene/dev/branches/lucene2878/lucene: ./
analysis/ analysis/common/
analysis/common/src/test/org/apache/lucene/analysis/core/
analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/
analysis/common/src/test/...
Author: romseygeek
Date: Mon Dec 1 17:02:49 2014
New Revision: 1642713
URL: http://svn.apache.org/r1642713
Log:
Actually commit everything, not just under whatever directory I happen to be in
Added:
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/mockfile/
- copied from r1642144, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/mockfile/
lucene/dev/branches/lucene2878/lucene/tools/javadoc/java8/
- copied from r1642144, lucene/dev/trunk/lucene/tools/javadoc/java8/
Removed:
lucene/dev/branches/lucene2878/lucene/tools/javadoc/java7/
Modified:
lucene/dev/branches/lucene2878/lucene/ (props changed)
lucene/dev/branches/lucene2878/lucene/BUILD.txt (contents, props changed)
lucene/dev/branches/lucene2878/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene2878/lucene/SYSTEM_REQUIREMENTS.txt (contents, props changed)
lucene/dev/branches/lucene2878/lucene/analysis/ (props changed)
lucene/dev/branches/lucene2878/lucene/analysis/common/ (props changed)
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java
lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/build.xml
lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java
lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java
lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
lucene/dev/branches/lucene2878/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene2878/lucene/benchmark/build.xml
lucene/dev/branches/lucene2878/lucene/build.xml (contents, props changed)
lucene/dev/branches/lucene2878/lucene/codecs/ (props changed)
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/lucene2878/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/lucene2878/lucene/expressions/ (props changed)
lucene/dev/branches/lucene2878/lucene/expressions/build.xml
lucene/dev/branches/lucene2878/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
lucene/dev/branches/lucene2878/lucene/facet/ (props changed)
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java
lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/branches/lucene2878/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java
lucene/dev/branches/lucene2878/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java
lucene/dev/branches/lucene2878/lucene/grouping/ (props changed)
lucene/dev/branches/lucene2878/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java
lucene/dev/branches/lucene2878/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java
lucene/dev/branches/lucene2878/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/lucene2878/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene2878/lucene/highlighter/build.xml
lucene/dev/branches/lucene2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/lucene2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/lucene2878/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/lucene2878/lucene/join/ (props changed)
lucene/dev/branches/lucene2878/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
lucene/dev/branches/lucene2878/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/branches/lucene2878/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/branches/lucene2878/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
lucene/dev/branches/lucene2878/lucene/misc/ (props changed)
lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingLeafReader.java
lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java
lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java
lucene/dev/branches/lucene2878/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
lucene/dev/branches/lucene2878/lucene/queries/ (props changed)
lucene/dev/branches/lucene2878/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java
lucene/dev/branches/lucene2878/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
lucene/dev/branches/lucene2878/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
lucene/dev/branches/lucene2878/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java
lucene/dev/branches/lucene2878/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene2878/lucene/queryparser/build.xml
lucene/dev/branches/lucene2878/lucene/replicator/ (props changed)
lucene/dev/branches/lucene2878/lucene/replicator/build.xml
lucene/dev/branches/lucene2878/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java
lucene/dev/branches/lucene2878/lucene/spatial/ (props changed)
lucene/dev/branches/lucene2878/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java
lucene/dev/branches/lucene2878/lucene/suggest/ (props changed)
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
lucene/dev/branches/lucene2878/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
lucene/dev/branches/lucene2878/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java
lucene/dev/branches/lucene2878/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
lucene/dev/branches/lucene2878/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene2878/lucene/test-framework/build.xml
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/util/ThrottledIndexOutput.java
lucene/dev/branches/lucene2878/lucene/tools/ (props changed)
lucene/dev/branches/lucene2878/lucene/tools/javadoc/ecj.javadocs.prefs
Modified: lucene/dev/branches/lucene2878/lucene/BUILD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/BUILD.txt?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/BUILD.txt (original)
+++ lucene/dev/branches/lucene2878/lucene/BUILD.txt Mon Dec 1 17:02:49 2014
@@ -1,19 +1,19 @@
Lucene Build Instructions
Basic steps:
- 0) Install JDK 1.7 (or greater), Ant 1.8.2+, Ivy 2.2.0
+ 0) Install JDK 1.8 (or greater), Ant 1.8.2+, Ivy 2.2.0
1) Download Lucene from Apache and unpack it
2) Connect to the top-level of your Lucene installation
3) Install JavaCC (optional)
4) Run ant
-Step 0) Set up your development environment (JDK 1.7 or greater,
+Step 0) Set up your development environment (JDK 1.8 or greater,
Ant 1.8.2+, Ivy 2.2.0)
We'll assume that you know how to get and set up the JDK - if you
-don't, then we suggest starting at http://java.sun.com and learning
+don't, then we suggest starting at http://www.oracle.com/java/ and learning
more about Java, before returning to this README. Lucene runs with
-JDK 1.7 and later.
+JDK 1.8 and later.
Like many Open Source java projects, Lucene uses Apache Ant for build
control. Specifically, you MUST use Ant version 1.8.2+.
Modified: lucene/dev/branches/lucene2878/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/CHANGES.txt?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene2878/lucene/CHANGES.txt Mon Dec 1 17:02:49 2014
@@ -5,6 +5,11 @@ http://s.apache.org/luceneversions
======================= Lucene 6.0.0 =======================
+System Requirements
+
+* LUCENE-5950: Move to Java 8 as minimum Java version.
+ (Ryan Ernst, Uwe Schindler)
+
New Features
API Changes
@@ -17,6 +22,9 @@ API Changes
(Nikola Tanković, Uwe Schindler, Chris Male, Mike McCandless,
Robert Muir)
+* LUCENE-6067: Accountable.getChildResources has a default
+ implementation returning the empty list. (Robert Muir)
+
======================= Lucene 5.0.0 =======================
New Features
@@ -41,7 +49,7 @@ New Features
* LUCENE-5889: Add commit method to AnalyzingInfixSuggester, and allow just using .add
to build up the suggester. (Varun Thacker via Mike McCandless)
-* LUCENE-5123: Add a "push" option to the postings writing API, so
+* LUCENE-5123: Add a "pull" option to the postings writing API, so
that a PostingsFormat now receives a Fields instance and it is
responsible for iterating through all fields, terms, documents and
positions. (Robert Muir, Mike McCandless)
@@ -95,6 +103,18 @@ New Features
each context passed to Analyzing/BlendedInfixSuggester (Arcadius
Ahouansou, jane chang via Mike McCandless)
+* LUCENE-5929: Also extract terms to highlight from block join
+ queries. (Julie Tibshirani via Mike McCandless)
+
+* LUCENE-6063: Allow overriding whether/how ConcurrentMergeScheduler
+ stalls incoming threads when merges are falling behind (Mike
+ McCandless)
+
+* LUCENE-5833: DocumentDictionary now enumerates each value separately
+ in a multi-valued field (not just the first value), so you can build
+ suggesters from multi-valued fields. (Varun Thacker via Mike
+ McCandless)
+
API Changes
* LUCENE-5900: Deprecated more constructors taking Version in *InfixSuggester and
@@ -199,6 +219,12 @@ API Changes
instance based on a Directory implementation passed to the factory method.
See MIGRATE.txt for more details. (Uwe Schindler, Robert Muir)
+* LUCENE-6062: Throw exception instead of silently doing nothing if you try to
+ sort/group/etc on a misconfigured field (e.g. no docvalues, no UninvertingReader, etc).
+ (Robert Muir)
+
+* LUCENE-6068: LeafReader.fields() never returns null. (Robert Muir)
+
Bug Fixes
* LUCENE-5650: Enforce read-only access to any path outside the temporary
@@ -213,6 +239,9 @@ Bug Fixes
not have the regular "spinlock" of DirectoryReader.open. It now implements
Closeable and you must close it to release the lock. (Mike McCandless, Robert Muir)
+* LUCENE-6004: Don't highlight the LookupResult.key returned from
+ AnalyzingInfixSuggester (Christian Reuschling, jane chang via Mike McCandless)
+
* LUCENE-5980: Don't let document length overflow. (Robert Muir)
* LUCENE-5961: Fix the exists() method for FunctionValues returned by many ValueSoures to
@@ -246,12 +275,23 @@ Bug Fixes
* LUCENE-6055: PayloadAttribute.clone() now does a deep clone of the underlying
bytes. (Shai Erera)
+
+* LUCENE-6060: Remove dangerous IndexWriter.unlock method (Simon
+ Willnauer, Mike McCandless)
+
+* LUCENE-6062: Pass correct fieldinfos to docvalues producer when the
+ segment has updates. (Mike McCandless, Shai Erera, Robert Muir)
+
+* LUCENE-6075: Don't overflow int in SimpleRateLimiter (Boaz Leskes
+ via Mike McCandless)
Documentation
* LUCENE-5392: Add/improve analysis package documentation to reflect
analysis API changes. (Benson Margulies via Robert Muir - pull request #17)
+* LUCENE-6057: Improve Sort(SortField) docs (Martin Braun via Mike McCandless)
+
Tests
* LUCENE-5957: Add option for tests to not randomize codec
@@ -317,6 +357,8 @@ Build
* LUCENE-5995: Upgrade ICU to 54.1 (Robert Muir)
+* LUCENE-6070: Upgrade forbidden-apis to 1.7 (Uwe Schindler)
+
Other
* LUCENE-5563: Removed sep layout: which has fallen behind on features and doesn't
@@ -327,6 +369,13 @@ Other
* LUCENE-5915: Remove Pulsing postings format. (Robert Muir)
+======================= Lucene 4.10.3 ======================
+
+Bug fixes
+
+* LUCENE-3229: Overlapping ordered SpanNearQuery spans should not match.
+ (Ludovic Boutros, Paul Elschot, Greg Dearing, ehatcher)
+
======================= Lucene 4.10.2 ======================
Bug fixes
Modified: lucene/dev/branches/lucene2878/lucene/SYSTEM_REQUIREMENTS.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/SYSTEM_REQUIREMENTS.txt?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/SYSTEM_REQUIREMENTS.txt (original)
+++ lucene/dev/branches/lucene2878/lucene/SYSTEM_REQUIREMENTS.txt Mon Dec 1 17:02:49 2014
@@ -1,9 +1,6 @@
# System Requirements
-Apache Lucene runs of Java 7 or greater, Java 8 is verified to be
-compatible and may bring some performance improvements. When using
-Oracle Java 7 or OpenJDK 7, be sure to not use the GA build 147 or
-update versions u40, u45 and u51! We recommend using u55 or later.
+Apache Lucene runs on Java 8 or greater.
It is also recommended to always use the latest update version of your
Java VM, because bugs may affect Lucene. An overview of known JVM bugs
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java Mon Dec 1 17:02:49 2014
@@ -246,6 +246,7 @@ public class TestBugInSomething extends
}
// LUCENE-5269
+ @Slow
public void testUnicodeShinglesAndNgrams() throws Exception {
Analyzer analyzer = new Analyzer() {
@Override
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java Mon Dec 1 17:02:49 2014
@@ -77,7 +77,7 @@ public class TestFactories extends BaseT
// beast it just a little, it shouldnt throw exceptions:
// (it should have thrown them in initialize)
- checkRandomData(random(), new FactoryAnalyzer(factory, null, null), 100, 20, false, false);
+ checkRandomData(random(), new FactoryAnalyzer(factory, null, null), 20, 20, false, false);
}
}
@@ -97,7 +97,7 @@ public class TestFactories extends BaseT
// beast it just a little, it shouldnt throw exceptions:
// (it should have thrown them in initialize)
- checkRandomData(random(), new FactoryAnalyzer(assertingTokenizer, factory, null), 100, 20, false, false);
+ checkRandomData(random(), new FactoryAnalyzer(assertingTokenizer, factory, null), 20, 20, false, false);
}
}
@@ -117,7 +117,7 @@ public class TestFactories extends BaseT
// beast it just a little, it shouldnt throw exceptions:
// (it should have thrown them in initialize)
- checkRandomData(random(), new FactoryAnalyzer(assertingTokenizer, null, factory), 100, 20, false, false);
+ checkRandomData(random(), new FactoryAnalyzer(assertingTokenizer, null, factory), 20, 20, false, false);
}
}
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java Mon Dec 1 17:02:49 2014
@@ -900,7 +900,7 @@ public class TestRandomChains extends Ba
}
public void testRandomChains() throws Throwable {
- int numIterations = atLeast(20);
+ int numIterations = TEST_NIGHTLY ? atLeast(20) : 3;
Random random = random();
for (int i = 0; i < numIterations; i++) {
MockRandomAnalyzer a = new MockRandomAnalyzer(random.nextLong());
@@ -919,7 +919,7 @@ public class TestRandomChains extends Ba
// we might regret this decision...
public void testRandomChainsWithLargeStrings() throws Throwable {
- int numIterations = atLeast(20);
+ int numIterations = TEST_NIGHTLY ? atLeast(20) : 3;
Random random = random();
for (int i = 0; i < numIterations; i++) {
MockRandomAnalyzer a = new MockRandomAnalyzer(random.nextLong());
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java Mon Dec 1 17:02:49 2014
@@ -135,7 +135,9 @@ public class TestStemmerOverrideFilter e
if (map.isEmpty()) {
map.put("booked", "books");
}
- StemmerOverrideFilter.Builder builder = new StemmerOverrideFilter.Builder(random().nextBoolean());
+ // This test might fail if ignoreCase is true since the map might have twice the same key, once
+ // lowercased and once uppercased
+ StemmerOverrideFilter.Builder builder = new StemmerOverrideFilter.Builder(false);
Set<Entry<String,String>> entrySet = map.entrySet();
for (Entry<String,String> entry : entrySet) {
builder.add(entry.getKey(), entry.getValue());
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java Mon Dec 1 17:02:49 2014
@@ -355,7 +355,7 @@ public class TestWordDelimiterFilter ext
}
};
// TODO: properly support positionLengthAttribute
- checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER, 20, false, false);
+ checkRandomData(random(), a, 200*RANDOM_MULTIPLIER, 20, false, false);
}
}
@@ -380,7 +380,7 @@ public class TestWordDelimiterFilter ext
}
};
// TODO: properly support positionLengthAttribute
- checkRandomData(random(), a, 100*RANDOM_MULTIPLIER, 8192, false, false);
+ checkRandomData(random(), a, 20*RANDOM_MULTIPLIER, 8192, false, false);
}
}
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java Mon Dec 1 17:02:49 2014
@@ -99,7 +99,8 @@ public class EdgeNGramTokenizerTest exte
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- for (int i = 0; i < 10; i++) {
+ int numIters = TEST_NIGHTLY ? 10 : 1;
+ for (int i = 0; i < numIters; i++) {
final int min = TestUtil.nextInt(random(), 2, 10);
final int max = TestUtil.nextInt(random(), min, 20);
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java Mon Dec 1 17:02:49 2014
@@ -110,7 +110,8 @@ public class NGramTokenizerTest extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- for (int i = 0; i < 10; i++) {
+ int numIters = TEST_NIGHTLY ? 10 : 1;
+ for (int i = 0; i < numIters; i++) {
final int min = TestUtil.nextInt(random(), 2, 10);
final int max = TestUtil.nextInt(random(), min, 20);
Analyzer a = new Analyzer() {
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java Mon Dec 1 17:02:49 2014
@@ -130,6 +130,6 @@ public class TestSnowball extends BaseTo
return new TokenStreamComponents(t, new SnowballFilter(t, snowballLanguage));
}
};
- checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), a, 100*RANDOM_MULTIPLIER);
}
}
\ No newline at end of file
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java Mon Dec 1 17:02:49 2014
@@ -24,12 +24,14 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.KeywordTokenizer;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.Slow;
import static org.apache.lucene.analysis.VocabularyAssert.*;
/**
* Test the snowball filters against the snowball data tests
*/
+@Slow
public class TestSnowballVocab extends LuceneTestCase {
/**
* Run all languages against their snowball vocabulary tests.
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java Mon Dec 1 17:02:49 2014
@@ -32,6 +32,7 @@ import org.apache.lucene.util.TestUtil;
public class TestStandardAnalyzer extends BaseTokenStreamTestCase {
// LUCENE-5897: slow tokenization of strings of the form (\p{WB:ExtendNumLet}[\p{WB:Format}\p{WB:Extend}]*)+
+ @Slow
public void testLargePartiallyMatchingToken() throws Exception {
// TODO: get these lists of chars matching a property from ICU4J
// http://www.unicode.org/Public/6.3.0/ucd/auxiliary/WordBreakProperty.txt
Modified: lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java Mon Dec 1 17:02:49 2014
@@ -41,6 +41,7 @@ import java.util.Random;
public class TestUAX29URLEmailTokenizer extends BaseTokenStreamTestCase {
// LUCENE-5440: extremely slow tokenization of text matching email <local-part> (before the '@')
+ @Slow
public void testLongEMAILatomText() throws Exception {
// EMAILatomText = [A-Za-z0-9!#$%&'*+-/=?\^_`{|}~]
char[] emailAtomChars
Modified: lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/build.xml?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/build.xml (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/build.xml Mon Dec 1 17:02:49 2014
@@ -58,7 +58,7 @@
<target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
<target name="download-dict" depends="ivy-availability-check,ivy-fail,ivy-configure" unless="dict.available">
- <ivy:retrieve pattern="${build.dir}/${dict.src.file}" conf="${ipadic.type}"/>
+ <ivy:retrieve pattern="${build.dir}/${dict.src.file}" conf="${ipadic.type}" symlink="${ivy.symlink}"/>
<!-- TODO: we should checksum too -->
<gunzip src="${build.dir}/${dict.src.file}"/>
<untar src="${build.dir}/${ipadic.version}.tar" dest="${build.dir}"/>
Modified: lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java Mon Dec 1 17:02:49 2014
@@ -28,9 +28,7 @@ import org.apache.lucene.analysis.ja.Jap
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.UnicodeUtil;
-import org.apache.lucene.util.LuceneTestCase.Slow;
-@Slow
public class TestExtendedMode extends BaseTokenStreamTestCase {
private final Analyzer analyzer = new Analyzer() {
@@ -66,12 +64,12 @@ public class TestExtendedMode extends Ba
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
Random random = random();
- checkRandomData(random, analyzer, 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random, analyzer, 500*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
Random random = random();
- checkRandomData(random, analyzer, 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, analyzer, 30*RANDOM_MULTIPLIER, 8192);
}
}
Modified: lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java Mon Dec 1 17:02:49 2014
@@ -23,12 +23,10 @@ import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode;
-import org.apache.lucene.util.LuceneTestCase.Slow;
/**
* Test Kuromoji Japanese morphological analyzer
*/
-@Slow
public class TestJapaneseAnalyzer extends BaseTokenStreamTestCase {
/** This test fails with NPE when the
* stopwords file is missing in classpath */
@@ -130,7 +128,7 @@ public class TestJapaneseAnalyzer extend
final Analyzer a = new JapaneseAnalyzer(null, Mode.SEARCH,
JapaneseAnalyzer.getDefaultStopSet(),
JapaneseAnalyzer.getDefaultStopTags());
- checkRandomData(random, a, atLeast(10000));
+ checkRandomData(random, a, atLeast(1000));
}
/** blast some random large strings through the analyzer */
@@ -139,7 +137,7 @@ public class TestJapaneseAnalyzer extend
final Analyzer a = new JapaneseAnalyzer(null, Mode.SEARCH,
JapaneseAnalyzer.getDefaultStopSet(),
JapaneseAnalyzer.getDefaultStopTags());
- checkRandomData(random, a, 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, a, 2*RANDOM_MULTIPLIER, 8192);
}
// Copied from TestJapaneseTokenizer, to make sure passing
Modified: lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java Mon Dec 1 17:02:49 2014
@@ -39,7 +39,6 @@ import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.UnicodeUtil;
import org.apache.lucene.util.LuceneTestCase.Slow;
-@Slow
public class TestJapaneseTokenizer extends BaseTokenStreamTestCase {
public static UserDictionary readDict() {
@@ -184,15 +183,15 @@ public class TestJapaneseTokenizer exten
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), analyzer, 1000*RANDOM_MULTIPLIER);
- checkRandomData(random(), analyzerNoPunct, 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), analyzer, 500*RANDOM_MULTIPLIER);
+ checkRandomData(random(), analyzerNoPunct, 500*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
Random random = random();
- checkRandomData(random, analyzer, 100*RANDOM_MULTIPLIER, 8192);
- checkRandomData(random, analyzerNoPunct, 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, analyzer, 20*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, analyzerNoPunct, 20*RANDOM_MULTIPLIER, 8192);
}
public void testRandomHugeStringsMockGraphAfter() throws Exception {
@@ -207,11 +206,11 @@ public class TestJapaneseTokenizer exten
return new TokenStreamComponents(tokenizer, graph);
}
},
- 100*RANDOM_MULTIPLIER, 8192);
+ 20*RANDOM_MULTIPLIER, 8192);
}
public void testLargeDocReliability() throws Exception {
- for (int i = 0; i < 100; i++) {
+ for (int i = 0; i < 10; i++) {
String s = TestUtil.randomUnicodeString(random(), 10000);
try (TokenStream ts = analyzer.tokenStream("foo", s)) {
ts.reset();
Modified: lucene/dev/branches/lucene2878/lucene/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/benchmark/build.xml?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/benchmark/build.xml (original)
+++ lucene/dev/branches/lucene2878/lucene/benchmark/build.xml Mon Dec 1 17:02:49 2014
@@ -174,6 +174,7 @@
<pathelement path="${spatial.jar}"/>
<pathelement path="${queries.jar}"/>
<pathelement path="${codecs.jar}"/>
+ <pathelement path="${join.jar}"/>
<path refid="base.classpath"/>
<fileset dir="lib"/>
</path>
@@ -276,7 +277,7 @@
<echo>Benchmark output in JIRA table format is in file: ${shingle.jira.output.file}</echo>
</target>
- <target name="init" depends="module-build.init,jar-memory,jar-highlighter,jar-analyzers-common,jar-queryparser,jar-facet,jar-spatial,jar-codecs"/>
+ <target name="init" depends="module-build.init,jar-memory,jar-highlighter,jar-analyzers-common,jar-queryparser,jar-facet,jar-spatial,jar-codecs,jar-join"/>
<target name="compile-test" depends="copy-alg-files-for-testing,module-build.compile-test"/>
<target name="copy-alg-files-for-testing" description="copy .alg files as resources for testing">
Modified: lucene/dev/branches/lucene2878/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/build.xml?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/build.xml (original)
+++ lucene/dev/branches/lucene2878/lucene/build.xml Mon Dec 1 17:02:49 2014
@@ -336,7 +336,7 @@
<svn-export-source source.dir="."/>
<!-- Exclude javadoc package-list files under licenses incompatible with the ASL -->
- <delete dir="${svn.export.dir}/tools/javadoc/java7"/>
+ <delete dir="${svn.export.dir}/tools/javadoc/java8"/>
<!-- Exclude clover license files incompatible with the ASL -->
<delete dir="${svn.export.dir}/tools/clover"/>
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java Mon Dec 1 17:02:49 2014
@@ -238,11 +238,6 @@ public class BlockTermsReader extends Fi
public long ramBytesUsed() {
return FIELD_READER_RAM_BYTES_USED;
}
-
- @Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
@Override
public TermsEnum iterator(TermsEnum reuse) throws IOException {
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java Mon Dec 1 17:02:49 2014
@@ -17,7 +17,6 @@ package org.apache.lucene.codecs.bloom;
* limitations under the License.
*/
import java.io.IOException;
-import java.util.Collections;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.DataInput;
@@ -313,11 +312,6 @@ public class FuzzySet implements Account
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
-
- @Override
public String toString() {
return getClass().getSimpleName() + "(hash=" + hashFunction + ")";
}
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java Mon Dec 1 17:02:49 2014
@@ -686,11 +686,6 @@ class DirectDocValuesProducer extends Do
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
-
- @Override
public String toString() {
return getClass().getSimpleName();
}
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Mon Dec 1 17:02:49 2014
@@ -26,7 +26,7 @@ import java.util.TreeMap;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat;
+import org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat; // javadocs
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.Fields;
@@ -49,7 +49,7 @@ import org.apache.lucene.util.automaton.
import org.apache.lucene.util.automaton.RunAutomaton;
import org.apache.lucene.util.automaton.Transition;
-// TODO:
+// TODO:
// - build depth-N prefix hash?
// - or: longer dense skip lists than just next byte?
@@ -60,7 +60,7 @@ import org.apache.lucene.util.automaton.
* <p><b><font color=red>WARNING</font></b>: This is
* exceptionally RAM intensive: it makes no effort to
* compress the postings data, storing terms as separate
- * byte[] and postings as separate int[], but as a result it
+ * byte[] and postings as separate int[], but as a result it
* gives substantial increase in search performance.
*
* <p>This postings format supports {@link TermsEnum#ord}
@@ -87,7 +87,7 @@ public final class DirectPostingsFormat
public DirectPostingsFormat() {
this(DEFAULT_MIN_SKIP_COUNT, DEFAULT_LOW_FREQ_CUTOFF);
}
-
+
/** minSkipCount is how many terms in a row must have the
* same prefix before we put a skip pointer down. Terms
* with docFreq <= lowFreqCutoff will use a single int[]
@@ -98,7 +98,7 @@ public final class DirectPostingsFormat
this.minSkipCount = minSkipCount;
this.lowFreqCutoff = lowFreqCutoff;
}
-
+
@Override
public FieldsConsumer fieldsConsumer(SegmentWriteState state) throws IOException {
return PostingsFormat.forName("Lucene50").fieldsConsumer(state);
@@ -159,7 +159,7 @@ public final class DirectPostingsFormat
}
return sizeInBytes;
}
-
+
@Override
public Iterable<? extends Accountable> getChildResources() {
return Accountables.namedAccountables("field", fields);
@@ -204,7 +204,7 @@ public final class DirectPostingsFormat
@Override
public long ramBytesUsed() {
return BASE_RAM_BYTES_USED +
- ((postings!=null) ? RamUsageEstimator.sizeOf(postings) : 0) +
+ ((postings!=null) ? RamUsageEstimator.sizeOf(postings) : 0) +
((payloads!=null) ? RamUsageEstimator.sizeOf(payloads) : 0);
}
@@ -235,32 +235,32 @@ public final class DirectPostingsFormat
@Override
public long ramBytesUsed() {
- long sizeInBytes = BASE_RAM_BYTES_USED;
- sizeInBytes += (docIDs!=null)? RamUsageEstimator.sizeOf(docIDs) : 0;
- sizeInBytes += (freqs!=null)? RamUsageEstimator.sizeOf(freqs) : 0;
-
- if(positions != null) {
- sizeInBytes += RamUsageEstimator.shallowSizeOf(positions);
- for(int[] position : positions) {
- sizeInBytes += (position!=null) ? RamUsageEstimator.sizeOf(position) : 0;
- }
- }
-
- if (payloads != null) {
- sizeInBytes += RamUsageEstimator.shallowSizeOf(payloads);
- for(byte[][] payload : payloads) {
- if(payload != null) {
- sizeInBytes += RamUsageEstimator.shallowSizeOf(payload);
- for(byte[] pload : payload) {
- sizeInBytes += (pload!=null) ? RamUsageEstimator.sizeOf(pload) : 0;
- }
- }
- }
- }
-
- return sizeInBytes;
+ long sizeInBytes = BASE_RAM_BYTES_USED;
+ sizeInBytes += (docIDs!=null)? RamUsageEstimator.sizeOf(docIDs) : 0;
+ sizeInBytes += (freqs!=null)? RamUsageEstimator.sizeOf(freqs) : 0;
+
+ if(positions != null) {
+ sizeInBytes += RamUsageEstimator.shallowSizeOf(positions);
+ for(int[] position : positions) {
+ sizeInBytes += (position!=null) ? RamUsageEstimator.sizeOf(position) : 0;
+ }
+ }
+
+ if (payloads != null) {
+ sizeInBytes += RamUsageEstimator.shallowSizeOf(payloads);
+ for(byte[][] payload : payloads) {
+ if(payload != null) {
+ sizeInBytes += RamUsageEstimator.shallowSizeOf(payload);
+ for(byte[] pload : payload) {
+ sizeInBytes += (pload!=null) ? RamUsageEstimator.sizeOf(pload) : 0;
+ }
+ }
+ }
+ }
+
+ return sizeInBytes;
}
-
+
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
@@ -321,7 +321,7 @@ public final class DirectPostingsFormat
}
terms = new TermAndSkip[numTerms];
termOffsets = new int[1+numTerms];
-
+
byte[] termBytes = new byte[1024];
this.minSkipCount = minSkipCount;
@@ -420,7 +420,7 @@ public final class DirectPostingsFormat
}
final int[] postings = scratch.get();
-
+
ent = new LowFreqTerm(postings, payloads, docFreq, (int) totalTermFreq);
} else {
final int[] docs = new int[docFreq];
@@ -532,17 +532,17 @@ public final class DirectPostingsFormat
sizeInBytes += ((skips!=null) ? RamUsageEstimator.sizeOf(skips) : 0);
sizeInBytes += ((skipOffsets!=null) ? RamUsageEstimator.sizeOf(skipOffsets) : 0);
sizeInBytes += ((sameCounts!=null) ? RamUsageEstimator.sizeOf(sameCounts) : 0);
-
+
if(terms!=null) {
sizeInBytes += RamUsageEstimator.shallowSizeOf(terms);
for(TermAndSkip termAndSkip : terms) {
sizeInBytes += (termAndSkip!=null) ? termAndSkip.ramBytesUsed() : 0;
}
}
-
+
return sizeInBytes;
}
-
+
@Override
public Iterable<? extends Accountable> getChildResources() {
return Collections.emptyList();
@@ -560,7 +560,7 @@ public final class DirectPostingsFormat
int upto = termOffsets[ord];
final int termLen = termOffsets[1+ord] - upto;
int otherUpto = other.offset;
-
+
final int stop = upto + Math.min(termLen, other.length);
while (upto < stop) {
int diff = (termBytes[upto++] & 0xFF) - (otherBytes[otherUpto++] & 0xFF);
@@ -568,7 +568,7 @@ public final class DirectPostingsFormat
return diff;
}
}
-
+
// One is a prefix of the other, or, they are equal:
return termLen - other.length;
}
@@ -720,7 +720,7 @@ public final class DirectPostingsFormat
public boolean hasPositions() {
return hasPos;
}
-
+
@Override
public boolean hasPayloads() {
return hasPayloads;
@@ -868,13 +868,15 @@ public final class DirectPostingsFormat
}
@Override
- public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) {
+ public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) throws IOException {
// TODO: implement reuse
// it's hairy!
+ if ((flags & DocsEnum.FLAG_POSITIONS) >= DocsEnum.FLAG_POSITIONS)
+ return docsAndPositions(liveDocs, reuse, flags);
+
if (terms[termOrd] instanceof LowFreqTerm) {
final int[] postings = ((LowFreqTerm) terms[termOrd]).postings;
- final byte[] payloads = ((LowFreqTerm) terms[termOrd]).payloads;
if (hasFreq) {
if (hasPos) {
int posLen;
@@ -890,13 +892,13 @@ public final class DirectPostingsFormat
if (reuse instanceof LowFreqDocsEnum) {
docsEnum = (LowFreqDocsEnum) reuse;
if (!docsEnum.canReuse(liveDocs, posLen)) {
- docsEnum = new LowFreqDocsEnum(liveDocs, hasOffsets, hasPayloads);
+ docsEnum = new LowFreqDocsEnum(liveDocs, posLen);
}
} else {
- docsEnum = new LowFreqDocsEnum(liveDocs, hasOffsets, hasPayloads);
+ docsEnum = new LowFreqDocsEnum(liveDocs, posLen);
}
- return docsEnum.reset(postings, payloads);
+ return docsEnum.reset(postings);
} else {
LowFreqDocsEnumNoPos docsEnum;
if (reuse instanceof LowFreqDocsEnumNoPos) {
@@ -954,7 +956,7 @@ public final class DirectPostingsFormat
final LowFreqTerm term = ((LowFreqTerm) terms[termOrd]);
final int[] postings = term.postings;
final byte[] payloads = term.payloads;
- return new LowFreqDocsEnum(liveDocs, hasOffsets, hasPayloads).reset(postings, payloads);
+ return new LowFreqDocsAndPositionsEnum(liveDocs, hasOffsets, hasPayloads).reset(postings, payloads);
} else {
final HighFreqTerm term = (HighFreqTerm) terms[termOrd];
return new HighFreqDocsAndPositionsEnum(liveDocs, hasOffsets).reset(term.docIDs, term.freqs, term.positions, term.payloads);
@@ -1217,7 +1219,7 @@ public final class DirectPostingsFormat
// if (DEBUG) {
// System.out.println(" term=" + new BytesRef(termBytes, termOffset, termLength).utf8ToString() + " skips=" + Arrays.toString(skips));
// }
-
+
assert termOrd < state.changeOrd;
assert stateUpto <= termLength: "term.length=" + termLength + "; stateUpto=" + stateUpto;
@@ -1350,7 +1352,7 @@ public final class DirectPostingsFormat
compiledAutomaton.automaton.initTransition(nextState, states[stateUpto].transition);
states[stateUpto].transitionUpto = -1;
states[stateUpto].transitionMax = -1;
-
+
if (stateUpto == termLength) {
// if (DEBUG) {
// System.out.println(" term ends after push");
@@ -1470,10 +1472,11 @@ public final class DirectPostingsFormat
public DocsEnum docs(Bits liveDocs, DocsEnum reuse, int flags) {
// TODO: implement reuse
// it's hairy!
+ if ((flags & DocsEnum.FLAG_POSITIONS) >= DocsEnum.FLAG_POSITIONS)
+ return docsAndPositions(liveDocs, reuse, flags);
if (terms[termOrd] instanceof LowFreqTerm) {
final int[] postings = ((LowFreqTerm) terms[termOrd]).postings;
- final byte[] payloads = ((LowFreqTerm) terms[termOrd]).payloads;
if (hasFreq) {
if (hasPos) {
int posLen;
@@ -1485,7 +1488,7 @@ public final class DirectPostingsFormat
if (hasPayloads) {
posLen++;
}
- return new LowFreqDocsEnum(liveDocs, hasOffsets, hasPayloads).reset(postings, payloads);
+ return new LowFreqDocsEnum(liveDocs, posLen).reset(postings);
} else {
return new LowFreqDocsEnumNoPos(liveDocs).reset(postings);
}
@@ -1512,7 +1515,7 @@ public final class DirectPostingsFormat
final LowFreqTerm term = ((LowFreqTerm) terms[termOrd]);
final int[] postings = term.postings;
final byte[] payloads = term.payloads;
- return new LowFreqDocsEnum(liveDocs, hasOffsets, hasPayloads).reset(postings, payloads);
+ return new LowFreqDocsAndPositionsEnum(liveDocs, hasOffsets, hasPayloads).reset(postings, payloads);
} else {
final HighFreqTerm term = (HighFreqTerm) terms[termOrd];
return new HighFreqDocsAndPositionsEnum(liveDocs, hasOffsets).reset(term.docIDs, term.freqs, term.positions, term.payloads);
@@ -1589,32 +1592,32 @@ public final class DirectPostingsFormat
@Override
public int nextPosition() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int startPosition() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int endPosition() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int startOffset() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int endOffset() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public BytesRef getPayload() throws IOException {
- return null;
+ throw new UnsupportedOperationException();
}
@Override
@@ -1623,7 +1626,7 @@ public final class DirectPostingsFormat
// be costly:
return slowAdvance(target);
}
-
+
@Override
public long cost() {
return postings.length;
@@ -1687,32 +1690,32 @@ public final class DirectPostingsFormat
@Override
public int nextPosition() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int startPosition() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int endPosition() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int startOffset() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int endOffset() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public BytesRef getPayload() throws IOException {
- return null;
+ throw new UnsupportedOperationException();
}
@Override
@@ -1721,17 +1724,132 @@ public final class DirectPostingsFormat
// be costly:
return slowAdvance(target);
}
-
+
@Override
public long cost() {
return postings.length / 2;
}
}
+ // Docs + freqs + positions/offets:
private final static class LowFreqDocsEnum extends DocsEnum {
private int[] postings;
private final Bits liveDocs;
private final int posMult;
+ private int upto;
+ private int freq;
+
+ public LowFreqDocsEnum(Bits liveDocs, int posMult) {
+ this.liveDocs = liveDocs;
+ this.posMult = posMult;
+ // if (DEBUG) {
+ // System.out.println("LowFreqDE: posMult=" + posMult);
+ // }
+ }
+
+ public boolean canReuse(Bits liveDocs, int posMult) {
+ return liveDocs == this.liveDocs && posMult == this.posMult;
+ }
+
+ public DocsEnum reset(int[] postings) {
+ this.postings = postings;
+ upto = -2;
+ freq = 0;
+ return this;
+ }
+
+ // TODO: can do this w/o setting members?
+ @Override
+ public int nextDoc() {
+ upto += 2 + freq*posMult;
+ // if (DEBUG) {
+ // System.out.println(" nextDoc freq=" + freq + " upto=" + upto + " vs " + postings.length);
+ // }
+ if (liveDocs == null) {
+ if (upto < postings.length) {
+ freq = postings[upto+1];
+ assert freq > 0;
+ return postings[upto];
+ }
+ } else {
+ while (upto < postings.length) {
+ freq = postings[upto+1];
+ assert freq > 0;
+ if (liveDocs.get(postings[upto])) {
+ return postings[upto];
+ }
+ upto += 2 + freq*posMult;
+ }
+ }
+ return NO_MORE_DOCS;
+ }
+
+ @Override
+ public int docID() {
+ // TODO: store docID member?
+ if (upto < 0) {
+ return -1;
+ } else if (upto < postings.length) {
+ return postings[upto];
+ } else {
+ return NO_MORE_DOCS;
+ }
+ }
+
+ @Override
+ public int freq() {
+ // TODO: can I do postings[upto+1]?
+ return freq;
+ }
+
+ @Override
+ public int nextPosition() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int startPosition() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int endPosition() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int startOffset() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int endOffset() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public BytesRef getPayload() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int advance(int target) throws IOException {
+ // Linear scan, but this is low-freq term so it won't
+ // be costly:
+ return slowAdvance(target);
+ }
+
+ @Override
+ public long cost() {
+ // TODO: could do a better estimate
+ return postings.length / 2;
+ }
+ }
+
+ private final static class LowFreqDocsAndPositionsEnum extends DocsEnum {
+ private int[] postings;
+ private final Bits liveDocs;
+ private final int posMult;
private final boolean hasOffsets;
private final boolean hasPayloads;
private final BytesRef payload = new BytesRef();
@@ -1747,7 +1865,7 @@ public final class DirectPostingsFormat
private int payloadLength;
private byte[] payloadBytes;
- public LowFreqDocsEnum(Bits liveDocs, boolean hasOffsets, boolean hasPayloads) {
+ public LowFreqDocsAndPositionsEnum(Bits liveDocs, boolean hasOffsets, boolean hasPayloads) {
this.liveDocs = liveDocs;
this.hasOffsets = hasOffsets;
this.hasPayloads = hasPayloads;
@@ -1764,10 +1882,6 @@ public final class DirectPostingsFormat
}
}
- public boolean canReuse(Bits liveDocs, int posMult) {
- return liveDocs == this.liveDocs && posMult == this.posMult;
- }
-
public DocsEnum reset(int[] postings, byte[] payloadBytes) {
this.postings = postings;
upto = 0;
@@ -1782,6 +1896,7 @@ public final class DirectPostingsFormat
@Override
public int nextDoc() {
+ pos = -1;
if (hasPayloads) {
for(int i=0;i<skipPositions;i++) {
upto++;
@@ -1822,7 +1937,7 @@ public final class DirectPostingsFormat
}
}
}
- pos = -1;
+
return docID = NO_MORE_DOCS;
}
@@ -1838,9 +1953,7 @@ public final class DirectPostingsFormat
@Override
public int nextPosition() {
- //assert skipPositions > 0;
- if (skipPositions == 0)
- return NO_MORE_POSITIONS;
+ assert skipPositions > 0;
skipPositions--;
pos = postings[upto++];
if (hasOffsets) {
@@ -1891,7 +2004,7 @@ public final class DirectPostingsFormat
return null;
}
}
-
+
@Override
public long cost() {
// TODO: could do a better estimate
@@ -1965,32 +2078,32 @@ public final class DirectPostingsFormat
@Override
public int nextPosition() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int startPosition() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int endPosition() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int startOffset() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public int endOffset() throws IOException {
- return -1;
+ throw new UnsupportedOperationException();
}
@Override
public BytesRef getPayload() throws IOException {
- return null;
+ throw new UnsupportedOperationException();
}
@Override
@@ -2100,7 +2213,7 @@ public final class DirectPostingsFormat
return docID = docIDs[upto];
}
}
-
+
@Override
public long cost() {
return docIDs.length;
@@ -2157,7 +2270,7 @@ public final class DirectPostingsFormat
upto++;
if (liveDocs == null) {
if (upto < docIDs.length) {
- posUpto = -posJump;
+ posUpto = -posJump;
curPositions = positions[upto];
return docID = docIDs[upto];
}
@@ -2187,8 +2300,6 @@ public final class DirectPostingsFormat
@Override
public int nextPosition() {
- if (posUpto >= curPositions.length)
- return NO_MORE_POSITIONS;
posUpto += posJump;
return curPositions[posUpto];
}
@@ -2200,7 +2311,7 @@ public final class DirectPostingsFormat
@Override
public int endPosition() throws IOException {
- return curPositions[posUpto];
+ return startPosition();
}
@Override
@@ -2350,7 +2461,7 @@ public final class DirectPostingsFormat
return payload;
}
}
-
+
@Override
public long cost() {
return docIDs.length;
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java Mon Dec 1 17:02:49 2014
@@ -19,7 +19,6 @@ package org.apache.lucene.codecs.memory;
import java.io.IOException;
import java.util.Arrays;
-import java.util.Collections;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexOptions;
@@ -79,11 +78,6 @@ class FSTTermOutputs extends Outputs<FST
}
return ramBytesUsed;
}
-
- @Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
// NOTE: actually, FST nodes are seldom
// identical when outputs on their arcs
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java Mon Dec 1 17:02:49 2014
@@ -511,11 +511,6 @@ class SimpleTextDocValuesReader extends
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
-
- @Override
public String toString() {
return getClass().getSimpleName() + "(fields=" + fields.size() + ")";
}
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java Mon Dec 1 17:02:49 2014
@@ -19,7 +19,6 @@ package org.apache.lucene.codecs.simplet
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
import org.apache.lucene.codecs.StoredFieldsReader;
import org.apache.lucene.index.FieldInfo;
@@ -33,7 +32,6 @@ import org.apache.lucene.store.ChecksumI
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
@@ -42,7 +40,6 @@ import org.apache.lucene.util.CharsRefBu
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.StringHelper;
-import org.apache.lucene.util.UnicodeUtil;
import static org.apache.lucene.codecs.simpletext.SimpleTextStoredFieldsWriter.*;
@@ -215,11 +212,6 @@ public class SimpleTextStoredFieldsReade
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
-
- @Override
public String toString() {
return getClass().getSimpleName();
}
Modified: lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Mon Dec 1 17:02:49 2014
@@ -37,7 +37,6 @@ import org.apache.lucene.store.ChecksumI
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
@@ -532,11 +531,6 @@ public class SimpleTextTermVectorsReader
public long ramBytesUsed() {
return BASE_RAM_BYTES_USED + RamUsageEstimator.sizeOf(offsets);
}
-
- @Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
@Override
public String toString() {
Modified: lucene/dev/branches/lucene2878/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/common-build.xml?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene2878/lucene/common-build.xml Mon Dec 1 17:02:49 2014
@@ -162,13 +162,13 @@
<property name="javac.deprecation" value="off"/>
<property name="javac.debug" value="on"/>
- <property name="javac.source" value="1.7"/>
- <property name="javac.target" value="1.7"/>
+ <property name="javac.source" value="1.8"/>
+ <property name="javac.target" value="1.8"/>
<property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial -Xlint:-options"/>
- <property name="javadoc.link" value="http://download.oracle.com/javase/7/docs/api/"/>
+ <property name="javadoc.link" value="http://download.oracle.com/javase/8/docs/api/"/>
<property name="javadoc.link.junit" value="http://junit.sourceforge.net/javadoc/"/>
<property name="javadoc.packagelist.dir" location="${common.dir}/tools/javadoc"/>
- <available file="${javadoc.packagelist.dir}/java7/package-list" property="javadoc.java7.packagelist.exists"/>
+ <available file="${javadoc.packagelist.dir}/java8/package-list" property="javadoc.java8.packagelist.exists"/>
<property name="javadoc.access" value="protected"/>
<property name="javadoc.charset" value="utf-8"/>
<property name="javadoc.dir" location="${common.dir}/build/docs"/>
@@ -287,7 +287,7 @@
</propertyset>
<patternset id="lucene.local.src.package.patterns"
- excludes="**/pom.xml,**/*.iml,**/*.jar,build/**,dist/**,benchmark/work/**,benchmark/temp/**,tools/javadoc/java7/**,tools/clover/**"
+ excludes="**/pom.xml,**/*.iml,**/*.jar,build/**,dist/**,benchmark/work/**,benchmark/temp/**,tools/javadoc/java8/**,tools/clover/**"
/>
<!-- Default exclude sources and javadoc jars from Ivy fetch to save time and bandwidth -->
@@ -304,9 +304,9 @@
</condition>
</fail>
- <fail message="Minimum supported Java version is 1.7.">
+ <fail message="Minimum supported Java version is 1.8.">
<condition>
- <not><hasmethod classname="java.lang.Throwable" method="getSuppressed"/></not>
+ <not><hasmethod classname="java.util.Arrays" method="parallelSort"/></not>
</condition>
</fail>
@@ -332,7 +332,6 @@
-->
<condition property="build.java.runtime" value="${-cleaned.specification.version}" else="unknown">
<or>
- <equals arg1="${-cleaned.specification.version}" arg2="1.7"/>
<equals arg1="${-cleaned.specification.version}" arg2="1.8"/>
<equals arg1="${-cleaned.specification.version}" arg2="1.9"/>
</or>
@@ -350,10 +349,7 @@
<contains string="${java.vm.name}" substring="openjdk" casesensitive="false"/>
<contains string="${java.vm.name}" substring="jrockit" casesensitive="false"/>
</or>
- <or>
- <equals arg1="${build.java.runtime}" arg2="1.7"/>
- <equals arg1="${build.java.runtime}" arg2="1.8"/>
- </or>
+ <equals arg1="${build.java.runtime}" arg2="1.8"/>
<!-- TODO: Fix this! For now only run this on 64bit, because jTIDY OOMs with default heap size: -->
<contains string="${os.arch}" substring="64"/>
</and>
@@ -361,15 +357,10 @@
<!-- workaround for https://issues.apache.org/bugzilla/show_bug.cgi?id=53347 -->
<condition property="build.compiler" value="javac1.7">
- <and>
- <not>
- <equals arg1="${build.java.runtime}" arg2="1.7"/>
- </not>
- <or>
- <antversion exactly="1.8.3" />
- <antversion exactly="1.8.4" />
- </or>
- </and>
+ <or>
+ <antversion exactly="1.8.3" />
+ <antversion exactly="1.8.4" />
+ </or>
</condition>
<target name="-documentation-lint-unsupported" unless="documentation-lint.supported">
@@ -381,12 +372,8 @@
<echo level="warning" message="WARN: Linting documentation HTML is not supported on this Java version (${build.java.runtime}) / JVM (${java.vm.name}). NOTHING DONE!"/>
</target>
- <!-- for now disable doclint on JDK 8+: -->
- <condition property="javadoc.args" value="-Xdoclint:none" else="">
- <not>
- <equals arg1="${build.java.runtime}" arg2="1.7"/>
- </not>
- </condition>
+ <!-- for now disable doclint: -->
+ <property name="javadoc.args" value="-Xdoclint:none"/>
<!-- Import custom ANT tasks. -->
<import file="${common.dir}/tools/custom-tasks.xml" />
@@ -411,10 +398,14 @@
<!-- <property name="ivy.settings.uptodate" value="true"/> -->
</target>
+ <condition property="ivy.symlink">
+ <os family="unix"/>
+ </condition>
+
<target name="resolve" depends="ivy-availability-check,ivy-configure">
<!-- todo, make this a property or something.
only special cases need bundles -->
- <ivy:retrieve type="jar,bundle,test,test-jar,tests" log="download-only"
+ <ivy:retrieve type="jar,bundle,test,test-jar,tests" log="download-only" symlink="${ivy.symlink}"
conf="${ivy.default.configuration}" sync="${ivy.sync}"/>
</target>
@@ -919,7 +910,7 @@
<value><!-- empty/ default encoding. --></value>
<!--
- Disabled because of Java 1.7 bug on Linux/ Unix:
+ Disabled because of Java 1.8 bug on Linux/ Unix:
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7181721
<value>UTF-16</value>
@@ -1875,10 +1866,7 @@ ${ant.project.name}.test.dependencies=${
<!-- ECJ Javadoc linting: -->
<condition property="ecj-javadoc-lint.supported">
- <or>
- <equals arg1="${build.java.runtime}" arg2="1.7"/>
- <equals arg1="${build.java.runtime}" arg2="1.8"/>
- </or>
+ <equals arg1="${build.java.runtime}" arg2="1.8"/>
</condition>
<condition property="ecj-javadoc-lint-tests.supported">
@@ -1974,7 +1962,7 @@ ${ant.project.name}.test.dependencies=${
<attribute name="overview" default="${src.dir}/overview.html"/>
<attribute name="linksource" default="no"/>
<sequential>
- <antcall target="download-java7-javadoc-packagelist"/>
+ <antcall target="download-java8-javadoc-packagelist"/>
<delete file="@{destdir}/stylesheet.css" failonerror="false"/>
<copy todir="@{destdir}" file="${prettify.dir}/prettify.js" overwrite="false" />
<record name="@{destdir}/log_javadoc.txt" action="start" append="no"/>
@@ -2004,7 +1992,7 @@ ${ant.project.name}.test.dependencies=${
<tag name="lucene.internal"
description="NOTE: This API is for internal purposes only and might change in incompatible ways in the next release."/>
<link offline="true" packagelistLoc="${javadoc.dir}"/>
- <link offline="true" href="${javadoc.link}" packagelistLoc="${javadoc.packagelist.dir}/java7"/>
+ <link offline="true" href="${javadoc.link}" packagelistLoc="${javadoc.packagelist.dir}/java8"/>
<bottom><![CDATA[
<i>Copyright © ${year} Apache Software Foundation. All Rights Reserved.</i>
<script src='{@docRoot}/prettify.js' type='text/javascript'></script>
@@ -2058,72 +2046,9 @@ ${ant.project.name}.test.dependencies=${
</and>
</condition>
</fail>
-
- <patch-javadoc dir="@{destdir}" docencoding="${javadoc.charset}"/>
</sequential>
</macrodef>
- <!--
- Patch frame injection bugs in javadoc generated files - see CVE-2013-1571, http://www.kb.cert.org/vuls/id/225657
-
- Feel free to use this macro in your own Ant build file. This macro works together with the javadoc task on Ant
- and should be invoked directly after its execution to patch broken javadocs, e.g.:
- <patch-javadoc dir="..." docencoding="UTF-8"/>
- Please make sure that the docencoding parameter uses the same charset like javadoc's docencoding. Default
- is the platform default encoding (like the javadoc task).
- The specified dir is the destination directory of the javadoc task.
- -->
- <macrodef name="patch-javadoc">
- <attribute name="dir"/>
- <attribute name="docencoding" default="${file.encoding}"/>
- <sequential>
- <replace encoding="@{docencoding}" summary="true" taskname="patch-javadoc">
- <fileset dir="@{dir}" casesensitive="false" includes="**/index.html,**/index.htm,**/toc.html,**/toc.htm">
- <!-- TODO: add encoding="@{docencoding}" to contains check, when we are on ANT 1.9.0: -->
- <not><contains text="function validURL(url) {" casesensitive="true" /></not>
- </fileset>
- <replacetoken><![CDATA[function loadFrames() {]]></replacetoken>
- <replacevalue expandProperties="false"><![CDATA[if (targetPage != "" && !validURL(targetPage))
- targetPage = "undefined";
- function validURL(url) {
- var pos = url.indexOf(".html");
- if (pos == -1 || pos != url.length - 5)
- return false;
- var allowNumber = false;
- var allowSep = false;
- var seenDot = false;
- for (var i = 0; i < url.length - 5; i++) {
- var ch = url.charAt(i);
- if ('a' <= ch && ch <= 'z' ||
- 'A' <= ch && ch <= 'Z' ||
- ch == '$' ||
- ch == '_') {
- allowNumber = true;
- allowSep = true;
- } else if ('0' <= ch && ch <= '9'
- || ch == '-') {
- if (!allowNumber)
- return false;
- } else if (ch == '/' || ch == '.') {
- if (!allowSep)
- return false;
- allowNumber = false;
- allowSep = false;
- if (ch == '.')
- seenDot = true;
- if (ch == '/' && seenDot)
- return false;
- } else {
- return false;
- }
- }
- return true;
- }
- function loadFrames() {]]></replacevalue>
- </replace>
- </sequential>
- </macrodef>
-
<target name="check-javadocs-uptodate">
<uptodate property="javadocs-uptodate-${name}" targetfile="${build.dir}/${final.name}-javadoc.jar">
<srcfiles dir="${src.dir}">
@@ -2144,10 +2069,10 @@ ${ant.project.name}.test.dependencies=${
</sequential>
</macrodef>
- <target name="download-java7-javadoc-packagelist" unless="javadoc.java7.packagelist.exists">
- <mkdir dir="${javadoc.packagelist.dir}/java7"/>
+ <target name="download-java8-javadoc-packagelist" unless="javadoc.java8.packagelist.exists">
+ <mkdir dir="${javadoc.packagelist.dir}/java8"/>
<get src="${javadoc.link}/package-list"
- dest="${javadoc.packagelist.dir}/java7/package-list" ignoreerrors="true"/>
+ dest="${javadoc.packagelist.dir}/java8/package-list" ignoreerrors="true"/>
</target>
<!-- VALIDATION work -->
@@ -2339,7 +2264,7 @@ ${ant.project.name}.test.dependencies=${
<property name="forbidden-sysout-excludes" value=""/>
<target name="-install-forbidden-apis" unless="forbidden-apis.loaded" depends="ivy-availability-check,ivy-configure">
- <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="1.6.1"
+ <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="1.7"
inline="true" conf="default" transitive="true" pathid="forbidden-apis.classpath"/>
<taskdef name="forbidden-apis" classname="de.thetaphi.forbiddenapis.AntTask" classpathref="forbidden-apis.classpath"/>
<property name="forbidden-apis.loaded" value="true"/>
Modified: lucene/dev/branches/lucene2878/lucene/expressions/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/expressions/build.xml?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/expressions/build.xml (original)
+++ lucene/dev/branches/lucene2878/lucene/expressions/build.xml Mon Dec 1 17:02:49 2014
@@ -98,10 +98,6 @@
<property name="-grammar.relative.path" location="${grammar.path}" relative="true"/>
<replace-value property="grammar.relative.path" value="${-grammar.relative.path}${file.separator}" from="${file.separator}" to="/"/>
<java classname="org.antlr.Tool" fork="true" failonerror="true" classpathref="antlr.classpath" taskname="antlr">
- <!-- this is a hack because antlr generates code comments in nondeterministic order
- (using HashMap somewhere it should use LinkedHashMap). This hack only works for Java 7,
- Java 8 always uses murmurhash for strings and uses time-of-day as seed. -->
- <sysproperty key="jdk.map.althashing.threshold" value="-1"/>
<sysproperty key="file.encoding" value="UTF-8"/>
<sysproperty key="user.language" value="en"/>
<sysproperty key="user.country" value="US"/>
Modified: lucene/dev/branches/lucene2878/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java (original)
+++ lucene/dev/branches/lucene2878/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java Mon Dec 1 17:02:49 2014
@@ -21,12 +21,9 @@ import java.util.Arrays;
import java.util.Collections;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.DoubleField;
+import org.apache.lucene.document.DoubleDocValuesField;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FloatDocValuesField;
-import org.apache.lucene.document.FloatField;
-import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.LongField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.expressions.js.JavascriptCompiler;
import org.apache.lucene.index.IndexReader;
@@ -68,16 +65,10 @@ public class TestExpressionSorts extends
Document document = new Document();
document.add(newTextField("english", English.intToEnglish(i), Field.Store.NO));
document.add(newTextField("oddeven", (i % 2 == 0) ? "even" : "odd", Field.Store.NO));
- document.add(newStringField("byte", "" + ((byte) random().nextInt()), Field.Store.NO));
- document.add(newStringField("short", "" + ((short) random().nextInt()), Field.Store.NO));
- document.add(new IntField("int", random().nextInt(), Field.Store.NO));
- document.add(new LongField("long", random().nextLong(), Field.Store.NO));
-
- document.add(new FloatField("float", random().nextFloat(), Field.Store.NO));
- document.add(new DoubleField("double", random().nextDouble(), Field.Store.NO));
-
- document.add(new NumericDocValuesField("intdocvalues", random().nextInt()));
- document.add(new FloatDocValuesField("floatdocvalues", random().nextFloat()));
+ document.add(new NumericDocValuesField("int", random().nextInt()));
+ document.add(new NumericDocValuesField("long", random().nextLong()));
+ document.add(new FloatDocValuesField("float", random().nextFloat()));
+ document.add(new DoubleDocValuesField("double", random().nextDouble()));
iw.addDocument(document);
}
reader = iw.getReader();
@@ -119,8 +110,6 @@ public class TestExpressionSorts extends
new SortField("long", SortField.Type.LONG, reversed),
new SortField("float", SortField.Type.FLOAT, reversed),
new SortField("double", SortField.Type.DOUBLE, reversed),
- new SortField("intdocvalues", SortField.Type.INT, reversed),
- new SortField("floatdocvalues", SortField.Type.FLOAT, reversed),
new SortField("score", SortField.Type.SCORE)
};
Collections.shuffle(Arrays.asList(fields), random());
Modified: lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java?rev=1642713&r1=1642712&r2=1642713&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java Mon Dec 1 17:02:49 2014
@@ -148,11 +148,6 @@ public class CachedOrdinalsReader extend
}
return mem;
}
-
- @Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
}
@Override