Update of /cvsroot/monetdb/sql/src/storage/restrict
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29040/src/storage/restrict
Modified Files:
restrict_table.mx
Log Message:
propagated changes of Thursday Nov 19 2009 - Saturday Nov 28 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/11/19 - nielsnes: src/storage/restrict/restrict_table.mx,1.6.2.1
fixed performance issue with loading (in readonly mode) complex schema's
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: restrict_table.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/restrict/restrict_table.mx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- restrict_table.mx 12 Aug 2009 17:41:34 -0000 1.6
+++ restrict_table.mx 28 Nov 2009 19:58:03 -0000 1.7
@@ -44,19 +44,34 @@
#include "restrict_storage.h"
static BAT *
-full_column(sql_column *c, BAT *d, BAT *s )
+full_column_(sql_column *c, BAT *d, BAT *s )
{
sql_bat *bat = c->data;
BAT *r, *b = temp_descriptor(bat->bid);
+
if (s) {
BAT *t = BATsemijoin(b,s); bat_destroy(b); b = t;
}
if (d && BATcount(d)) {
r = BATkdiff(b,BATmirror(d)); bat_destroy(b); b = r;
}
+ if (!bat->cached && !c->base.wtime && !s)
+ bat->cached = temp_descriptor(b->batCacheid);
return b;
}
+static BAT *
+full_column(sql_column *c, BAT *d, BAT *s )
+{
+ sql_bat *bat = c->data;
+
+ if (bat->cached && s)
+ return BATsemijoin(bat->cached, s);
+ if (bat->cached)
+ return temp_descriptor(bat->cached->batCacheid);
+ return full_column_( c, d, s);
+}
+
static oid
column_find_row(sql_trans *tr, sql_column *c, void *value, ...)
{
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
