Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12736/src/backends/monet5
Modified Files:
sql.mx
Log Message:
propagated changes of Wednesday Aug 12 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/08/12 - stmane: src/backends/monet5/sql.mx,1.347.2.1
In an attampt to ensure portability to, and hence correctness on,
64-bit big-endian machines with 32-bit OIDs,
we make the SQL storage interface implementation a bit "less generic",
but a bit "more MonetDB-specific",
by using type oid instead of type ssize_t
for row indices / row ids ("rid")
that are stored as type oid in BATs.
(For convenience, these changes are wrapped in CVS tags
"rid-ssize_t" & "rid-oid".)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -d -r1.349 -r1.350
--- sql.mx 9 Aug 2009 07:19:11 -0000 1.349
+++ sql.mx 12 Aug 2009 17:40:35 -0000 1.350
@@ -4186,7 +4186,7 @@
char buff[24];
mvc *m = NULL;
int id = 0;
- ssize_t rid = -1;
+ oid rid = oid_nil;
str msg = getContext(cntxt, mb, &m, NULL);
if (msg)
@@ -4198,7 +4198,7 @@
gid = mvc_bind_column(m, g_tbl, "gid");
rid = table_funcs.column_find_row(m->session->tr, gname, *name, NULL);
- if (rid != -1) {
+ if (rid != oid_nil) {
throw(SQL,"sql.rdfShred","graph name allready exists in
rdf.graph");
}
id = (int) store_funcs.count_col(gname);
------------------------------------------------------------------------------
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
