Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv572/modules/pftijah
Modified Files:
Tag: XQFT
pftijah.mx
Log Message:
propagated changes of Thursday Feb 04 2010
from the development trunk to the XQFT branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/04 - sjoerd: modules/pftijah/pftijah.mx,1.252
propagated changes of Thursday Feb 04 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/04 - sjoerd: modules/pftijah/pftijah.mx,1.249.2.2
propagated changes of Wednesday Feb 03 2010 - Thursday Feb 04 2010
from the Nov2009 branch to the Feb2010 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/03 - cornuz: modules/pftijah/pftijah.mx,1.238.2.3
two fixes to verbose output:
- printf ("%d", $t) with $t of type any doesn't work, cast $t to int
- the output of verbose mode is clearly for developing debug, rather than
more info for the user (this is actually a different issue that should be
addressed). However, printf is not very useful for debugging purposes, because
it doesn't get flushed immediately. Changed into tj_verbose() function which
flushes (either to stdout() or to verbosefile)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/03 - cornuz: modules/pftijah/pftijah.mx,1.238.2.4
you don't want to print a bat that could be millions of tuples
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/03 - cornuz: modules/pftijah/pftijah.mx,1.238.2.5
more places where possibly huge print() were used
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/03 - cornuz: modules/pftijah/pftijah.mx,1.238.2.6
The _param bat was used to keep a string status variable (last pre) that
was updated at every document during indexing.
This caused the string heap of this bat (only a few tuples long) to grow
with the size of the collection to index,
which in turn caused a find() operation on this bat (also performed for
each document to index) to become very expensive.
Expensive string search inside a batloop: not good! Replaced this status
variable with an actual mil variable (wrd btw, not lng!).
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.246.2.5
retrieving revision 1.246.2.6
diff -u -d -r1.246.2.5 -r1.246.2.6
--- pftijah.mx 28 Jan 2010 12:57:17 -0000 1.246.2.5
+++ pftijah.mx 4 Feb 2010 10:35:23 -0000 1.246.2.6
@@ -223,6 +223,7 @@
var timing := false;
var verbose := false;
var inex := false;
+var verbosefile := ""; # writes to client stdout if empty filename
# locks
@@ -428,9 +429,9 @@
{
if (doLock) lock_set(tj_adm_lock);
var err := CATCH({
[...1074 lines suppressed...]
}
}
@@ -6020,7 +6055,7 @@
PROC _buildIRindex(str ftiName, BAT[str,bat] collBat) : void
{
- if ( verbose ) printf(HASH +"TJ:_buildIRindex(\"%s\") called.\n",ftiName);
+ if ( verbose ) tj_verbose(HASH +"TJ:_buildIRindex(\"%s\")
called.\n",ftiName);
var offset := oid(lng(_tj_get_parameter(collBat, "_last_finalizedPre"))
+ 1);
var fragments := collBat.find("fragments");
var frag_offset := wrd(find_lower(fragments.reverse(), offset));
@@ -6143,7 +6178,7 @@
submitBats.append("tj_" + ftiName + "_Concepts");
submitBats.append("tj_" + ftiName + "_ConceptScore");
collBat.find("termdict").access(BAT_READ);
- if ( verbose ) printf(HASH +"TJ:_buildIRindex(\"%s\")
finished.\n",ftiName);
+ if ( verbose ) tj_verbose(HASH +"TJ:_buildIRindex(\"%s\")
finished.\n",ftiName);
}
######################################
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
