Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26775

Modified Files:
        pftijah.mx 
Log Message:
- execute simple ftfun operations in one tijah query to speedup execution



Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- pftijah.mx  18 Jan 2010 13:50:29 -0000      1.250
+++ pftijah.mx  28 Jan 2010 09:54:01 -0000      1.251
@@ -3222,7 +3222,7 @@
        GDKerror("ALG_tj_ftfun_handler: options not implemented yet");
      if ( has_ign )
        GDKerror("ALG_tj_ftfun_handler: ignores not implemented yet");
-
+     var single_val_opt := (pfop_query.fetch(1...@0).tunique().count_wrd() = 
wrd(1));
      par_l...@batloop() {
         var iter_tjPre;
         var ftc_term := pfop_query.fetch(1...@0).fetch(int($h));
@@ -3233,7 +3233,8 @@
         var err := CATCH({
           var sn_iter := pfop_sn.fetch(0...@0);
           var sn_iteration := pfop_query.fetch(0...@0).fetch(int($h));
-          sn_iter := sn_iter.select(sn_iteration);
+         if ( not(single_val_opt) )
+              sn_iter := sn_iter.select(sn_iteration);
           var sn_item := pfop_sn.fetch(1...@0).semijoin(sn_iter);
           var sn_kind := pfop_sn.fetch(2...@0).semijoin(sn_iter);
   
@@ -3268,6 +3269,9 @@
         });
         lock_unset(tijah_lock);
         if (not(isnil(err))) ERROR(err);
+        
+       if ( single_val_opt )
+           break;
      }
      var result_item_b;
      result_iter   := pfop_sn.fetch(0...@0);


------------------------------------------------------------------------------
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

Reply via email to