9721: trunk/xapian-core/ trunk/xapian-core/api/ trunk/xapian-core/common/ trunk/xapian-core/matcher/ trunk/xapian-core/net/

SVN root:       svn://svn.xapian.org/xapian
Changes by:     richard
Revision:       9721
Date:           2007-11-24 01:37:23 +0000 (Sat, 24 Nov 2007)

Log message (18 lines):
api/omenquire.cc,common/,matcher/,net/remoteserver.cc: Remove
StatsGatherer and its subclasses completely.  Instead of a
StatsGatherer subclass, MultiMatch is now simply passed a Stats
object, and passes this to the prepare_match() methods of the sub
matchers to be populated with statistics.  OmEnquire then passes
the same Stats object to MultiMatch::get_mset(), whereas a remote
submatch sends the Stats object to the parent match, to be
combined with the global statistics, and then passes the returned
global statistics to MultiMatch::get_mset().  Remove stats.cc
since it only contained implementations of StatsGatherer methods,
and networkstats.h which only contained the definition of the
NetworkStatsGatherer.
matcher/rset.cc: Add the rset size to the database - we now
compute the global rset size the same way as we compute the
global collection size: by adding the sizes in the sub
collections together.  We have the total rset size easily
available in the code, but building the total rset size up from
the sub-databases makes the code simpler.

Modified files:
U   trunk/xapian-core/ChangeLog
U   trunk/xapian-core/api/omenquire.cc
U   trunk/xapian-core/common/Makefile.mk
U   trunk/xapian-core/common/multimatch.h
D   trunk/xapian-core/common/networkstats.h
U   trunk/xapian-core/common/stats.h
U   trunk/xapian-core/common/submatch.h
U   trunk/xapian-core/matcher/Makefile.mk
U   trunk/xapian-core/matcher/emptysubmatch.cc
U   trunk/xapian-core/matcher/emptysubmatch.h
U   trunk/xapian-core/matcher/localmatch.cc
U   trunk/xapian-core/matcher/localmatch.h
U   trunk/xapian-core/matcher/multimatch.cc
U   trunk/xapian-core/matcher/remotesubmatch.cc
U   trunk/xapian-core/matcher/remotesubmatch.h
U   trunk/xapian-core/matcher/rset.cc
D   trunk/xapian-core/matcher/stats.cc
U   trunk/xapian-core/net/remoteserver.cc

Links:
http://xapian.org/C?9721
http://xapian.org/C?9721?trunk/xapian-core/ChangeLog
http://xapian.org/C?9721?trunk/xapian-core/api/omenquire.cc
http://xapian.org/C?9721?trunk/xapian-core/common/Makefile.mk
http://xapian.org/C?9721?trunk/xapian-core/common/multimatch.h
http://xapian.org/C?9721?trunk/xapian-core/common/stats.h
http://xapian.org/C?9721?trunk/xapian-core/common/submatch.h
http://xapian.org/C?9721?trunk/xapian-core/matcher/Makefile.mk
http://xapian.org/C?9721?trunk/xapian-core/matcher/emptysubmatch.cc
http://xapian.org/C?9721?trunk/xapian-core/matcher/emptysubmatch.h
http://xapian.org/C?9721?trunk/xapian-core/matcher/localmatch.cc
http://xapian.org/C?9721?trunk/xapian-core/matcher/localmatch.h
http://xapian.org/C?9721?trunk/xapian-core/matcher/multimatch.cc
http://xapian.org/C?9721?trunk/xapian-core/matcher/remotesubmatch.cc
http://xapian.org/C?9721?trunk/xapian-core/matcher/remotesubmatch.h
http://xapian.org/C?9721?trunk/xapian-core/matcher/rset.cc
http://xapian.org/C?9721?trunk/xapian-core/net/remoteserver.cc