Changeset: a7584505e21f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a7584505e21f
Modified Files:
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_relop.mx
gdk/gdk_utils.c
gdk/gdk_value.c
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out
sql/test/Tests/systemfunctions_nogeom.stable.out
sql/test/leaks/Tests/check0_nogeom.stable.out
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (truncated from 669 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1449,8 +1449,6 @@ bat_iterator(BAT *b)
* @item void
* @tab BATsetcount (BAT *b, BUN cnt)
* @item BUN
- * @tab BATbuncount (BAT *b)
- * @item str
* @tab BATrename (BAT *b, str nme)
* @item BAT *
* @tab BATkey (BAT *b, int onoff)
@@ -1469,10 +1467,6 @@ bat_iterator(BAT *b)
* The function BATcount returns the number of associations stored in
* the BAT.
*
- * The function BATbuncount returns the space that is occupied in
- * associations in the BAT. This is not the same as BATcount, since
- * the first N associations may be unused or delta data.
- *
* The BAT is given a new logical name using BATrename.
*
* The integrity properties to be maintained for the BAT are
@@ -2266,8 +2260,6 @@ gdk_export str GDKstrdup(const char *s);
* @tab
* GDKmessage
* @item bit
- * @tab GDKsilent
- * @item int
* @tab
* GDKfatal(str msg)
* @item int
@@ -2293,9 +2285,8 @@ gdk_export str GDKstrdup(const char *s);
* should show if this mechanism is sufficient. Most routines return
* a pointer with zero to indicate an error.
*
- * The error messages are also copied to standard output unless
- * GDKsilent is set to a non-zero value. The last error message is
- * kept around in a global variable.
+ * The error messages are also copied to standard output. The last
+ * error message is kept around in a global variable.
*
* Error messages can also be collected in a user-provided buffer,
* instead of being echoed to a stream. This is a thread-specific
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -519,7 +519,7 @@ BATmaterialize(BAT *b)
* The @#VIEWunlink@ routine cuts a reference to the parent. Part of the view
* destroy sequence.
*/
-void
+static void
VIEWunlink(BAT *b)
{
if (b) {
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -48,7 +48,7 @@ shtCmp(const sht *l, const sht *r)
return simple_CMP(l, r, sht);
}
-int
+static int
intCmp(const int *l, const int *r)
{
return simple_CMP(l, r, int);
@@ -60,7 +60,7 @@ fltCmp(const flt *l, const flt *r)
return simple_CMP(l, r, flt);
}
-int
+static int
lngCmp(const lng *l, const lng *r)
{
return simple_CMP(l, r, lng);
@@ -1049,7 +1049,7 @@ strCmpNoNil(const unsigned char *l, cons
return (*l < *r) ? -1 : 1;
}
-void
+static void
strHeap(Heap *d, size_t cap)
{
size_t size;
@@ -1120,7 +1120,7 @@ strLocate(Heap *h, const char *v)
return 0;
}
-var_t
+static var_t
strPut(Heap *h, var_t *dst, const char *v)
{
size_t elimbase = GDK_ELIMBASE(h->free);
@@ -1627,7 +1627,7 @@ OIDbase(oid o)
return o;
}
-oid
+static oid
OIDseed(oid o)
{
oid t, p = GDKoid;
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2086,17 +2086,6 @@ BATsetcount(BAT *b, BUN cnt)
assert(b->batCapacity >= cnt);
}
-/*
- * The alternative routine is BATbuncount, which calculates the total
- * buns in use.
- */
-BUN
-BATbuncount(BAT *b)
-{
- BATcheck(b, "BATbuncount");
- return BUNlast(b);
-}
-
size_t
BATvmsize(BAT *b, int dirty)
{
@@ -2277,20 +2266,6 @@ BATroles(BAT *b, const char *hnme, const
return b;
}
-BAT *
-BATcol_name(BAT *b, const char *tnme)
-{
- BATcheck(b, "BATcol_name");
- if (b->tident && !default_ident(b->tident))
- GDKfree(b->tident);
- if (tnme)
- b->tident = GDKstrdup(tnme);
- else
- b->tident = BATstring_t;
- return b;
-}
-
-
/*
* @- BATmmap
* Changing the storage status of heaps in a BAT is done in BATmmap.
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1194,18 +1194,6 @@ BATorder_rev(BAT *b)
}
BAT *
-BATsorder(BAT *b)
-{
- return BATorder_internal(b, 1, 0, 0, "BATsorder");
-}
-
-BAT *
-BATsorder_rev(BAT *b)
-{
- return BATorder_internal(b, 1, 1, 0, "BATsorder_rev");
-}
-
-BAT *
BATsort(BAT *b)
{
return BATorder_internal(b, 0, 0, 1, "BATsort");
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2233,19 +2233,6 @@ BBPkeepref(bat i)
}
void
-BBPreleaselref(bat i)
-{
- int lock = locked_by ? BBP_getpid() != locked_by : 1;
-
- if (i == bat_nil)
- return;
- if (i < 0)
- i = -i;
- assert(BBP_lrefs(i) > 0);
- decref(i, TRUE, FALSE, lock);
-}
-
-void
BBPreleaseref(bat i)
{
int lock = locked_by ? BBP_getpid() != locked_by : 1;
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -789,7 +789,7 @@ win_rmdir(const char *pathname)
char buf[128], *p = reduce_dir_name(pathname, buf, sizeof(buf));
int ret = _rmdir(p);
- if (ret < 0) {
+ if (ret < 0 && errno != ENOENT) {
/* it could be the <expletive deleted> indexing
* service which prevents us from doing what we have a
* right to do, so try again (once) */
@@ -814,7 +814,7 @@ win_unlink(const char *pathname)
(void) SetFileAttributes(pathname, FILE_ATTRIBUTE_NORMAL);
ret = _unlink(pathname);
}
- if (ret < 0) {
+ if (ret < 0 && errno != ENOENT) {
/* it could be the <expletive deleted> indexing
* service which prevents us from doing what we have a
* right to do, so try again (once) */
@@ -831,7 +831,7 @@ win_rename(const char *old, const char *
{
int ret = rename(old, new);
- if (ret < 0) {
+ if (ret < 0 && errno != ENOENT) {
/* it could be the <expletive deleted> indexing
* service which prevents us from doing what we have a
* right to do, so try again (once) */
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -27,41 +27,32 @@ int ATOMunknown_add(const char *nme);
int ATOMunknown_del(int a);
int ATOMunknown_find(const char *nme);
str ATOMunknown_name(int a);
-BUN BATbuncount(BAT *b);
int BATcheckmodes(BAT *b, int persistent);
BAT *BATclone(BAT *b, BUN capacity);
-BAT *BATcol_name(BAT *b, const char *tnme);
BATstore *BATcreatedesc(int ht, int tt, int heapnames);
void BATdestroy(BATstore *bs);
int BATfree(BAT *b);
gdk_return BATgroup_internal(BAT **groups, BAT **extents, BAT **histo, BAT *b,
BAT *g, BAT *e, BAT *h, int subsorted);
BUN BATguess(BAT *b);
void BATinit_idents(BAT *bn);
-BAT *BATleftmergejoin(BAT *l, BAT *r, BUN estimate);
-BAT *BATleftthetajoin(BAT *l, BAT *r, int mode, BUN estimate);
BAT *BATload_intern(bat bid, int lock);
BAT *BATmaterializet(BAT *b);
int BATmultijoin(int argc, BAT *argv[], RowFcn tuple_fcn, ptr tuple_data,
ColFcn value_fcn[], ptr value_data[], int orderspec);
void BATpropagate(BAT *dst, BAT *src, int idx);
str BATrename(BAT *b, const char *nme);
void BATsetdims(BAT *b);
-BAT *BATsorder(BAT *b);
-BAT *BATsorder_rev(BAT *b);
size_t BATvmsize(BAT *b, int dirty);
void BBPcacheit(BATstore *bs, int lock);
-void BBPdumpcache(void); /* never called: for debugging only */
void BBPdump(void); /* never called: for debugging only */
void BBPexit(void);
void BBPinit(void);
bat BBPinsert(BATstore *bs);
-void BBPreleaselref(bat i);
void BBPtrim(size_t delta);
void BBPunshare(bat b);
void GDKclrerr(void);
int GDKfdlocate(const char *nme, const char *mode, const char *ext);
FILE *GDKfilelocate(const char *nme, const char *mode, const char *ext);
char *GDKload(const char *nme, const char *ext, size_t size, size_t chunk,
storage_t mode);
-void GDKlockHome(void);
void GDKlog(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
void *GDKmallocmax(size_t size, size_t *maxsize, int emergency);
@@ -86,8 +77,6 @@ int HEAPload(Heap *h, const char *nme, c
int HEAP_mmappable(Heap *heap);
int HEAPsave(Heap *h, const char *nme, const char *ext);
int HEAPwarm(Heap *h);
-int intCmp(const int *r, const int *l);
-int lngCmp(const lng *r, const lng *l);
oid MAXoid(BAT *i);
void MT_global_exit(int status)
__attribute__((__noreturn__));
@@ -95,21 +84,14 @@ void MT_init_posix(void);
int MT_msync(void *p, size_t off, size_t len, int mode);
int OIDdirty(void);
int OIDinit(void);
-oid *oidRead(oid *a, stream *s, size_t cnt);
oid OIDread(str buf);
-oid OIDseed(oid seed);
-int oidWrite(oid *a, stream *s, size_t cnt);
int OIDwrite(stream *fp);
void strCleanHash(Heap *hp, int rebuild);
int strCmpNoNil(const unsigned char *l, const unsigned char *r);
int strElimDoubles(Heap *h);
-void strHeap(Heap *d, size_t cap);
var_t strLocate(Heap *h, const char *v);
-var_t strPut(Heap *b, var_t *off, const char *src);
-int VALprint(stream *fd, const ValRecord *res);
void VIEWdestroy(BAT *b);
BAT *VIEWreset(BAT *b);
-void VIEWunlink(BAT *b);
int IMPSgetbin(int tpe, bte bits, char *bins, const void *v);
void IMPSremove(BAT *b);
void IMPSprint(BAT *b);
@@ -134,8 +116,6 @@ extern batlock_t GDKbatLock[BBP_BATMASK
extern bbplock_t GDKbbpLock[BBP_THREADMASK + 1];
extern size_t GDK_mmap_minsize; /* size after which we use memory
mapped files */
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
