Merge branch 'CLOWNFISH-39-vector-api'
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/a5c6f723 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/a5c6f723 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/a5c6f723 Branch: refs/heads/master Commit: a5c6f723e59c8781ef56dfef0b3ed2db42b84af4 Parents: 42c878f 8b97664 Author: Nick Wellnhofer <[email protected]> Authored: Wed Apr 29 21:55:42 2015 +0200 Committer: Nick Wellnhofer <[email protected]> Committed: Wed Apr 29 21:55:42 2015 +0200 ---------------------------------------------------------------------- c/src/Lucy/Index/Inverter.c | 6 +- core/Lucy/Analysis/Analyzer.c | 6 +- core/Lucy/Analysis/Analyzer.cfh | 2 +- core/Lucy/Analysis/Inversion.c | 6 +- core/Lucy/Analysis/PolyAnalyzer.c | 44 +-- core/Lucy/Analysis/PolyAnalyzer.cfh | 8 +- core/Lucy/Analysis/Token.c | 3 +- core/Lucy/Analysis/Token.cfh | 4 +- core/Lucy/Highlight/HeatMap.c | 75 +++-- core/Lucy/Highlight/HeatMap.cfh | 16 +- core/Lucy/Highlight/Highlighter.c | 18 +- core/Lucy/Highlight/Highlighter.cfh | 2 +- core/Lucy/Index/BackgroundMerger.c | 44 +-- core/Lucy/Index/DataReader.c | 8 +- core/Lucy/Index/DataReader.cfh | 8 +- core/Lucy/Index/DeletionsReader.c | 38 +-- core/Lucy/Index/DeletionsReader.cfh | 14 +- core/Lucy/Index/DeletionsWriter.c | 48 +-- core/Lucy/Index/DeletionsWriter.cfh | 4 +- core/Lucy/Index/DocReader.c | 26 +- core/Lucy/Index/DocReader.cfh | 14 +- core/Lucy/Index/DocVector.c | 2 +- core/Lucy/Index/FilePurger.c | 84 ++--- core/Lucy/Index/HighlightReader.c | 24 +- core/Lucy/Index/HighlightReader.cfh | 14 +- core/Lucy/Index/IndexManager.c | 61 ++-- core/Lucy/Index/IndexManager.cfh | 2 +- core/Lucy/Index/IndexReader.c | 4 +- core/Lucy/Index/IndexReader.cfh | 4 +- core/Lucy/Index/Indexer.c | 50 +-- core/Lucy/Index/Inverter.c | 18 +- core/Lucy/Index/Inverter.cfh | 4 +- core/Lucy/Index/LexIndex.c | 2 +- core/Lucy/Index/LexiconReader.c | 36 +-- core/Lucy/Index/LexiconReader.cfh | 16 +- core/Lucy/Index/PolyLexicon.c | 30 +- core/Lucy/Index/PolyLexicon.cfh | 6 +- core/Lucy/Index/PolyReader.c | 72 ++--- core/Lucy/Index/PolyReader.cfh | 10 +- core/Lucy/Index/PostingListReader.c | 8 +- core/Lucy/Index/PostingListReader.cfh | 8 +- core/Lucy/Index/PostingListWriter.c | 24 +- core/Lucy/Index/PostingListWriter.cfh | 2 +- core/Lucy/Index/PostingPool.c | 4 +- core/Lucy/Index/SegReader.c | 10 +- core/Lucy/Index/SegReader.cfh | 6 +- core/Lucy/Index/SegWriter.c | 26 +- core/Lucy/Index/SegWriter.cfh | 2 +- core/Lucy/Index/Segment.c | 18 +- core/Lucy/Index/Segment.cfh | 2 +- core/Lucy/Index/Snapshot.c | 32 +- core/Lucy/Index/Snapshot.cfh | 2 +- core/Lucy/Index/SortFieldWriter.c | 4 +- core/Lucy/Index/SortReader.c | 8 +- core/Lucy/Index/SortReader.cfh | 8 +- core/Lucy/Index/SortWriter.c | 28 +- core/Lucy/Index/SortWriter.cfh | 2 +- core/Lucy/Plan/Architecture.c | 12 +- core/Lucy/Plan/Schema.c | 34 +- core/Lucy/Plan/Schema.cfh | 4 +- core/Lucy/Search/ANDMatcher.c | 6 +- core/Lucy/Search/ANDMatcher.cfh | 4 +- core/Lucy/Search/ANDQuery.c | 18 +- core/Lucy/Search/ANDQuery.cfh | 4 +- core/Lucy/Search/Collector/SortCollector.c | 32 +- core/Lucy/Search/Collector/SortCollector.cfh | 4 +- core/Lucy/Search/Compiler.c | 4 +- core/Lucy/Search/Compiler.cfh | 2 +- core/Lucy/Search/HitQueue.c | 12 +- core/Lucy/Search/Hits.c | 4 +- core/Lucy/Search/Hits.cfh | 2 +- core/Lucy/Search/IndexSearcher.c | 8 +- core/Lucy/Search/IndexSearcher.cfh | 2 +- core/Lucy/Search/MatchDoc.c | 12 +- core/Lucy/Search/MatchDoc.cfh | 10 +- core/Lucy/Search/NOTMatcher.c | 4 +- core/Lucy/Search/NOTQuery.c | 12 +- core/Lucy/Search/NOTQuery.cfh | 2 +- core/Lucy/Search/ORMatcher.c | 14 +- core/Lucy/Search/ORMatcher.cfh | 8 +- core/Lucy/Search/ORQuery.c | 18 +- core/Lucy/Search/ORQuery.cfh | 4 +- core/Lucy/Search/PhraseMatcher.c | 10 +- core/Lucy/Search/PhraseMatcher.cfh | 4 +- core/Lucy/Search/PhraseQuery.c | 68 ++-- core/Lucy/Search/PhraseQuery.cfh | 10 +- core/Lucy/Search/PolyMatcher.c | 8 +- core/Lucy/Search/PolyMatcher.cfh | 6 +- core/Lucy/Search/PolyQuery.c | 56 ++-- core/Lucy/Search/PolyQuery.cfh | 12 +- core/Lucy/Search/PolySearcher.c | 42 +-- core/Lucy/Search/PolySearcher.cfh | 6 +- core/Lucy/Search/QueryParser.c | 322 +++++++++---------- core/Lucy/Search/QueryParser.cfh | 14 +- core/Lucy/Search/QueryParser/QueryLexer.c | 8 +- core/Lucy/Search/QueryParser/QueryLexer.cfh | 2 +- core/Lucy/Search/RequiredOptionalMatcher.c | 6 +- core/Lucy/Search/RequiredOptionalQuery.c | 20 +- core/Lucy/Search/SeriesMatcher.c | 8 +- core/Lucy/Search/SeriesMatcher.cfh | 6 +- core/Lucy/Search/SortSpec.c | 20 +- core/Lucy/Search/SortSpec.cfh | 8 +- core/Lucy/Search/TermQuery.c | 6 +- core/Lucy/Search/TermQuery.cfh | 2 +- core/Lucy/Search/TopDocs.c | 12 +- core/Lucy/Search/TopDocs.cfh | 10 +- core/Lucy/Store/CompoundFileReader.c | 14 +- core/Lucy/Store/CompoundFileReader.cfh | 2 +- core/Lucy/Store/CompoundFileWriter.c | 16 +- core/Lucy/Store/FSDirHandle.c | 2 +- core/Lucy/Store/Folder.c | 36 +-- core/Lucy/Store/Folder.cfh | 4 +- core/Lucy/Store/RAMDirHandle.c | 6 +- core/Lucy/Store/RAMDirHandle.cfh | 2 +- core/Lucy/Test/Analysis/TestAnalyzer.c | 4 +- core/Lucy/Test/Analysis/TestCaseFolder.c | 4 +- core/Lucy/Test/Analysis/TestNormalizer.c | 20 +- core/Lucy/Test/Analysis/TestPolyAnalyzer.c | 66 ++-- core/Lucy/Test/Analysis/TestSnowballStemmer.c | 14 +- core/Lucy/Test/Analysis/TestStandardTokenizer.c | 24 +- core/Lucy/Test/Highlight/TestHeatMap.c | 124 +++---- core/Lucy/Test/Highlight/TestHighlighter.c | 48 +-- core/Lucy/Test/Index/TestSnapshot.c | 10 +- core/Lucy/Test/Index/TestSortWriter.c | 18 +- core/Lucy/Test/Index/TestSortWriter.cfh | 2 +- core/Lucy/Test/Object/TestBitVector.c | 8 +- core/Lucy/Test/Search/TestQueryParserLogic.c | 6 +- core/Lucy/Test/Search/TestQueryParserSyntax.c | 12 +- core/Lucy/Test/Search/TestSeriesMatcher.c | 4 +- core/Lucy/Test/Search/TestSortSpec.c | 140 ++++---- core/Lucy/Test/Store/TestFSFolder.c | 6 +- core/Lucy/Test/Store/TestFolder.c | 16 +- core/Lucy/Test/TestUtils.c | 42 +-- core/Lucy/Test/TestUtils.cfh | 6 +- core/Lucy/Test/Util/TestFreezer.c | 10 +- core/Lucy/Test/Util/TestJson.c | 18 +- core/Lucy/Test/Util/TestPriorityQueue.c | 12 +- core/Lucy/Test/Util/TestSortExternal.c | 90 +++--- core/Lucy/Util/BBSortEx.c | 28 +- core/Lucy/Util/BBSortEx.cfh | 8 +- core/Lucy/Util/Freezer.c | 56 ++-- core/Lucy/Util/Freezer.cfh | 8 +- core/Lucy/Util/Json.c | 22 +- core/Lucy/Util/Json.cfh | 4 +- core/Lucy/Util/Json/JsonParser.y | 26 +- core/Lucy/Util/MemoryPool.c | 12 +- core/Lucy/Util/MemoryPool.cfh | 2 +- core/Lucy/Util/PriorityQueue.c | 6 +- core/Lucy/Util/PriorityQueue.cfh | 2 +- core/Lucy/Util/SortExternal.c | 27 +- core/Lucy/Util/SortExternal.cfh | 2 +- core/Lucy/Util/ToolSet.h | 2 +- core/LucyX/Search/ProximityMatcher.c | 10 +- core/LucyX/Search/ProximityMatcher.cfh | 4 +- core/LucyX/Search/ProximityQuery.c | 68 ++-- core/LucyX/Search/ProximityQuery.cfh | 10 +- go/lucy/index.go | 6 +- perl/t/213-segment_merging.t | 2 +- perl/t/505-hit_queue.t | 2 +- perl/t/518-or_scorer.t | 2 +- perl/t/520-match_doc.t | 2 +- perl/xs/Lucy/Index/Inverter.c | 4 +- 162 files changed, 1515 insertions(+), 1515 deletions(-) ----------------------------------------------------------------------
