Update of /cvsroot/monetdb/sql/src/storage
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12848/src/storage
Modified Files:
sql_storage.h
Log Message:
propagated changes of Wednesday Aug 12 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/08/12 - stmane: src/storage/sql_storage.h,1.57.2.2
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_storage.h
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/sql_storage.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- sql_storage.h 5 Aug 2009 08:51:51 -0000 1.58
+++ sql_storage.h 12 Aug 2009 17:40:52 -0000 1.59
@@ -47,11 +47,11 @@
extern store_type active_store_type;
/* relational interface */
-typedef ssize_t (*column_find_row_fptr)(sql_trans *tr, sql_column *c, void
*value, ...);
-typedef void *(*column_find_value_fptr)(sql_trans *tr, sql_column *c, ssize_t
rid);
-typedef int (*column_update_value_fptr)(sql_trans *tr, sql_column *c, ssize_t
rid, void *value);
+typedef oid (*column_find_row_fptr)(sql_trans *tr, sql_column *c, void *value,
...);
+typedef void *(*column_find_value_fptr)(sql_trans *tr, sql_column *c, oid rid);
+typedef int (*column_update_value_fptr)(sql_trans *tr, sql_column *c, oid rid,
void *value);
typedef int (*table_insert_fptr)(sql_trans *tr, sql_table *t, ...);
-typedef int (*table_delete_fptr)(sql_trans *tr, sql_table *t, ssize_t rid);
+typedef int (*table_delete_fptr)(sql_trans *tr, sql_table *t, oid rid);
typedef struct rids {
BUN cur;
@@ -67,7 +67,7 @@
typedef rids *(*rids_join_fptr)( sql_trans *tr, rids *l, sql_column *lc, rids
*r, sql_column *rc);
/* return table rids from result of table_select, return (-1) when done */
-typedef ssize_t (*rids_next_fptr)(rids *r);
+typedef oid (*rids_next_fptr)(rids *r);
/* clean up the resources taken by the result of table_select */
typedef void (*rids_destroy_fptr)(rids *r);
@@ -100,7 +100,7 @@
*/
typedef void (*append_col_fptr) (sql_trans *tr, sql_column *c, void *d, int t);
typedef void (*append_idx_fptr) (sql_trans *tr, sql_idx *i, void *d, int t);
-typedef void (*update_col_fptr) (sql_trans *tr, sql_column *c, void *d, int t,
ssize_t rid);
+typedef void (*update_col_fptr) (sql_trans *tr, sql_column *c, void *d, int t,
oid rid);
typedef void (*update_idx_fptr) (sql_trans *tr, sql_idx *i, void *d, int t);
typedef void (*delete_tab_fptr) (sql_trans *tr, sql_table *t, void *d, int
tpe);
------------------------------------------------------------------------------
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
