Commit Graph

11819 Commits

Author SHA1 Message Date
Uwe Schindler 1b0c37ea9c LUCENE-3644: Use one instance of the listener class also for composite/SlowMultiReader (to prevent filling the CHS of IR). Also don't use FieldCache.DEFAULT from inside FieldCacheImpl, as it makes extension hard. We have "wrapper" reference for that.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214376 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 17:41:18 +00:00
Uwe Schindler b93f0902ce LUCENE-3531: Revert adding Reader/CoreClosedListeners in CachingWrapperFilter
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214349 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 17:16:53 +00:00
Uwe Schindler a2d8c13021 LUCENE-3531: Fix cache lookup with a new WeakIdentityHashMap, also add ReaderClosedListeners.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214274 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 14:52:39 +00:00
Robert Muir d7c7117eda LUCENE-3647: for segments with no docvalues, when promoting to a fixed type we need to use an EmptyFixedSource
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214219 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 12:51:32 +00:00
Robert Muir 4b38791903 check that docvalues type/size are equal
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214160 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 11:17:22 +00:00
Robert Muir 3550d35822 increase test coverage
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214012 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 01:08:06 +00:00
Robert Muir 1a4c0ff254 LUCENE-3644: fix problems with IR's readerFinishedListener
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213910 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 20:20:43 +00:00
Robert Muir 0b734cfe20 LUCENE-3622: fix javadocs warning
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213878 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 19:19:01 +00:00
Robert Muir 8d7749ea4f LUCENE-3622: separate IndexDocValues interface from implementation (phase 1)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213844 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 18:39:06 +00:00
Grant Ingersoll 9bc28fe55d SOLR-1520: changes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213826 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 18:24:26 +00:00
Robert Muir eb173852ba LUCENE-3622: merge trunk (1213324:1213812)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3622@1213825 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 18:23:22 +00:00
Grant Ingersoll 7efb166240 SOLR-1520: added tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213824 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 18:22:39 +00:00
Michael McCandless 0f8fe10c7d LUCENE-3531: add boolean (default false) to CachingWrapperFilter to control whether it should recache on new deletes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213811 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 18:01:49 +00:00
Michael McCandless 6d70639902 LUCENE-3586: fixup javadocs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213803 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 17:36:14 +00:00
Michael McCandless d6a96a43d9 LUCENE-3586: allow specifying -dir-impl FSDirectory subclass to CheckIndex, IndexUpgrader
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213800 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 17:34:58 +00:00
Uwe Schindler 0d86474d3c LUCENE-3643: FilteredQuery and IndexSearcher.search(Query, Filter,...) now optimize the special case "query instanceof MatchAllDocsQuery" to execute as ConstantScoreQuery
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213771 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 16:32:24 +00:00
Grant Ingersoll d66ae61193 SOLR-1730: fix logging in exception
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213706 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 14:21:41 +00:00
Grant Ingersoll 7c0069cbb7 SOLR-1730: check the cause exception
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213704 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 14:21:30 +00:00
Chris M. Hostetter 4da73b1f9e SOLR-2920: Refactor frequent conditional use of DefaultSolrParams and AppendedSolrParams into factory methods
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213474 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 22:31:51 +00:00
Robert Muir 701000cf27 LUCENE-3622: function DocValues -> FunctionValues
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3622@1213426 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 20:33:26 +00:00
Robert Muir 64facac463 LUCENE-3622: make this a TODO for now
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3622@1213406 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 20:13:33 +00:00
Robert Muir b15b981081 LUCENE-3622: merge trunk (1212830:1213323)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3622@1213405 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 20:13:02 +00:00
Robert Muir 7dc025bdce LUCENE-3642: fix invalid offsets from CharTokenizer, [Edge]NGramFilters, SmartChinese, add sanity check to BaseTokenStreamTestCase
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213329 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 17:28:09 +00:00
Robert Muir 3899e18ca3 LUCENE-3640: Remove IndexSearcher.close
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213117 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 00:21:40 +00:00
Uwe Schindler 3c00042ca0 LUCENE-3641: Fixed MultiReader to correctly propagate readerFinishedListeners to clones/reopened readers
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213106 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 23:32:13 +00:00
Uwe Schindler 50cbfec8ff fix javadocs to no longer mention IR's commit().
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213099 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 23:02:50 +00:00
Michael McCandless 9a8bde3c8b LUCENE-3598: always call InfoStream.isEnabled before InfoStream.message
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213085 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 21:55:45 +00:00
Robert Muir 118005d308 add closeable to SearcherManager
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213044 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 19:23:45 +00:00
Shai Erera 9e193b62bc LUCENE-3637: change IndexReader.decRef to call decrementAndGet
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213033 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 17:52:52 +00:00
Robert Muir 503097ac71 LUCENE-3636: make it possible to use SearcherManager with distributed stats
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213020 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 17:07:47 +00:00
Uwe Schindler 377332e696 LUCENE-3633: Improve DirectoryReader and MultiReader to use IOUtils when IOExceptions occur during opening segments; minor tweaks in BaseMultiReader
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213016 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 15:43:34 +00:00
Uwe Schindler bf13918e16 fix generics violation
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213013 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 15:30:23 +00:00
Uwe Schindler 77ee519468 LUCENE-3633: Remove more code duplication -> readerIndex is already available in ReaderUtil. Also fix bug in docId checking. Moved the check to implementation, so its also done if DocFieldVisitor is used.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1213006 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 14:44:32 +00:00
Uwe Schindler 1757f192ac Remove invalid use of Exception for something it was not intended to
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212994 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 11:25:06 +00:00
Uwe Schindler f4128bd21a Nuke useless too specialized Exception
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212990 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 11:08:57 +00:00
Uwe Schindler 757c98346d More dead code
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212946 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 00:43:58 +00:00
Uwe Schindler 1d478ab5e3 nuke dead code
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212945 13f79535-47bb-0310-9956-ffa450edef68
2011-12-11 00:39:19 +00:00
Uwe Schindler 73f5aad250 Merge changes in contrib/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212909 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 22:39:51 +00:00
Uwe Schindler ad7cb17bc9 LUCENE-3626: Make PKIndexSplitter and MultiPassIndexSplitter work per segment
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212894 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 22:07:32 +00:00
Robert Muir 9460775d26 LUCENE-3622: add some sanity checks for docvalues
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3622@1212888 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 21:44:34 +00:00
Robert Muir 0afa9de4e9 LUCENE-3622: move SortedBytesMergeUtils to index package (to eventually hook into MultiDocValues)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3622@1212854 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 19:38:04 +00:00
Uwe Schindler 764059147f LUCENE-3633: Remove code duplication in MultiReader and DirectoryReader; make everything finally final :-)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212844 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 19:00:13 +00:00
Robert Muir 124728c974 LUCENE-3622: PerFieldDocValues -> DocValue
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3622@1212833 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 18:17:34 +00:00
Uwe Schindler 00e5695f20 Fix hidden bug in ReaderContextBuilder, as we never checked the context of a MultiReader
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212831 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 18:06:57 +00:00
Robert Muir 5627b52e70 LUCENE-3622: merge trunk (1212397:1212829)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3622@1212830 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 18:05:08 +00:00
Robert Muir d0453d820c LUCENE-3606: use MultiDocValues in PR
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3622@1212829 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 17:54:46 +00:00
Robert Muir 75d6217091 LUCENE-3622: PerDocValues -> PerDocProducer (privately used only by SegmentCoreReaders), simplify IR API and MultiDocValues, remove MultiPerDocValues
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3622@1212828 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 17:43:00 +00:00
Robert Muir 39c2ae5268 remove dead code
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212825 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 16:50:54 +00:00
Uwe Schindler 481d3b1cd3 LUCENE-3606: After reviewing clover output, add missing clone tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212790 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 13:28:27 +00:00
Uwe Schindler dd9cc8d4d0 Merged revision(s) 1212754 from lucene/dev/branches/branch_3x:
LUCENE-3630: Fixed naming of the internal method MultiReader.doOpenIfChanged(boolean doClone) that was overriding IndexReader.doOpenIfChanged(boolean readOnly), so changing the contract of the overridden method

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212755 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 09:51:42 +00:00