Merge commit '722771973bd' into patches/lyslyskom22891031 * commit '722771973bd': (6177 commits) Verify that callablep responses are aligned with reality. ...
Merge commit '2470270f500c728d10b8895314d8d8b07016e37b' into grubba/typechecker-automap * commit '2470270f500c728d10b8895314d8d8b07016e37b': (18681 commits) Removed the old typechecker. ...
Merge remote-tracking branch 'origin/master' into new_utf8
Merge remote-tracking branch 'origin/master' into gobject-introspection
Added program.h to module.h
Merge remote-tracking branch 'origin/8.1' into gobject-introspection
Avoid sending function name to get_all_args
Merge commit '75c9d1806f1a69ca21c27a2c2fe1b4a6ea38e77e' into patches/pike63 * commit '75c9d1806f1a69ca21c27a2c2fe1b4a6ea38e77e': (19587 commits) ...
Merge branch '8.1' into peter/travis
Add object.h to module.h
Let module.h include some common includes.
add_function to ADD_FUNCTION rewrites.
Removed trailing spaces.
More calloc conversions.
Changed some malloc to calloc.
Merge remote-tracking branch 'origin/8.0' into string_alloc Conflicts: src/stralloc.c
memset is C89 and 4.3BSD
Remove some module_magic remnants.
Merge branch '8.0' into gobject-introspection
Merge remote-tracking branch 'origin/7.9' into pdf
Small doc fixes to match reality.
Fix bug in hit candidate selection which caused failures in phrase matching. Part of [bug 6679 (#6679)].
Revert "Fix phrase search when blob hit data isn't fully compacted." since the main problem was traced to incorrect blob generation that was corrected in 266979fe5 and 1a418e776. (Another logic bug remains that will be fixed in a separate commit.) This reverts commit 6665cb230 and 93f452bee3.
Revert "Fix phrase search when blob hit data isn't fully compacted." since the main problem was traced to incorrect blob generation that was corrected in 1d8d7d4 and cb010f1. (Another logic bug remains that will be fixed in a separate commit.) This reverts commit 231560ec and 0c159c1e9.
Fix last commit since 0 is a valid base_hit index.
Fix phrase search when blob hit data isn't fully compacted. The logic for phrase search was broken with regards to how blob state was advanced after testing a phrase candidate. The symptom was typically that some phrases failed to match as expected until running a database compactor script. Fixes [bug 6679 (#6679)].
Keep blob feeders separate when same word occurs multiple times in a query. The blobfeeder hook now gets a opaque stream ID in order to distinguish separate instances of the same word. This fixes search results for phrase searches like "foo bar foo". Conflicts: src/modules/_WhiteFish/blob.c
Keep blob feeders separate when same word occurs multiple times in a query. The blobfeeder hook now gets a opaque stream ID in order to distinguish separate instances of the same word. This fixes search results for phrase searches like "foo bar foo".
No more foreign_idents.
RCSID isn't very useful in git.
Merge branch 'pike-modules/whitefish/4.5' into 7.4
Merge commit 'whitefish_split_4.5_5.0' into whitefish-fixup This is in preparation to fixup Search.Process as well.
Merge remote branch 'pike-modules/whitefish/5.0' into 7.9 Updated Search.Utils and Search.Process to a non-roxen context. Conflicts: .gitattributes .gitignore lib/modules/.autodoc
Merge branch 'pike-modules/whitefish/5.0' into 7.8 Updated Search.Utils and Search.Process to a non-roxen context. Conflicts: .gitattributes .gitignore lib/modules/.autodoc
Merge from external js/per/nilsson fork Rev: lib/modules/Search.pmod/Database.pmod/Base.pike:1.5 Rev: lib/modules/Search.pmod/Database.pmod/Base.pmod:1.20(DEAD) Rev: lib/modules/Search.pmod/Database.pmod/MySQL.pike:1.77 Rev: lib/modules/Search.pmod/Filter.pmod/Base.pike:1.16 Rev: lib/modules/Search.pmod/Filter.pmod/HTML.pmod:1.37 Rev: lib/modules/Search.pmod/Filter.pmod/Output.pike:1.1 Rev: lib/modules/Search.pmod/Filter.pmod/PDF.pmod:1.16 Rev: lib/modules/Search.pmod/Filter.pmod/PlainText.pmod:1.9 Rev: lib/modules/Search.pmod/Filter.pmod/Word.pmod:1.12 Rev: lib/modules/Search.pmod/Grammar.pmod/AbstractParser.pike:1.7 Rev: lib/modules/Search.pmod/Grammar.pmod/DefaultParser.pike:1.11 Rev: lib/modules/Search.pmod/Grammar.pmod/Lexer.pmod:1.7 Rev: lib/modules/Search.pmod/Grammar.pmod/module.pmod:1.12 Rev: lib/modules/Search.pmod/Indexer.pmod:1.17 Rev: lib/modules/Search.pmod/MergeFile.pike:1.1 Rev: lib/modules/Search.pmod/Process.pmod:1.12 Rev: lib/modules/Search.pmod/Query.pmod:1.26 Rev: src/modules/_WhiteFish/Makefile.in:1.7 Rev: src/modules/_WhiteFish/blob.c:1.34 Rev: src/modules/_WhiteFish/blobs.c:1.12 Rev: src/modules/_WhiteFish/buffer.c:1.13 Rev: src/modules/_WhiteFish/linkfarm.c:1.5 Rev: src/modules/_WhiteFish/resultset.c:1.24 Rev: src/modules/_WhiteFish/resultset.h:1.9 Rev: src/modules/_WhiteFish/whitefish.c:1.35
Compatibility fixes to compile with 7.2, 7.4 and 7.5. Rev: src/modules/_WhiteFish/whitefish.c:1.34
Fixed memory leak (one blob struct leaked per blob that was used) Rev: src/modules/_WhiteFish/blob.c:1.29 Rev: src/modules/_WhiteFish/blobs.c:1.8 Rev: src/modules/_WhiteFish/buffer.c:1.10 Rev: src/modules/_WhiteFish/whitefish.c:1.33
Removed the unused anchor field Rev: lib/modules/Search.pmod/Database.pmod/Base.pmod:1.10 Rev: lib/modules/Search.pmod/Database.pmod/MySQL.pike:1.51 Rev: lib/modules/Search.pmod/Queue.pmod/MySQL.pike:1.2 Rev: lib/modules/Search.pmod/RankingProfile.pike:1.16 Rev: lib/modules/Search.pmod/Utils.pmod:1.19 Rev: src/modules/_WhiteFish/blob.c:1.26 Rev: src/modules/_WhiteFish/blob.h:1.13 Rev: src/modules/_WhiteFish/blobs.c:1.6 Rev: src/modules/_WhiteFish/whitefish.c:1.32
Words are now strings, not integers Rev: src/modules/_WhiteFish/blob.c:1.25 Rev: src/modules/_WhiteFish/blob.h:1.12 Rev: src/modules/_WhiteFish/whitefish.c:1.31
Use wf_resultset_push instead of push_object. The former clears the set if it's empty (freeing the resultset pointer, thus making the |, &, add_ranking and - significantly faster for the case when one of the operands is the empty resultset. Rev: src/modules/_WhiteFish/resultset.h:1.8 Rev: src/modules/_WhiteFish/whitefish.c:1.30
Fixed cut'n'paste typo. Rev: src/modules/_WhiteFish/whitefish.c:1.29
Also count very bad phrase matches as matches Rev: src/modules/_WhiteFish/whitefish.c:1.28
low_do_query_merge -> low_do_query_or Rev: src/modules/_WhiteFish/whitefish.c:1.27
Single word hits now give proximity 3 instead of 0 Rev: src/modules/_WhiteFish/whitefish.c:1.26
Removed debug Rev: src/modules/_WhiteFish/whitefish.c:1.25
The phrase search now works if it gets correct input. However, this does not exactly always happen, since the blobs were broken (the sort function used signed char arithmetics and incorrect | << combinations. This is now fixed. Old databases were hopelessly borken, not that that was noticeable except for phrase searches (the hits inside the document blobs were rather creatively sorted) Rev: src/modules/_WhiteFish/whitefish.c:1.24
do_query_merge -> do_query_or Rev: src/modules/_WhiteFish/whitefish.c:1.23
0x7ffffff -> 0x7fffffff (ha\!) Rev: src/modules/_WhiteFish/whitefish.c:1.22
Added cutoff and do_query_and Rev: src/modules/_WhiteFish/whitefish.c:1.21
(basically) a apping for links Rev: src/modules/_WhiteFish/Makefile.in:1.6 Rev: src/modules/_WhiteFish/linkfarm.c:1.1 Rev: src/modules/_WhiteFish/linkfarm.h:1.1 Rev: src/modules/_WhiteFish/whitefish.c:1.20
Moving inner loops from pike to C. Rev: src/modules/_WhiteFish/Makefile.in:1.5 Rev: src/modules/_WhiteFish/blob.c:1.18 Rev: src/modules/_WhiteFish/blob.h:1.9 Rev: src/modules/_WhiteFish/blobs.c:1.1 Rev: src/modules/_WhiteFish/blobs.h:1.1 Rev: src/modules/_WhiteFish/whitefish.c:1.19
Added phrase search and plugged a memleak Rev: src/modules/_WhiteFish/buffer.c:1.4 Rev: src/modules/_WhiteFish/whitefish.c:1.18
Fixed a bug. Rev: src/modules/_WhiteFish/blob.c:1.14 Rev: src/modules/_WhiteFish/resultset.c:1.15 Rev: src/modules/_WhiteFish/whitefish.c:1.17
Actually works Rev: src/modules/_WhiteFish/blob.c:1.13 Rev: src/modules/_WhiteFish/blob.h:1.8 Rev: src/modules/_WhiteFish/resultset.c:1.14 Rev: src/modules/_WhiteFish/whitefish.c:1.16
API changes, typo in get_all_args fixed Rev: src/modules/_WhiteFish/whitefish.c:1.15
Some changes Rev: src/modules/_WhiteFish/blob.c:1.10 Rev: src/modules/_WhiteFish/blob.h:1.7 Rev: src/modules/_WhiteFish/whitefish.c:1.14
Avoid infinite loops again Rev: src/modules/_WhiteFish/whitefish.c:1.13
Avoid infinite loop Rev: src/modules/_WhiteFish/whitefish.c:1.12
Sum the matrix Rev: src/modules/_WhiteFish/whitefish.c:1.11
For some reason all this code compiled on the first try. :-) It does most likely not work yet, though. Witness the birth of do_query_merge. :-) Rev: src/modules/_WhiteFish/blob.c:1.9 Rev: src/modules/_WhiteFish/blob.h:1.6 Rev: src/modules/_WhiteFish/whitefish.c:1.10
Typo Rev: src/modules/_WhiteFish/whitefish.c:1.9
Compiling but untested writable _WhiteFish.Blob Rev: src/modules/_WhiteFish/blob.c:1.5 Rev: src/modules/_WhiteFish/blob.h:1.5 Rev: src/modules/_WhiteFish/whitefish.c:1.8
Abstraction, in preparation of writable _WhiteFish.Buffer objects Rev: src/modules/_WhiteFish/Makefile.in:1.4 Rev: src/modules/_WhiteFish/blob.c:1.4 Rev: src/modules/_WhiteFish/blob.h:1.4 Rev: src/modules/_WhiteFish/buffer.c:1.1 Rev: src/modules/_WhiteFish/buffer.h:1.1 Rev: src/modules/_WhiteFish/configure.in:1.3 Rev: src/modules/_WhiteFish/whitefish.c:1.7
Removed 'field' argument from do_query_marge Rev: src/modules/_WhiteFish/whitefish.c:1.6
More Blob functions. The argument-getting and free-when-done part of do_query_merge done. Rev: src/modules/_WhiteFish/whitefish.c:1.5
More Blob functions. The argument-getting and free-when-done part of do_query_merge done. Rev: src/modules/_WhiteFish/blob.c:1.2 Rev: src/modules/_WhiteFish/blob.h:1.2 Rev: src/modules/_WhiteFish/whitefish.c:1.4
It's a start Rev: src/modules/_WhiteFish/Makefile.in:1.3 Rev: src/modules/_WhiteFish/blob.c:1.1 Rev: src/modules/_WhiteFish/blob.h:1.1 Rev: src/modules/_WhiteFish/whitefish.c:1.3
Working ResultSet class Rev: src/modules/_WhiteFish/Makefile.in:1.2 Rev: src/modules/_WhiteFish/resultset.c:1.3 Rev: src/modules/_WhiteFish/resultset.h:1.2 Rev: src/modules/_WhiteFish/whitefish.c:1.2 Rev: src/modules/_WhiteFish/whitefish.h:1.2
Skeleton Rev: src/modules/_WhiteFish/.cvsignore:1.1 Rev: src/modules/_WhiteFish/Makefile.in:1.1 Rev: src/modules/_WhiteFish/acconfig.h:1.1 Rev: src/modules/_WhiteFish/configure.in:1.1 Rev: src/modules/_WhiteFish/resultset.c:1.1 Rev: src/modules/_WhiteFish/resultset.h:1.1 Rev: src/modules/_WhiteFish/testsuite.in:1.1 Rev: src/modules/_WhiteFish/whitefish.c:1.1 Rev: src/modules/_WhiteFish/whitefish.h:1.1