Changeset: 5e24305af923 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e24305af923
Modified Files:
MonetDB.spec
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures_nogeom.stable.out
clients/Tests/exports.stable.out
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_atoms.h
gdk/gdk_heap.c
gdk/gdk_private.h
gdk/gdk_storage.c
geom/monetdb5/geom.c
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_instruction.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/blob.mal
monetdb5/modules/atoms/xml.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/tablet.c
sql/backends/monet5/sql_result.c
Branch: int128
Log Message:
Merge with changeset e02db68c8c4d
diffs (truncated from 923 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -731,7 +731,7 @@ developer, but if you do want to test, t
--with-valgrind=no \
%{?comp_cc:CC="%{comp_cc}"}
-make
+make -j
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -41139,8 +41139,6 @@ command blob.blob(s:blob):blob
address BLOBblob_blob;
comment Noop routine.
-command blob.#convert():void
-address BLOBconvert;
command blob.#del():void
address BLOBdel;
command blob.#fromstr():void
@@ -49547,7 +49545,7 @@ comment Abort a query after n seconds.
pattern clients.setsession(n:lng):void
address CLTsetSessionTimeout;
-
+comment Abort a session after n seconds.
pattern clients.suspend(id:int):void
address CLTsuspend;
diff --git a/clients/Tests/MAL-signatures_nogeom.stable.out
b/clients/Tests/MAL-signatures_nogeom.stable.out
--- a/clients/Tests/MAL-signatures_nogeom.stable.out
+++ b/clients/Tests/MAL-signatures_nogeom.stable.out
@@ -32205,8 +32205,6 @@ command blob.blob(s:blob):blob
address BLOBblob_blob;
comment Noop routine.
-command blob.#convert():void
-address BLOBconvert;
command blob.#del():void
address BLOBdel;
command blob.#fromstr():void
@@ -38742,9 +38740,13 @@ address CLTsetTimeout;
comment Abort a query after q seconds (q=0 means run undisturbed).The session
timeout aborts the connection after spending toomany seconds on query
processing.
pattern clients.settimeout(n:lng):void
-address CLTsettimeout;
+address CLTsetTimeout;
comment Abort a query after n seconds.
+pattern clients.setsession(n:lng):void
+address CLTsetSessionTimeout;
+comment Abort a session after n seconds.
+
pattern clients.suspend(id:int):void
address CLTsuspend;
comment Put a client process to sleep for some time.It will simple sleep for a
second at a time, untilthe awake bit has been set in its descriptor
@@ -42676,7 +42678,7 @@ address MTIMEepoch2int;
comment unix-time (epoch) support: seconds since epoch
command timestamp.epoch{unsafe}():timestamp
-address MTIMEepoch;
+address MTIMEcurrent_timestamp;
comment unix-time (epoch) support: seconds since the Unix epoch
command timestamp.#fromstr():timestamp
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1022,7 +1022,6 @@ str BKCunload(bit *res, str *input);
str BLOB_isnil(bit *retval, blob *val);
str BLOBblob_blob(blob **d, blob **s);
str BLOBblob_fromstr(blob **b, str *d);
-void BLOBconvert(blob *b, int direction);
void BLOBdel(Heap *h, var_t *index);
str BLOBeoln(char *src, char *end);
str BLOBfromblob(str *retval, blob **b);
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
+* Wed Oct 2 2013 Sjoerd Mullender <[email protected]>
+- Removed some unused fields in the atomDesc structure. This change
+ requires a complete recompilation of the whole suite.
+
* Tue Jan 22 2013 Sjoerd Mullender <[email protected]>
- Replaced the mutex implementation for both GNU C and Visual Studio with
a home-grown implementation that uses atomic instructions (__sync_*()
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1047,8 +1047,6 @@ gdk_export size_t HEAPmemsize(Heap *h);
* HEAP_private (Heap* h)
* @item void
* HEAP_printstatus (Heap* h)
- * @item void
- * HEAP_check (Heap* h)
* @end table
*
* The heap space starts with a private space that is left untouched
@@ -1058,16 +1056,6 @@ gdk_export size_t HEAPmemsize(Heap *h);
* previously allocated chunk HEAP_private returns an integer index to
* private space.
*/
-/* structure used by HEAP_check functions */
-typedef struct {
- size_t minpos; /* minimum block byte-index */
- size_t maxpos; /* maximum block byte-index */
- int alignment; /* block index alignment */
- int *validmask; /* bitmap with all valid byte-indices
- * first bit corresponds with 'minpos';
- * 2nd bit with 'minpos+alignment', etc
- */
-} HeapRepair;
gdk_export void HEAP_initialize(
Heap *heap, /* nbytes -- Initial size of the heap. */
@@ -1951,17 +1939,11 @@ gdk_export BAT *BBPquickdesc(bat b, int
* @item int
* @tab ATOMcmp (int id, ptr val_1, ptr val_2);
* @item int
- * @tab ATOMconvert (int id, ptr v, int direction);
- * @item int
* @tab ATOMfix (int id, ptr v);
* @item int
* @tab ATOMunfix (int id, ptr v);
* @item int
* @tab ATOMheap (int id, Heap *hp, size_t cap);
- * @item void
- * @tab ATOMheapconvert (int id, Heap *hp, int direction);
- * @item int
- * @tab ATOMheapcheck (int id, Heap *hp, HeapRepair *hr);
* @item int
* @tab ATOMput (int id, Heap *hp, BUN pos_dst, ptr val_src);
* @item int
@@ -2086,14 +2068,13 @@ typedef struct {
ptr atomNull; /* global nil value */
/* generic (fixed + varsized atom) ADT functions */
- int (*atomFromStr) (const char *s, int *len, ptr *dst);
- int (*atomToStr) (str *s, int *len, const void *src);
- void *(*atomRead) (ptr a, stream *s, size_t cnt);
- int (*atomWrite) (const void *a, stream *s, size_t cnt);
+ int (*atomFromStr) (const char *src, int *len, ptr *dst);
+ int (*atomToStr) (str *dst, int *len, const void *src);
+ void *(*atomRead) (void *dst, stream *s, size_t cnt);
+ int (*atomWrite) (const void *src, stream *s, size_t cnt);
int (*atomCmp) (const void *v1, const void *v2);
BUN (*atomHash) (const void *v);
/* optional functions */
- void (*atomConvert) (ptr v, int direction);
int (*atomFix) (const void *atom);
int (*atomUnfix) (const void *atom);
@@ -2102,9 +2083,6 @@ typedef struct {
void (*atomDel) (Heap *, var_t *atom);
int (*atomLen) (const void *atom);
void (*atomHeap) (Heap *, size_t);
- /* optional functions */
- void (*atomHeapConvert) (Heap *, int direction);
- int (*atomHeapCheck) (Heap *, HeapRepair *);
} atomDesc;
gdk_export atomDesc BATatoms[];
@@ -2501,21 +2479,6 @@ VALptr(const ValRecord *v)
#define FORCEMITOMASK (1<<29)
#define FORCEMITODEBUG if (GDKdebug & FORCEMITOMASK)
-#define short_int_SWAP(s) ((short)(((0x00ff&(s))<<8) | ((0xff00&(s))>>8)))
-
-#define normal_int_SWAP(i) (((0x000000ff&(i))<<24) | ((0x0000ff00&(i))<<8) | \
- ((0x00ff0000&(i))>>8) | ((0xff000000&(i))>>24))
-
-#define long_long_SWAP(l) \
- ((((lng)normal_int_SWAP(l))<<32) |\
- (0xffffffff&normal_int_SWAP(l>>32)))
-
-#ifdef HAVE_HGE
-#define huge_int_SWAP(h) \
- ((((hge)long_long_SWAP(h))<<64) |\
- (0xffffffffffffffff&long_long_SWAP(h>>64)))
-#endif
-
/*
* The kernel maintains a central table of all active threads. They
* are indexed by their tid. The structure contains information on the
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -120,32 +120,6 @@ hgeHash(const hge *v)
/*
* @+ Standard Atoms
*/
-static inline void
-shtConvert(sht *s)
-{
- *s = short_int_SWAP(*s);
-}
-
-static inline void
-intConvert(int *s)
-{
- *s = normal_int_SWAP(*s);
-}
-
-static inline void
-lngConvert(lng *s)
-{
- *s = long_long_SWAP(*s);
-}
-
-#ifdef HAVE_HGE
-static inline void
-hgeConvert(hge *s)
-{
- *s = huge_int_SWAP(*s);
-}
-#endif
-
static inline int
batFix(const bat *b)
{
@@ -288,14 +262,8 @@ ATOMproperty(str id, str property, GDKfc
BATatoms[t].varsized = 1;
BATatoms[t].align = sizeof(var_t);
atomset(BATatoms[t].atomHeap, (void (*)(Heap *,
size_t)) arg);
- } else if (strcmp("heapconvert", property) == 0) {
- atomset(BATatoms[t].atomHeapConvert, (void (*)(Heap *,
int)) arg);
- } else if (strcmp("check", property) == 0) {
- atomset(BATatoms[t].atomHeapCheck, (int (*)(Heap *,
HeapRepair *)) arg);
} else if (strcmp("del", property) == 0) {
atomset(BATatoms[t].atomDel, (void (*)(Heap *, var_t
*)) arg);
- } else if (strcmp("convert", property) == 0) {
- atomset(BATatoms[t].atomConvert, (void (*)(void *,
int)) arg);
} else if (strcmp("put", property) == 0) {
atomset(BATatoms[t].atomPut, (var_t (*)(Heap *, var_t
*, const void *)) arg);
} else if (strcmp("null", property) == 0) {
@@ -1859,24 +1827,22 @@ atomDesc BATatoms[MAXATOMS] = {
(int (*)(const char *, int *, ptr *)) OIDfromStr, (int (*)(str *, int
*, const void *)) OIDtoStr,
(void *(*)(void *, stream *, size_t)) voidRead, (int (*)(const void *,
stream *, size_t)) voidWrite,
(int (*)(const void *, const void *)) intCmp,
- (BUN (*)(const void *)) intHash, 0,
+ (BUN (*)(const void *)) intHash,
#else
TYPE_void, 1, 0, /* sizeof(void) */ 0, 0, 1, (ptr) &oid_nil,
(int (*)(const char *, int *, ptr *)) OIDfromStr, (int (*)(str *, int
*, const void *)) OIDtoStr,
(void *(*)(void *, stream *, size_t)) voidRead, (int (*)(const void *,
stream *, size_t)) voidWrite,
(int (*)(const void *, const void *)) lngCmp,
- (BUN (*)(const void *)) lngHash, 0,
+ (BUN (*)(const void *)) lngHash,
#endif
0, 0,
0, 0,
- 0, 0,
0, 0},
{"bit", TYPE_bte, 1, sizeof(bit), sizeof(bit), 0, 0, (ptr) &bte_nil,
(int (*)(const char *, int *, ptr *)) bitFromStr, (int (*)(str *, int
*, const void *)) bitToStr,
(void *(*)(void *, stream *, size_t)) bitRead, (int (*)(const void *,
stream *, size_t)) bitWrite,
(int (*)(const void *, const void *)) bteCmp,
- (BUN (*)(const void *)) bteHash, 0,
- 0, 0,
+ (BUN (*)(const void *)) bteHash,
0, 0,
0, 0,
0, 0},
@@ -1884,8 +1850,7 @@ atomDesc BATatoms[MAXATOMS] = {
(int (*)(const char *, int *, ptr *)) bteFromStr, (int (*)(str *, int
*, const void *)) bteToStr,
(void *(*)(void *, stream *, size_t)) bteRead, (int (*)(const void *,
stream *, size_t)) bteWrite,
(int (*)(const void *, const void *)) bteCmp,
- (BUN (*)(const void *)) bteHash, 0,
- 0, 0,
+ (BUN (*)(const void *)) bteHash,
0, 0,
0, 0,
0, 0},
@@ -1893,8 +1858,7 @@ atomDesc BATatoms[MAXATOMS] = {
(int (*)(const char *, int *, ptr *)) shtFromStr, (int (*)(str *, int
*, const void *)) shtToStr,
(void *(*)(void *, stream *, size_t)) shtRead, (int (*)(const void *,
stream *, size_t)) shtWrite,
(int (*)(const void *, const void *)) shtCmp,
- (BUN (*)(const void *)) shtHash, (void (*)(ptr, int)) shtConvert,
- 0, 0,
+ (BUN (*)(const void *)) shtHash,
0, 0,
0, 0,
0, 0},
@@ -1902,17 +1866,15 @@ atomDesc BATatoms[MAXATOMS] = {
(int (*)(const char *, int *, ptr *)) batFromStr, (int (*)(str *, int
*, const void *)) batToStr,
(void *(*)(void *, stream *, size_t)) batRead, (int (*)(const void *,
stream *, size_t)) batWrite,
(int (*)(const void *, const void *)) intCmp,
- (BUN (*)(const void *)) intHash, (void (*)(ptr, int)) intConvert,
+ (BUN (*)(const void *)) intHash,
(int (*)(const void *)) batFix, (int (*)(const void *)) batUnfix,
0, 0,
- 0, 0,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
