Update of /cvsroot/monetdb/sql/src/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12834/src/include
Modified Files:
Tag: GDK-2
sql_catalog.h sql_mem.h
Log Message:
propagated changes of Monday Sep 03 2007 - Thursday Sep 06 2007
from the development trunk to the GDK-2 branch
Index: sql_catalog.h
===================================================================
RCS file: /cvsroot/monetdb/sql/src/include/sql_catalog.h,v
retrieving revision 1.49
retrieving revision 1.49.4.1
diff -u -d -r1.49 -r1.49.4.1
--- sql_catalog.h 23 May 2007 22:05:58 -0000 1.49
+++ sql_catalog.h 6 Sep 2007 13:52:00 -0000 1.49.4.1
@@ -183,24 +183,6 @@
struct sql_table *comp_type;
} sql_subtype;
-typedef struct sql_aggr {
- sql_base base;
-
- char *imp;
- char *mod;
- sql_subtype tpe;
- sql_subtype res;
- int nr;
- sql_schema *s;
-} sql_aggr;
-
-typedef struct sql_subaggr {
- sql_ref ref;
-
- sql_aggr *aggr;
- sql_subtype res;
-} sql_subaggr;
-
/* sql_func need type transform rules types are equal if underlying
* types are equal + scale is equal if types do not mach we try type
* conversions which means for simple 1 arg functions
@@ -247,26 +229,12 @@
sql_subtype res;
} sql_subfunc;
-typedef struct pbat {
- /* TODO merge name and uname into one string
- * name = pb->nme+2 (skip U_)
- * uname = pb->nme
- */
- char *nme;
- oid base; /* hseqbase, columns aren't dense ranges */
- int clustered; /* stable bats could be clustered */
- int bid;
-
- int ubid; /* updates per pbat ? */
-} pbat;
+typedef struct sql_subaggr {
+ sql_ref ref;
-typedef struct sql_bat {
- char *name; /* name of the main bat */
- char *uname; /* name of updates bat */
- int bid;
- int ibid; /* bat with inserts */
- int ubid; /* bat with updates */
-} sql_bat;
+ sql_func *aggr;
+ sql_subtype res;
+} sql_subaggr;
typedef enum key_type {
pkey,
@@ -291,7 +259,7 @@
struct list *columns; /* list of sql_kc */
struct sql_table *t;
struct sql_key *key; /* key */
- sql_bat bat;
+ void *data;
} sql_idx;
/* fkey consists of two of these */
@@ -388,8 +356,7 @@
char unique; /* NOT UNIQUE, UNIQUE, SUB_UNIQUE */
struct sql_table *t;
- sql_bat bat;
-
+ void *data;
} sql_column;
typedef enum table_types {
@@ -423,9 +390,7 @@
changeset triggers;
int cleared; /* cleared in the current transaction */
- char *dname; /* name of the persistent deletes bat */
- int dbid; /* bat with deletes */
-
+ void *data;
struct sql_schema *s;
} sql_table;
Index: sql_mem.h
===================================================================
RCS file: /cvsroot/monetdb/sql/src/include/sql_mem.h,v
retrieving revision 1.17
retrieving revision 1.17.6.1
diff -u -d -r1.17 -r1.17.6.1
--- sql_mem.h 3 Jan 2007 12:39:45 -0000 1.17
+++ sql_mem.h 6 Sep 2007 13:52:00 -0000 1.17.6.1
@@ -49,6 +49,7 @@
#endif
#define NEW( type ) (type*)GDKmalloc(sizeof(type) )
+#define ZNEW( type ) (type*)GDKzalloc(sizeof(type) )
#define NEW_ARRAY( type, size ) (type*)GDKmalloc((size)*sizeof(type))
#define RENEW_ARRAY( type,ptr,size)
(type*)GDKrealloc((void*)ptr,(size)*sizeof(type))
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
