9482: trunk/xapian-core/ trunk/xapian-core/common/ trunk/xapian-core/include/xapian/ trunk/xapian-core/matcher/

SVN root:       svn://svn.xapian.org/xapian
Changes by:     olly
Revision:       9482
Date:           2007-10-21 23:56:43 +0100 (Sun, 21 Oct 2007)

Log message (12 lines):
common/omenquireinternal.h,include/xapian/enquire.h,
include/xapian/query.h,matcher/: Implement a new QueryOptimiser
class which can hoist the positional filters of OP_PHRASE and
OP_NEAR higher up the tree and merge the "AND" inside them into
any neighbouring OP_AND or OP_FILTER (bug#23).  This shaves 10% of
the execution time of real world queries on real world data.  On
particularly slow cases, the saving can be more dramatic - it
saves 50% when tested on a log of slow cases.  OP_SCALE_WEIGHT
scaling factors are now pushed down to the leaves and any leaf
we a factor other than 0.0 (boolean) or 1.0 (unscaled) has
its weights scaled using a ScaleWeight wrapper around the normal
weighting object (bug#203).

Modified files:
U   trunk/xapian-core/ChangeLog
U   trunk/xapian-core/common/omenquireinternal.h
U   trunk/xapian-core/include/xapian/enquire.h
U   trunk/xapian-core/include/xapian/query.h
U   trunk/xapian-core/matcher/Makefile.mk
U   trunk/xapian-core/matcher/localmatch.cc
U   trunk/xapian-core/matcher/localmatch.h
U   trunk/xapian-core/matcher/multimatch.cc
A   trunk/xapian-core/matcher/queryoptimiser.cc
A   trunk/xapian-core/matcher/queryoptimiser.h
A   trunk/xapian-core/matcher/scaleweight.cc
A   trunk/xapian-core/matcher/scaleweight.h
D   trunk/xapian-core/matcher/scaleweightpostlist.cc
D   trunk/xapian-core/matcher/scaleweightpostlist.h

Links:
http://xapian.org/C?9482
http://xapian.org/C?9482?trunk/xapian-core/ChangeLog
http://xapian.org/C?9482?trunk/xapian-core/common/omenquireinternal.h
http://xapian.org/C?9482?trunk/xapian-core/include/xapian/enquire.h
http://xapian.org/C?9482?trunk/xapian-core/include/xapian/query.h
http://xapian.org/C?9482?trunk/xapian-core/matcher/Makefile.mk
http://xapian.org/C?9482?trunk/xapian-core/matcher/localmatch.cc
http://xapian.org/C?9482?trunk/xapian-core/matcher/localmatch.h
http://xapian.org/C?9482?trunk/xapian-core/matcher/multimatch.cc
http://xapian.org/C?9482?trunk/xapian-core/matcher/queryoptimiser.cc?A
http://xapian.org/C?9482?trunk/xapian-core/matcher/queryoptimiser.h?A
http://xapian.org/C?9482?trunk/xapian-core/matcher/scaleweight.cc?A
http://xapian.org/C?9482?trunk/xapian-core/matcher/scaleweight.h?A