Changeset: 9b3855848baf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9b3855848baf
Modified Files:
sql/common/sql_mem.c
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/include/sql_mem.h
Branch: no_type_bat
Log Message:
cleanup / moved some sql code from sql_mem into sql_types
diffs (113 lines):
diff --git a/sql/common/sql_mem.c b/sql/common/sql_mem.c
--- a/sql/common/sql_mem.c
+++ b/sql/common/sql_mem.c
@@ -13,27 +13,6 @@
#define SA_BLOCK (64*1024)
-sql_ref *
-sql_ref_init(sql_ref *r)
-{
- r->refcnt = 1;
- return r;
-}
-
-int
-sql_ref_inc(sql_ref *r)
-{
- assert(r->refcnt > 0);
- return (++r->refcnt);
-}
-
-int
-sql_ref_dec(sql_ref *r)
-{
- assert(r->refcnt > 0);
- return (--r->refcnt);
-}
-
typedef struct freed_t {
struct freed_t *n;
size_t sz;
@@ -256,11 +235,3 @@ size_t sa_size( sql_allocator *sa )
{
return sa->usedmem;
}
-
-void
-c_delete( const void *p )
-{
- void *xp = (void*)p;
-
- GDKfree(xp);
-}
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -30,6 +30,27 @@ list *funcs = NULL;
static sql_type *BIT = NULL;
static list *localtypes = NULL;
+sql_ref *
+sql_ref_init(sql_ref *r)
+{
+ r->refcnt = 1;
+ return r;
+}
+
+int
+sql_ref_inc(sql_ref *r)
+{
+ assert(r->refcnt > 0);
+ return (++r->refcnt);
+}
+
+int
+sql_ref_dec(sql_ref *r)
+{
+ assert(r->refcnt > 0);
+ return (--r->refcnt);
+}
+
unsigned int digits2bits(unsigned int digits)
{
if (digits < 3)
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -188,6 +188,15 @@ typedef enum commit_action_t {
} ca_t;
typedef int sqlid;
+
+typedef struct sql_ref {
+ int refcnt;
+} sql_ref;
+
+extern sql_ref *sql_ref_init(sql_ref *r);
+extern int sql_ref_inc(sql_ref *r);
+extern int sql_ref_dec(sql_ref *r);
+
typedef void *sql_store;
typedef struct sql_base {
diff --git a/sql/include/sql_mem.h b/sql/include/sql_mem.h
--- a/sql/include/sql_mem.h
+++ b/sql/include/sql_mem.h
@@ -37,16 +37,6 @@
#define _DELETE( ptr ) do { GDKfree(ptr); ptr = NULL; } while (0)
#define _STRDUP( ptr ) GDKstrdup((char*)ptr)
-extern void c_delete( const void *p );
-
-typedef struct sql_ref {
- int refcnt;
-} sql_ref;
-
-extern sql_ref *sql_ref_init(sql_ref *r);
-extern int sql_ref_inc(sql_ref *r);
-extern int sql_ref_dec(sql_ref *r);
-
typedef struct sql_allocator {
struct sql_allocator *pa;
size_t size;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
