Commit Graph

10806 Commits

Author SHA1 Message Date
Michael McCandless 9c2a21ce29 LUCENE-3197: must also count the segment being produced by an in-flight merge as original (as of when optimize starts) to ensure all deletions against that segment are also merged away
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137330 13f79535-47bb-0310-9956-ffa450edef68
2011-06-19 10:15:32 +00:00
Steven Rowe a9b8ed0002 SOLR-2452: Merged with trunk up to r1137265
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1137267 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 23:30:13 +00:00
Michael McCandless 2e48814dff LUCENE-3197: don't over-merge if deletes are still arriving while optimize runs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137211 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 16:06:44 +00:00
Michael McCandless 351562bfab fix javadoc warnings
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137210 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 15:58:07 +00:00
Michael McCandless 89307c3795 LUCENE-3209: add MemoryCodec
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137208 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 15:45:58 +00:00
Uwe Schindler b6d0c850aa LUCENE-3213: Move CustomScoreProvider over to AtomicReaderContext
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137176 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 11:59:24 +00:00
Uwe Schindler 40f5948b3d LUCENE-2919: Make it use a filter, correct & improve tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137162 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 10:47:13 +00:00
Steven Rowe 4c9c9259e8 SOLR-2452: Merged with trunk up to r1137125
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1137126 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 05:16:57 +00:00
Steven Rowe 2c3b410cd5 SOLR-2564: Maven build: add grouping module dependency to Solr
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137124 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 05:02:06 +00:00
Steven Rowe 21a4f21b02 LUCENE-3211: Maven build: tests.luceneMatchVersion default -> LUCENE_CURRENT
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137116 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 02:35:51 +00:00
Erick Erickson 4f711ca57a Solr-2598 (Commenting out the <arr name="queries"> section in firstSearcher generates an NPE)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137092 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 00:10:21 +00:00
Martijn van Groningen 5083ab7e5d Make Solr module depend on grouping module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137073 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 23:20:12 +00:00
Michael McCandless bba6b01826 LUCENE-2919: add PKIndexSplitter, to split index into two by term
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137064 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 22:52:55 +00:00
Michael McCandless f32a6aa455 LUCENE-3210: let app control how aggressive TMP is in targetting segments with deletions; default it to more aggressive than today
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137060 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 22:39:38 +00:00
Michael McCandless 74aac32eb3 LUCENE-3179: add OpenBitSet.prevSetBit
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137054 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 22:24:38 +00:00
Martijn van Groningen d805da14c2 SOLR-2564: Integrating grouping module into Solr 4.0
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1137037 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 21:25:59 +00:00
Steven Rowe 4c6cc4ac18 Remove unused property
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136995 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 19:25:25 +00:00
Simon Willnauer a684a076c7 removed unused import
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136887 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 14:15:42 +00:00
Uwe Schindler 4e46774b9b Make sure, Jenkins/Hudson can compile Solr Contrib classes+tests with Java 5, without running tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136792 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 07:28:37 +00:00
Shalin Shekhar Mangar 1e3aa5cee4 SOLR-2551 -- Use File.delete instead of File.setWritable to be Java 5 compatible
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136789 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 07:05:29 +00:00
Steven Rowe 6264baa060 SOLR-2452: merged with trunk up to r1136777
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1136783 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 06:10:05 +00:00
Uwe Schindler 3117c87d12 add changes entry for the scary Similarity setter bug in IndexSearcher
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136715 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 22:33:39 +00:00
Uwe Schindler d335698e89 LUCENE-3208: add backwards break entry
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136644 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 20:12:24 +00:00
Uwe Schindler 1ca3506f6d LUCENE-3208: Missed change in grouping module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136605 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 19:03:35 +00:00
Uwe Schindler edac2e90d2 LUCENE-3208: Renamed protected IndexSearcher.createWeight() to expert public method IndexSearcher.createNormalizedWeight() as this better describes what this method does. The old method is still there for backwards compatibility. Query.weight() was deprecated and simply delegates to IndexSearcher
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136568 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 17:55:04 +00:00
Yonik Seeley 4c5c3c86e2 weight value sources for pseudo-fields
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136526 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 16:20:43 +00:00
Michael McCandless fe7593efee LUCENE-3191: simplify API; return TopFieldDocs from TopDocs.merge if sort != null; add some missing compareValue to FC impls
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136467 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 14:52:56 +00:00
Simon Willnauer 240822d45a use constants to build file names in TermInfosWriter
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136454 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 14:29:43 +00:00
Simon Willnauer f01acfa744 use constants to build file names in PreFlexFields
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136450 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 14:18:16 +00:00
Michael McCandless 38b838b25a fix silly test bugs (thanks selckin!)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136357 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 10:15:20 +00:00
Simon Willnauer aa6966782f LUCENE-3190: prevent assert from false fail with very low maxBufferedRam settings
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136086 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 15:38:38 +00:00
Michael McCandless a1e74fd6c9 LUCENE-3191: add TopDocs.merge, TopGroups.merge, SearchGroup.merge, to make sharding easier
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136080 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 15:12:48 +00:00
Koji Sekiguchi 3d8fc3de5d fix luceneMatchVersion in uima test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1136027 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 13:20:09 +00:00
Shalin Shekhar Mangar 6aaaf9ca94 SOLR-2551 -- Check dataimport.properties for write access (if delta-import is supported in DIH configuration) before starting an import
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135954 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 08:24:04 +00:00
Steven Rowe f4bfaca2ec LUCENE-3204: Added attribution to CHANGES.txt entries
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135825 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 22:03:08 +00:00
Steven Rowe b95cdf3e69 LUCENE-3204: Removed redundant path for maven-ant-tasks
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135822 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 21:57:32 +00:00
Steven Rowe 1cd8fc8225 LUCENE-3204: Added NOTICE file for maven-ant-tasks jar
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135818 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 21:47:30 +00:00
Steven Rowe 72d043e3ec LUCENE-3204: Include maven-ant-tasks jar in the source tree and use this jar from generate-maven-artifacts
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135801 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 21:23:31 +00:00
Michael McCandless 6e2a28b6f6 add comment to clarify confusing test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135764 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 19:43:04 +00:00
Steven Rowe 31ae73d63b Merged with trunk up to r1135758
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1135759 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 19:26:27 +00:00
Steven Rowe d0e0dc3f6e Added *.docx as a resource pattern (Solr Cell has a .docx test file)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135757 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 19:23:57 +00:00
Steven Rowe 0fc86fd59e Added lucene/src/tools/java/ as a source directory
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135756 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 19:22:54 +00:00
Michael McCandless 44372abfcd LUCENE-2955: speed up new test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135670 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 16:09:19 +00:00
Michael McCandless 60eb65bbcc LUCENE-2955: add NRTManager/ReopenThread for simple control over NRT reopening and controlled visiblity of specific indexing changes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135658 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 15:54:35 +00:00
Michael McCandless 8170f59839 LUCENE-3198: use MMapDir by default (in FSDir.open) on Linux, 64 bit JRE
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135650 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 15:38:58 +00:00
Uwe Schindler 0ae7396314 LUCENE-3200: MMapDirectory now uses chunk sizes that are powers of 2. When setting the chunk size, it is rounded down to the next possible value. The new default value for 64 bit platforms is 2^30 (1 GiB), for 32 bit platforms it stays unchanged at 2^28 (256 MiB). Internally, MMapDirectory now only uses one dedicated final IndexInput implementation supporting multiple chunks, which makes Hotspot's life easier
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135537 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 12:50:22 +00:00
Michael McCandless 5b5936d60d add Override comment
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135527 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 12:28:45 +00:00
Michael McCandless 562f10c4e8 can't override interface until Java 1.6
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135525 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 12:25:44 +00:00
Robert Muir 69790c3c0c add assert
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135509 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 12:07:34 +00:00
Dawid Weiss 7614bedc9d LUCENE-3202: Add DataInput/DataOutput subclasses that delegate to an InputStream/OutputStream.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1135506 13f79535-47bb-0310-9956-ffa450edef68
2011-06-14 12:03:56 +00:00