Commit Graph

2350 Commits

Author SHA1 Message Date
Michael McCandless ed9f0fd5ef LUCENE-3668: if there's only 1 output for a synonym rule then set start/endOffset to match the full span of the input tokens
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1228650 13f79535-47bb-0310-9956-ffa450edef68
2012-01-07 16:26:15 +00:00
Erick Erickson c0959adbfc SOLR-1931, speeding up the LukeRequestHandler
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1227924 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 01:25:12 +00:00
Yonik Seeley 3fbe085a11 LUCENE-3667: re-enable replication test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1227201 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 16:00:27 +00:00
Yonik Seeley 29fc70c15d tests: fix prepareCommit test - optimize to ensure a single segment
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1226198 13f79535-47bb-0310-9956-ffa450edef68
2011-12-31 22:33:47 +00:00
Yonik Seeley 52a47d09ba SOLR-2992: Add support for IndexWriter.prepareCommit()
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1225954 13f79535-47bb-0310-9956-ffa450edef68
2011-12-30 22:41:50 +00:00
Robert Muir f5d1e967db LUCENE-3667: make tests reasonable if you dont have a supercomputer
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1225920 13f79535-47bb-0310-9956-ffa450edef68
2011-12-30 21:14:15 +00:00
Robert Muir b2970db4bc LUCENE-2906: filter to process output of Standard/ICUTokenizer and create overlapping bigrams for CJK
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1225433 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 05:04:49 +00:00
Robert Muir f3869ef3ce SOLR-2982: add Beider-Morse phonetic filter
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1225211 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 16:00:52 +00:00
Grant Ingersoll 6a6d33257e SOLR-2977: add 'fake' excludes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1222234 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 13:59:11 +00:00
Yonik Seeley b323c54f6a SOLR-2950: QEC comparator bug fixes, including deleted docs handling
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1221826 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 18:05:52 +00:00
Grant Ingersoll f42b2ffd63 SOLR-2950: Improve QEC performance by dropping field cache use and keeping a local smaller map
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1220983 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 22:39:01 +00:00
Erick Erickson 1ff2096aef Fixes for SOLR-2971, valType now optional for
ExternalFileFields and, if present, types float, pfloat, tfloat 
all accepable.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1215503 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 14:53:36 +00:00
Grant Ingersoll 39f7791817 SOLR-1520: support trie types, fix issues with failing tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1215352 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 23:51:12 +00:00
Robert Muir a55f511a77 LUCENE-3650: move o.a.l.index.codecs to o.a.l.codecs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1215245 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 19:03:12 +00:00
Chris M. Hostetter b3d2c99128 SOLR-2972: Fix JoinQParser so it doesn't force the 'lucene' parser to be used for the sub query
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1215001 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 00:25:13 +00:00
Chris M. Hostetter 4d75ef3d42 SOLR-1520: revert r1214937 as it breaks several tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214997 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 00:01:38 +00:00
Grant Ingersoll fde5bdc871 SOLR-1520: support trie types
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214937 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 19:55:51 +00:00
Chris M. Hostetter 03762c4be5 SOLR-2956: Fixed inconsistencies in the flags (and flag key) reported by the LukeRequestHandler
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214540 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 23:21:56 +00:00
Steven Rowe 60929a5adb LUCENE-3645: Remove unnecessary array wrapping when calling varargs methods
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214413 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 19:15:47 +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
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
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 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 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
Martijn van Groningen 8a4104be28 SOLR-2955: Fixed IllegalStateException when querying with group.sort=score desc in sharded environment.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1212420 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 13:49:03 +00:00
Uwe Schindler a363e9b564 LUCENE-3606: Merge up to trunk r1212007
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3606@1212008 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 18:01:13 +00:00
Grant Ingersoll 97b40049d0 SOLR-1730: Hook in handling of bad cores, failure of QEC to load, add in test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1211827 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 11:09:47 +00:00
Uwe Schindler 13294b07cc Merge to trunk r1211584
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3606@1211591 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 18:49:18 +00:00
Erick Erickson b89ded1448 Fix for SOLR-2509 (IndexOutOfBoundsException in Spellcheck Component/Collation)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1211456 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 14:42:16 +00:00
Robert Muir af5cd523d4 LUCENE-3606: merge trunk to r1211182
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3606@1211200 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 22:04:55 +00:00
Robert Muir caedbf9ef9 LUCENE-3606: clear up some nocommits
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3606@1211005 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 16:36:41 +00:00
Chris M. Hostetter 3fc07698f3 SOLR-2935: Better docs for numeric FieldTypes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1210714 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 23:49:57 +00:00
Uwe Schindler 559205883f LUCENE-3606: Clean up IR.open(...) methods to no longer accept readOnly and IndexDeletionPolicy: Core, Contrib, Solr (Modules need fixing, benchmark was broken before, too)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3606@1210305 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 01:41:38 +00:00
Michael McCandless 961b820e53 LUCENE-2929: specify up front if you need freqs from DocsEnum
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1210176 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 18:50:58 +00:00
Yonik Seeley ab1b26f162 update noggit to r1209632
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1209714 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 21:53:23 +00:00
Dawid Weiss 92de7e8848 SOLR-2888: FSTSuggester refactoring: internal storage is now UTF-8,
external sorting (on disk) prevents OOMs even with large data sets
(the bottleneck is now FST construction), code cleanups and API cleanups.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1209265 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 21:49:27 +00:00
Uwe Schindler 21989c90c2 Commit LUCENE-3598 to not corrumpt Robert's work on Default*: Improve InfoStream class in trunk to be more consistent with logging-frameworks like slf4j/log4j/commons-logging
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1209059 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 12:52:20 +00:00
Robert Muir 21b7c5bbee LUCENE-3584: make bulk postings codec private
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1208283 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 05:19:35 +00:00
Chris M. Hostetter 2337f4687f LUCENE-3599: Fix DistanceUtils.haversine() javadocs -- were incorrectly stating the expected order of the arguments
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1208118 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 22:38:08 +00:00
Chris M. Hostetter afc71a72a6 SOLR-2861: remove inadvertant & unneeded import statement from SolrCore, and revert r1197205 that enabled maven to compile with this mistake
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1208022 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 18:44:03 +00:00
Simon Willnauer 9a513f82dc LUCENE-3592: Make BytesRef#startsWith & BytesRef#endsWith static
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1207564 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 20:15:17 +00:00
Robert Muir 4dd6b5fbed SOLR-2919: Localized rangequery support for icu/jdk collation filters, parametric tailoring for icu collators
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1207070 13f79535-47bb-0310-9956-ffa450edef68
2011-11-28 11:03:24 +00:00
Erick Erickson c94c1c5a64 git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1206767 13f79535-47bb-0310-9956-ffa450edef68 2011-11-27 17:04:38 +00:00
Erick Erickson 098371446a SOLR-2438, allow an analysis chain to be created for multiterm query terms or synthesize one if not defined explicitly
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1206229 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 15:46:26 +00:00
Robert Muir 7f766cf603 LUCENE-3590: nuke BytesRef.utf8ToChars
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1206174 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 13:55:41 +00:00
Robert Muir 3b6da22aa7 LUCENE-3590: clearly mark bogus deep-copying apis in BytesRef
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1206143 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 12:50:13 +00:00
Shalin Shekhar Mangar 44fc56dc92 SOLR-2912 -- Fixed File descriptor leak in ShowFileRequestHandler
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1205774 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 10:11:06 +00:00
Shalin Shekhar Mangar 20a43ad9dc SOLR-2904 -- BinaryUpdateRequestHandler should be able to accept multiple update requests from a stream
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1204453 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 11:32:53 +00:00
Christopher John Male f55c72f928 SOLR-1123: Changed JSONResponseWriter content-type to be application/json by default
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1204327 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 02:50:39 +00:00
Grant Ingersoll 00f5fef162 SOLR-2037: hook in DocTransformer for QueryElevationComponent to mark documents that have been boosted
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1203839 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 21:07:13 +00:00
Michael McCandless 5267d23d46 LUCENE-3577: rename IW.expungeDeletes -> IW.forceMergeDeletes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1203756 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 17:27:04 +00:00
Michael McCandless 9e27723b37 LUCENE-3562: stop caching thread-private TermsEnums in Terms
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1203294 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 17:35:42 +00:00
Chris M. Hostetter 2a94133a2c SOLR-2578: ReplicationHandler's backup command now supports a 'numberToKeep' param that can be used to delete all but the most recent N backups.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1202969 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 01:33:21 +00:00
Robert Muir 873f199924 LUCENE-2621: move TermVectors,FieldInfos,SegmentInfos to codec
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1202842 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 19:09:35 +00:00
Robert Muir 598920d7bd LUCENE-3571: nuke IndexSearcher(Directory)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1202657 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 12:19:41 +00:00
Chris M. Hostetter 3508d03220 SOLR-2813: Fix HTTP error codes returned when requests contain strings that can not be parsed as numbers for Trie fields
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1202499 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 01:27:26 +00:00
Yonik Seeley 67478264b5 SOLR-2895: call commit tracker after doc is added
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1202428 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 21:26:54 +00:00
Simon Willnauer 25731ea3f7 SOLR-2895: call CommitTracker#addedDocument after document is added
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1202107 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 09:28:46 +00:00
Ryan McKinley 04a9b55618 SOLR-1023: StatsComponent can now support dates (and other non-numeric fields)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1201855 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 19:58:04 +00:00
Erick Erickson 4145656bb5 Adding date tests to SOLR-2134
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1201484 13f79535-47bb-0310-9956-ffa450edef68
2011-11-13 19:29:17 +00:00
Simon Willnauer 03cc612036 LUCENE-2822: prevent TimeLimitedCollector from starting a statically referenced thread
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1201165 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 02:22:06 +00:00
Michael McCandless fd447cbaff fix javadocs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1201058 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 21:27:22 +00:00
Michael McCandless 19889d6873 LUCENE-3454: rename IW.optimize -> IW.forceMerge
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1201036 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 19:50:51 +00:00
Michael McCandless 5200e8e38f LUCENE-3443: port 3.x's FieldCache.getDocsWithField to trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1200480 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:13:50 +00:00
Yonik Seeley 32bfbfe380 add more asserts to catch EOF, ensure that tlog files start at pos 0
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1200438 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 17:23:42 +00:00
Robert Muir edb422e30b SOLR-2848: fix javadocs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1200373 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 15:18:19 +00:00
Robert Muir b97d321f82 SOLR-2848: generalize distributed spellcheck code to work with any SolrSpellChecker
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1200266 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 10:54:46 +00:00
Robert Muir 7877d1ff07 LUCENE-2621: fix codec to own the filenames and merging of stored fields
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1199779 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 14:52:33 +00:00
Yonik Seeley 6ab4c631ca SOLR-2861: retry if channel read returns 0 bytes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1199013 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 23:38:08 +00:00
Yonik Seeley 0d05013d86 SOLR-2861: add additional asserts to catch read past EOF that jenkins sees
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1198999 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 23:12:21 +00:00
Koji Sekiguchi ea56fff8f6 SOLR-1926: add hl.q parameter
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1198778 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 15:26:49 +00:00
Erick Erickson 130ec534c5 Fix for SOLR-2829. False-positives on cache hits.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1198024 13f79535-47bb-0310-9956-ffa450edef68
2011-11-05 19:20:37 +00:00
Erik Hatcher a668ecf43b Fix spelling typo: s/invarient/invariant
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1197824 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 23:51:52 +00:00
Robert Muir fa6500fa6c LUCENE-3490: restructure codec hierarchy
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1197603 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 15:43:35 +00:00
Robert Muir 369a07a196 LUCENE-3557: SpellChecker should take IWC, remove sneaky silent optimize() methods
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1197469 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 09:54:55 +00:00
Robert Muir 38fa222128 LUCENE-3559: remove IndexSearcher.maxDoc/docFreq
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1197458 13f79535-47bb-0310-9956-ffa450edef68
2011-11-04 09:35:15 +00:00
Martijn van Groningen 19765406b6 SOLR-2591: Remove commitLockTimeout option from solrconfig.xml
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1197154 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 14:38:13 +00:00
Mark Robert Miller 4f333721df harden test against slow/busy computers
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1196811 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 21:30:52 +00:00
Yonik Seeley d515ff3d9e SOLR-2861: NRT test, debugging improvements
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1196797 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 21:02:17 +00:00
Mark Robert Miller 8125422e60 SOLR-2565: reenable AutoCommitTest but move tests with soft commit to new test class that tests with a better method - likely some hardening tweaks still needed, but a the start of a large improvement.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1196589 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 14:01:26 +00:00
Chris M. Hostetter c28be02238 SOLR-2715: add reason for @Ingore to @Ignore msg
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1196156 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 17:41:13 +00:00
Robert Muir 55ad4c6be1 SOLR-2276: fix typo
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1195101 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 03:13:12 +00:00
Robert Muir d5601eb371 SOLR-2276: Support for cologne phonetic
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1195082 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 01:00:06 +00:00
Yonik Seeley 36962d9a9e SOLR-2861: use searcherLock in getIndexDir
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1190107 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 01:07:47 +00:00
Erik Hatcher ff8796e5ef SOLR-2718: allow for lazy loaded response writers; clean up test hack for VelocityResponseWriter
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1189958 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 19:30:48 +00:00
Erik Hatcher 2126cc24f3 Fix exception message typo and remove duplicate strings
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1189719 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 12:31:49 +00:00
Erik Hatcher e939fa9286 SOLR-2854: Load URL content streams when requested rather than automatically
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1189596 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 03:53:20 +00:00
Erik Hatcher 4d09a58fc2 Fix comment typo
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1189568 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 01:14:47 +00:00
Erik Hatcher 426bc2d0b6 SOLR-2588: Move VelocityResponseWriter back to contrib/velocity
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1189383 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 18:59:18 +00:00
Erik Hatcher f56b7495b1 Fix javadoc reference
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1189299 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 16:32:34 +00:00
Yonik Seeley 7b1175c602 SOLR-2846: add json handler to solrconfig, fix /udate/json typo in SolrTestCaseJ4
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1189186 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 13:12:15 +00:00
Robert Muir ce4638c34e disable test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1189160 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 12:14:27 +00:00
Robert Muir ef37a027a0 disable test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1188922 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 21:19:55 +00:00
Uwe Schindler 94f98ab7f3 LUCENE-1536: Filters can now be applied down-low, if their DocIdSet implements a new bits() method, returning all documents in a random access way
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1188624 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 12:11:15 +00:00
Ryan McKinley 9e0916333e SOLR-2831: resolve IndexableField in BinaryResponseWriter.java
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1183178 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 00:34:51 +00:00
Ryan McKinley 212543268b SOLR-2830: apply transformers in RealTimeGetComponent
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1183177 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 00:33:54 +00:00
Robert Muir 26bba41a3b make these test files more useful examples
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1182390 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 14:21:05 +00:00
Michael McCandless 9e027695c8 LUCENE-3502: move .has/getArray into PackedInts.Reader and make the direct impls package private
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1181070 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 17:00:42 +00:00
Yonik Seeley a2936360e9 remove extra array allocation
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1180469 13f79535-47bb-0310-9956-ffa450edef68
2011-10-08 19:19:02 +00:00
Martijn van Groningen 70a7363fdb LUCENE-3483: Move Function grouping collectors from Solr to grouping module.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1179808 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 20:09:36 +00:00
Mark Robert Miller 51886a3bd2 fix variable name
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1179697 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 16:36:52 +00:00
Mark Robert Miller 4e3d7395b3 remove unused interface
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1179696 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 16:33:25 +00:00
Jan Høydahl 22dcd39d9e SOLR-2792: Allow case insensitive Hunspell stemming
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1179459 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 22:08:55 +00:00
Mark Robert Miller c1be69731d fix another getStats issue - soft commit was also recently added using time for docs stat
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1178632 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 23:22:20 +00:00
Michael McCandless ae43014041 LUCENE-3464: rename IR.reopen -> IR.openIfChanged, and return null (not old reader) if there are no changes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1178612 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 22:07:00 +00:00
Robert Muir b4ff06f88e LUCENE-3474: pass Bits to weight.scorer instead of weights pulling their own from the reader
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1177879 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 01:03:35 +00:00
Mark Robert Miller d4b4aefabb SOLR-2799: Update CloudState incrementally rather than always reading the data at each zk node.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1177360 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 16:44:24 +00:00
Martijn van Groningen 7cbcf2a2de LUCENE-3468: Replaced last() and remove() with pollLast() in FirstPassGroupingCollector
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1177008 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 18:40:22 +00:00
Christopher John Male 8d28270460 LUCENE-3470: Changed Field constructor signatures order to value, fieldtype
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1176773 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 08:07:16 +00:00
Christopher John Male 67c13bd2fe LUCENE-3455: Renamed Analyzer.reusableTokenStream to Analyzer.tokenStream
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1176728 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 05:26:54 +00:00
Mark Robert Miller 810f331fa2 ignore expected exception in test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1176598 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 20:26:10 +00:00
Christopher John Male fe3982c746 LUCENE-3455: Moved remaining Analysis consumers over to using reusableTokenStream
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1176191 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 04:07:38 +00:00
Chris M. Hostetter 9bdaa028d6 SOLR-2757: min/max functions now take unlimited number of arguments
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1176097 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 22:03:31 +00:00
Mark Robert Miller f5d625821f be careful when shutting down - in some cases in tests we did not yet fully start up
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175862 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 13:31:37 +00:00
Shalin Shekhar Mangar 9ed62f999b SOLR-2791 -- Replication: abortfetch command is broken if replication was started by fetchindex command instead of a regular poll.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175696 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 07:13:44 +00:00
Christopher John Male 0bed3142bb LUCENE-3455: Test Analysis consumers now use reusableTokenStream
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175670 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 04:58:48 +00:00
Mark Robert Miller c033ca6b10 1 second is too small a timeout for busy/slow comps
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175657 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 04:15:29 +00:00
Mark Robert Miller 68d098fbef it's possible to get an NPE here on shutdown in tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175656 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 04:13:38 +00:00
Mark Robert Miller 44b56415a8 relax the timing on these two tests so that tests pass on my setup much more often
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175652 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 03:30:09 +00:00
Mark Robert Miller 4de85b89ff SOLR-2793: Somtimes you must dec ref twice, and add fix to the other submit calls
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175651 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 03:28:55 +00:00
Robert Muir e927a69698 LUCENE-3456: use MockTokenizer in analysis tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175650 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 03:24:02 +00:00
Mark Robert Miller 67fe9a6b81 SOLR-2793: Be sure to only dec ref if we inc ref'd
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175646 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 02:13:23 +00:00
Mark Robert Miller 50b31b2a4e SOLR-2793: In rare cases (most likely during shutdown), a SolrIndexSearcher can be left open if the executor rejects a task.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175637 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 00:48:02 +00:00
Robert Muir e7229ee7a4 LUCENE-3456: more use of MockTokenizer
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175579 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 21:10:50 +00:00
Robert Muir 1e577e15b5 LUCENE-3456: use MockTokenizer instead of WhitespaceTokenizer in test configs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175529 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 19:10:17 +00:00
Uwe Schindler 0a1d2dd8ec Fix Javadoc warnings
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175425 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 16:24:41 +00:00
Christopher John Male fdde857f24 SOLR-2769: Fixed bad javadoc
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175299 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 05:17:21 +00:00
Christopher John Male 4ff0b2f82c LUCENE-3396: Collapsing Analyzer and ReusableAnalyzerBase together, mandating use of TokenStreamComponents
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175297 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 05:10:25 +00:00
Jan Høydahl 48e53be99a SOLR-2769: Added factory for the new Hunspell stemmer (janhoy, cmale)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1175200 13f79535-47bb-0310-9956-ffa450edef68
2011-09-24 17:17:27 +00:00
Christopher John Male 5d4502ad0a LUCENE-2309: Moved to Field.tokenStream(Analyzer)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1174506 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 03:16:37 +00:00
Martijn van Groningen bad428d7f8 SOLR-2780: Fixed issue where multi select facets didn't respect group.truncate parameter.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1174072 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 11:36:48 +00:00
Robert Muir 2d5d5226a6 SOLR-2754: add similarity factories for new ranking algorithms
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1173776 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 18:20:44 +00:00
Martijn van Groningen d58350aead SOLR-2776: Added support for group.truncate for distributed search. Also added some more jdocs.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1173286 13f79535-47bb-0310-9956-ffa450edef68
2011-09-20 18:15:23 +00:00
Jan Høydahl 3013098230 SOLR-2763: Extracting update request handler throws exception and returns 400 when zero-length file posted using multipart form post
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1173139 13f79535-47bb-0310-9956-ffa450edef68
2011-09-20 13:38:01 +00:00
Steven Rowe 0047a77f83 SOLR-2771: Solr modules' tests should not depend on solr-core test classes; move BufferingRequestProcessor from solr-core tests to test-framework so that the Solr Cell module can use it.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1172428 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 05:13:52 +00:00
Christopher John Male ed2c8e97ea Fixed broken javadoc in QueryUtils and QueryCommand
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1172260 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 11:47:22 +00:00
Martijn van Groningen 96c4bb7074 SOLR-2066: Added support for distributed grouping.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1171970 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 12:48:27 +00:00
Chris M. Hostetter 66db04c901 SOLR-2772: fix silly javadoc error
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1171739 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 19:18:26 +00:00
Chris M. Hostetter d8f4714da6 SOLR-2772: revert unneccessary 'public static' change to DateField.formatDate
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1171704 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 18:25:31 +00:00
Chris M. Hostetter 82b72ac3fe SOLR-2772: Fixed Date parsing/formatting of years 0001-1000
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1171691 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 17:42:40 +00:00
Robert Muir 72106bb37b SOLR-2726: Fixed NullPointerException when using spellcheck.q with Suggester
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1171597 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 14:42:22 +00:00
Robert Muir 28ae5a5763 LUCENE-3436: remove deprecations from trunk / dont use deprecated methods
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1171570 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 14:05:46 +00:00
Robert Muir c0965ed3a2 LUCENE-3436: add spellchecker SuggestMode
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1171556 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 13:41:29 +00:00
Jan Høydahl 90e0977c5a SOLR-2750: Make both "update.chain" and the deprecated "update.param" work consistently everywhere
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1171304 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 22:41:18 +00:00
Jan Høydahl 44386401f6 SOLR-2540: Fixing commitWithin tests which timed out
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1171138 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 15:29:35 +00:00
Steven Rowe a08639d08d SOLR-2758: Moved ConcurrentLRUCache from o.a.s.common.util package in the solrj module to the o.a.s.util package in the Solr core module.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1170699 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 16:00:56 +00:00
Koji Sekiguchi f1efdf5553 SOLR-2749: add boundary scanner feature
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1170616 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 13:38:49 +00:00
Christopher John Male b48164a275 SOLR-2709: Removed need for EDisMax's ExtendedAnalyzer
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1170425 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 03:36:56 +00:00
Robert Muir cfaf91c739 LUCENE-2959: add state of the art ranking to Lucene
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1169470 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 15:47:21 +00:00
Christopher John Male ffb3cbee57 LUCENE-2308: Moved over to using IndexableFieldType interface
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1167668 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 04:07:52 +00:00
Yonik Seeley 7718a32fc5 stats: maxTime->maxDocs
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1167199 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 14:20:24 +00:00
Robert Muir 20c03511c8 LUCENE-1889: pass the reader to FVH so it can rewrite multitermqueries
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1167008 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 05:46:21 +00:00
Yonik Seeley 013e2776b8 SOLR-2748: CommitTracker fixes
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1166866 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 19:27:40 +00:00
Christopher John Male c0f05e7b37 LUCENE-3419: Added epsilons and fixed deprecated junit assertion usage
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1166582 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 09:24:40 +00:00
Erik Hatcher 80359e0812 SOLR-2703: Added surround query parser support
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1166185 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 13:54:19 +00:00
Erik Hatcher 1d56ff5bc3 move comment inside block, appropriately
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1166159 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 13:08:24 +00:00
Christopher John Male 4b44bd7d83 LUCENE-3410: Deprecated multi-int constructors in WordDelimiterFilter. Now uses int bitfield
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1165995 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 04:43:10 +00:00
Yonik Seeley 374538c68d SOLR-2656: doc - licenses + comments
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1165885 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 21:47:05 +00:00
Yonik Seeley 1465c3edd4 SOLR-2656, SOLR-2700: transaction logging and realtime-get
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1165869 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 21:37:32 +00:00
Jan Høydahl ab554500bd SOLR-2540: CommitWithin as an Update Request parameter
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1165754 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 16:27:20 +00:00
Yonik Seeley e8072dd668 SOLR-2714: drop null field values in json update format
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1163370 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 20:46:24 +00:00
Michael McCandless 3ed03b8488 LUCENE-3405: rename IOUtils.close methods
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1162394 13f79535-47bb-0310-9956-ffa450edef68
2011-08-27 16:25:46 +00:00
Michael McCandless 4dad0ba89f LUCENE-2308: cutover to FieldType
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1162347 13f79535-47bb-0310-9956-ffa450edef68
2011-08-27 13:27:01 +00:00
Mark Robert Miller a05f774573 SOLR-2565: same as the addDoc bug, deletes are not triggering soft commits if hard auto commit by time is also configured
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1161265 13f79535-47bb-0310-9956-ffa450edef68
2011-08-24 20:23:57 +00:00
Mark Robert Miller cf4e150ce1 hossman has a better test for this, but for now try and make it a bit more sane
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1161071 13f79535-47bb-0310-9956-ffa450edef68
2011-08-24 12:30:04 +00:00
Mark Robert Miller 8f2c67ad67 see what charlie cron thinks of this - charlie is sometimes slow and peculiar, so who knows
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1160895 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 21:58:25 +00:00
Mark Robert Miller 1a6f077b9a try and make charlie cron happier with this test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1160892 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 21:45:02 +00:00
Christopher John Male 0ef9c3c25f LUCENE-3376: Moved ReusableAnalyzerBase to core
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1160117 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 06:01:31 +00:00
Mark Robert Miller cd84fe0366 try and make charlie cron happier with this test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1160078 13f79535-47bb-0310-9956-ffa450edef68
2011-08-21 22:48:44 +00:00
Mark Robert Miller 5e45cf89eb SOLR-2331: fix too many close on SolrCore test issue
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1159921 13f79535-47bb-0310-9956-ffa450edef68
2011-08-20 21:58:14 +00:00
Mark Robert Miller a4ec6c4177 try to harden this test more
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1159649 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 14:38:50 +00:00
Chris M. Hostetter e7e46f60ce eliminate useless javadoc tags breaking the build
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1159495 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 03:37:47 +00:00
Mark Robert Miller f932976e99 harden test some
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1159481 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 02:19:26 +00:00
Mark Robert Miller a8949dce07 SOLR-2565: Fix bug - soft commit should not try and respect commitWithin. Also, since it drives me nuts, make CommitTracker more thread safe than it was.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1159472 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19 01:48:31 +00:00
Uwe Schindler 236fb6d96c SOLR-2565: Revert the commit that caused the slowness in some tests until we have a reason and solution for this
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1159448 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 23:43:06 +00:00
Chris M. Hostetter 75d3e1e37d SOLR-2675: CoreAdminHandler now allows arbitrary properties to be specified when CREATEing a new SolrCore using property.* request params
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1159418 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 21:13:56 +00:00
Mark Robert Miller 7354f8d9e8 SOLR-2654: Directorys used by a SolrCore are now closed when they are no longer used.
SOLR-2654: The same Directory instance is now always used across a SolrCore so that
it's easier to add other DirectoryFactory's without static caching hacks.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1159378 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18 19:46:30 +00:00
Ryan McKinley 4bf2a3ab2b SOLR-2657: adding some more comments and caching glob calculations
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1157692 13f79535-47bb-0310-9956-ffa450edef68
2011-08-15 01:02:18 +00:00
Ryan McKinley e290f25420 SOLR-2700: supporting score==*,score
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1157687 13f79535-47bb-0310-9956-ffa450edef68
2011-08-15 00:42:42 +00:00
Mark Robert Miller e3e644b28d SOLR-2565: Stop trying to avoid soft/hard commit together for now - it's more complicated than this - also allow name for CommitTracker.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1157425 13f79535-47bb-0310-9956-ffa450edef68
2011-08-13 21:06:01 +00:00
Yonik Seeley baf2b785af tests: don't compare response header
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1156597 13f79535-47bb-0310-9956-ffa450edef68
2011-08-11 12:37:02 +00:00
Mark Robert Miller 9d3eb8755b SOLR-2705: Add extra test check suggested by Yury
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1156441 13f79535-47bb-0310-9956-ffa450edef68
2011-08-11 02:00:11 +00:00
Mark Robert Miller adab6ebc59 SOLR-2705: Improve fix - refactor SolrCore out of DefaultIndexProvider and into it's methods
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1156333 13f79535-47bb-0310-9956-ffa450edef68
2011-08-10 19:37:13 +00:00
Mark Robert Miller 6dcc59e10c SOLR-2705: On reload, IndexWriterProvider holds onto the initial SolrCore it was created with.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1156303 13f79535-47bb-0310-9956-ffa450edef68
2011-08-10 18:34:45 +00:00
Mark Robert Miller 9c1d10c4e9 defense against NPE
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1156201 13f79535-47bb-0310-9956-ffa450edef68
2011-08-10 14:49:03 +00:00
Yonik Seeley 25e1cf93dc SOLR-2565: fix update handler reopen race
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1155964 13f79535-47bb-0310-9956-ffa450edef68
2011-08-09 22:59:30 +00:00
Simon Willnauer 78d186e081 LUCENE-3348: IndexWriter applies wrong deletes during concurrent flush-all
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1155278 13f79535-47bb-0310-9956-ffa450edef68
2011-08-09 09:22:15 +00:00
Mark Robert Miller fda091ef24 SOLR-2698: Enhance CoreAdmin STATUS command to return index size.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1155194 13f79535-47bb-0310-9956-ffa450edef68
2011-08-09 02:40:52 +00:00
Robert Muir ef56f5d551 LUCENE-3361: port url+email tokenizer to standardtokenizerinterface, fix combining marks bug
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1154936 13f79535-47bb-0310-9956-ffa450edef68
2011-08-08 11:57:59 +00:00
Robert Muir 718f42479f SOLR-2688: switch solr 4.0 example to DirectSpellChecker
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1154935 13f79535-47bb-0310-9956-ffa450edef68
2011-08-08 11:55:03 +00:00
Martijn van Groningen 0bc43983c4 SOLR-2665: Added post group faceting.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1154676 13f79535-47bb-0310-9956-ffa450edef68
2011-08-07 09:02:33 +00:00
Mark Robert Miller ca05564005 SOLR-2697: commit and autocommit operations don't reset DirectUpdateHandler2.numDocsPending stats attribute.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1153893 13f79535-47bb-0310-9956-ffa450edef68
2011-08-04 14:43:40 +00:00
Mark Robert Miller 40b3f06f9d SOLR-2331,SOLR-2691: Refactor CoreContainer's SolrXML serialization code and improve testing
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1153564 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 16:18:17 +00:00
Erik Hatcher 89bceaaaf0 SOLR-1032: add literal.field_name=val support to CSV update handler
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1153166 13f79535-47bb-0310-9956-ffa450edef68
2011-08-02 15:33:52 +00:00
Chris M. Hostetter 47269b003f SOLR-2684: fix bug in BinaryResponseWriter introduced by SOLR-1566
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1152885 13f79535-47bb-0310-9956-ffa450edef68
2011-08-01 18:21:14 +00:00
Chris M. Hostetter 2b7362de2b SOLR-2606: Fixed sort parsing of fields containing punctuation
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1152653 13f79535-47bb-0310-9956-ffa450edef68
2011-07-31 22:08:43 +00:00
Koji Sekiguchi 9fd0af75ff SOLR-2682: remove it from distributed code also
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1152530 13f79535-47bb-0310-9956-ffa450edef68
2011-07-31 00:30:19 +00:00
Yonik Seeley b2e6d30243 clean up comments and unnecessary inits
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1152506 13f79535-47bb-0310-9956-ffa450edef68
2011-07-30 20:13:59 +00:00
Yonik Seeley 135d89c4bd SOLR-2685: always use SolrInputDocument in update chain, change from String to BytesRef
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1152500 13f79535-47bb-0310-9956-ffa450edef68
2011-07-30 19:18:09 +00:00
Koji Sekiguchi 13347bd3bc SOLR-2682: remove addException() from SimpleFacet
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1152456 13f79535-47bb-0310-9956-ffa450edef68
2011-07-30 11:35:55 +00:00
Michael McCandless 30b663ff3a LUCENE-3348: silence this test for now
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1151999 13f79535-47bb-0310-9956-ffa450edef68
2011-07-28 20:54:15 +00:00
Steven Rowe 23d22e4d47 LUCENE-3337: avoid building jar files unless necessary in build
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1151720 13f79535-47bb-0310-9956-ffa450edef68
2011-07-28 04:02:09 +00:00
Yonik Seeley 986b7dc101 tests: add tombstones to NRT stress
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1151619 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 20:33:34 +00:00
Yonik Seeley 82a78ab306 tests: fix reopen race
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1151601 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 19:37:09 +00:00
Yonik Seeley cca29c44c2 tests: write a lucene version of the NRT stress test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1151526 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 16:27:40 +00:00
Chris M. Hostetter d89cc54c7a SOLR-2671: push SchemaField.indexOptions() logic down into FieldType to reduce exposure
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150840 13f79535-47bb-0310-9956-ffa450edef68
2011-07-25 18:45:09 +00:00
Yonik Seeley 7964cb97b1 tests: don't allow updating same id concurrently
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150744 13f79535-47bb-0310-9956-ffa450edef68
2011-07-25 15:15:20 +00:00
Uwe Schindler c2df0c51b6 Improve test. All exceptions get logged in all cases by LTC.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150718 13f79535-47bb-0310-9956-ffa450edef68
2011-07-25 14:26:01 +00:00
Uwe Schindler bbcb5a940e Fix broken multithreading in this tests (the object to synchronize on was the anonymous inner class not the main class)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150621 13f79535-47bb-0310-9956-ffa450edef68
2011-07-25 10:36:42 +00:00
Martijn van Groningen 3c6021d967 Deleted duplicate version SentinelIntSet. SentinelIntSet now exists in grouping module.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150497 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 21:53:04 +00:00
Chris M. Hostetter 7c1a58f72d SOLR-2669: Fix backwards validation logic in SchemaField.calcProps
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150478 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 20:09:43 +00:00
Robert Muir 7a3ef099b3 SOLR-2673: clear index in setup
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150415 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 15:36:01 +00:00
Robert Muir 870a4ce9f9 SOLR-2673: fix test dependent on order
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150404 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 15:19:49 +00:00
Robert Muir 347ba7a172 SOLR-2673: fix test dependent on order
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150394 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 15:05:08 +00:00
Robert Muir 19831e2208 SOLR-2673: clear index in setUp
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150389 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 14:51:11 +00:00
Uwe Schindler 9558bfe674 SOLR-2672, SOLR-2673: Fix a bunch of tests to no longer depend on order
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1150362 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 13:44:04 +00:00
Yonik Seeley f8dd8a6ce3 SOLR-2662: fix 'start' handling when a query isn't cached
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1149746 13f79535-47bb-0310-9956-ffa450edef68
2011-07-22 22:03:54 +00:00
Yonik Seeley 2ff9fa27e7 SOLR-2670: add NIOFSDirectoryFactory
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1149740 13f79535-47bb-0310-9956-ffa450edef68
2011-07-22 21:14:24 +00:00
Yonik Seeley 74e3b8b304 tests: remove bad import
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1149677 13f79535-47bb-0310-9956-ffa450edef68
2011-07-22 18:08:55 +00:00
Yonik Seeley bb00836511 tests: fix race in committed model
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1149668 13f79535-47bb-0310-9956-ffa450edef68
2011-07-22 17:51:17 +00:00
Yonik Seeley dcaca50a86 tests: make TestHarness thread safe and add multi-threaded random add/commit/get test
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1149437 13f79535-47bb-0310-9956-ffa450edef68
2011-07-22 02:47:29 +00:00
Koji Sekiguchi 1464513f34 SOLR-2584: add UniqFieldsUpdateProcessor
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1149050 13f79535-47bb-0310-9956-ffa450edef68
2011-07-21 07:09:27 +00:00
Koji Sekiguchi 857ec84c15 SOLR-2429: fix for highlighting
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1149028 13f79535-47bb-0310-9956-ffa450edef68
2011-07-21 03:49:03 +00:00
Shalin Shekhar Mangar 5c3b3bb0ce SOLR-2623 -- Fixed (and simplified) test to compare registered mbeans with info registry size.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1148681 13f79535-47bb-0310-9956-ffa450edef68
2011-07-20 10:11:59 +00:00
Chris M. Hostetter bb81de7e7a SOLR-2663: refactor (public) FieldTypePluginLoader out of IndexSchema
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1148494 13f79535-47bb-0310-9956-ffa450edef68
2011-07-19 19:25:01 +00:00
Ryan McKinley cfcaf7e2bd removing some left over debug info (i assume)
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1147989 13f79535-47bb-0310-9956-ffa450edef68
2011-07-18 18:03:42 +00:00
Robert Muir 07bfe50eda LUCENE-3326: MoreLikeThis reuses a reader after it has already closed it
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1147881 13f79535-47bb-0310-9956-ffa450edef68
2011-07-18 13:56:49 +00:00
Chris M. Hostetter 2811c79bdb SOLR-2545: fix ExternalFileField / FileFloatSource so it can properly parse key=val pairs when the key contains an '=' char
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1147284 13f79535-47bb-0310-9956-ffa450edef68
2011-07-15 19:14:01 +00:00
Mark Robert Miller c899fe0dc0 SOLR-2651: use the right relative path
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1147163 13f79535-47bb-0310-9956-ffa450edef68
2011-07-15 14:29:19 +00:00
Mark Robert Miller d0c71f9702 SOLR-2651: The new SolrCore#reload method does not create a ZkSolrResourceLoader in ZooKeeper mode
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1146905 13f79535-47bb-0310-9956-ffa450edef68
2011-07-14 21:43:07 +00:00
Erick Erickson e2e7c26849 SOLR-2535: REGRESSION: in Solr 3.x and trunk the admin/file handler fails to show directory listings
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1146685 13f79535-47bb-0310-9956-ffa450edef68
2011-07-14 13:17:39 +00:00
Christopher John Male 6b700e1183 LUCENE-3271: Moved MoreLikeThis to queries module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1146542 13f79535-47bb-0310-9956-ffa450edef68
2011-07-14 02:07:11 +00:00
Martijn van Groningen bcc7efbee5 SOLR-2642: Fixed sorting by function when using grouping.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1146291 13f79535-47bb-0310-9956-ffa450edef68
2011-07-13 19:38:40 +00:00
Martijn van Groningen 9a9d84579e fixed bug when start is bigger than rows and format is simple that zero documents are returned even if there are documents to display.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145747 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 20:16:54 +00:00
Robert Muir 580b6df358 LUCENE-2048: fix javadocs warning
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145603 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 14:14:33 +00:00
Robert Muir 1c646d24c9 LUCENE-2048: omit positions but keep term freq
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145594 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 13:31:22 +00:00
Shalin Shekhar Mangar e6dcad7e98 SOLR-2623 -- Solr JMX MBeans do not survive core reloads
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145518 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 10:04:35 +00:00
Robert Muir 2d9e65f34b LUCENE-3233: log a warning instead of error, if synonyms rule set is completely empty
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145442 13f79535-47bb-0310-9956-ffa450edef68
2011-07-12 03:46:37 +00:00
Yonik Seeley 30b3cc881d SOLR-2615: log individual updates at DEBUG level, fix NPE when no unique key
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145198 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 15:02:43 +00:00
Martijn van Groningen 8445d20f5d SOLR-2564: Fixed ArrayIndexOutOfBoundsException when using simple format
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145173 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 13:44:42 +00:00
Robert Muir 015ecfa0a0 LUCENE-3233: improve ram/perf of SynonymFilter, add wordnet parsing, nuke contrib/wordnet
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145158 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 12:58:52 +00:00
Christopher John Male 5f30bedccc LUCENE-3283: Moved core QueryParsers to queryparser module
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145016 13f79535-47bb-0310-9956-ffa450edef68
2011-07-11 03:37:00 +00:00
Steven Rowe 88fe5d121f Merged with trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1144510 13f79535-47bb-0310-9956-ffa450edef68
2011-07-08 21:02:20 +00:00
Steven Rowe 4505c08643 SOLR-2452: merged with trunk up r1144161; applied the svn movement script and the latest version of the post-svn-movement patch
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2452@1144174 13f79535-47bb-0310-9956-ffa450edef68
2011-07-08 06:41:23 +00:00
Dawid Weiss 2b2b97f25b Applied folder moves and renames before merge in SVN r1144174. 2016-01-23 01:17:32 +01:00
Dawid Weiss db22b4d1f7 Applied folder moves and renames before merge in SVN r1144174. 2016-01-23 01:17:07 +01:00