Changeset: 6eaf38037e26 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6eaf38037e26
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures_gsl.stable.out
clients/Tests/MAL-signatures_nocfitsio.stable.out
clients/Tests/MAL-signatures_sphinxclient.stable.out
clients/Tests/exports.stable.out
monetdb5/modules/atoms/Tests/uuid00.mal
monetdb5/modules/atoms/Tests/uuid00.stable.out
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/uuid.mal
sql/backends/monet5/rest/Tests/jsonstore00.stable.out
sql/backends/monet5/rest/Tests/jsonstore01.stable.out
sql/test/BugTracker-2013/Tests/restore-uuid.Bug-3407.stable.out
sql/test/testdb/Tests/testdb-dump.stable.out
sql/test/testdb/Tests/testdb-dump.stable.out.Windows
sql/test/testdb/Tests/testdb-load.sql
Branch: default
Log Message:
Reimplemented the UUID type using fixed sized atoms.
diffs (truncated from 896 to 300 lines):
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
@@ -38116,6 +38116,10 @@ address bte_dec2second_interval;
comment cast bte decimal to a second_interval
function calc.surface{unsafe}(wkt:str):wkb;
+command calc.str(s:uuid):str
+address UUIDuuid2str;
+comment Coerce a uuid to a string type
+
command calc.sqlblob(s:str):sqlblob
address BLOBsqlblob_fromstr;
command calc.sqlblob(b:sqlblob):sqlblob
@@ -38472,10 +38476,6 @@ command calc.timestamp(t:timestamp):time
address MTIMEtimestamp2timestamp;
command calc.timestamp(s:str):timestamp
address MTIMEtimestamp_fromstr;
-command calc.uuid(s:uuid):str
-address UUIDuuid2str;
-comment Coerce a uuid to a string type
-
command calc.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
@@ -43187,30 +43187,38 @@ command url.url(s:str):url
address URLnew;
comment Create an URL from a string literal
+command uuid.#cmp():int
+address UUIDcompare;
command uuid.#fromstr():uuid
address UUIDfromString;
-comment Convert string to uuid
-
-command uuid.isaUUID(u:uuid):bit
+command uuid.#hash():int
+address UUIDhash;
+command uuid.isaUUID(u:str):bit
address UUIDisaUUID;
comment Test a string for a UUID format
command uuid.new():uuid
address UUIDgenerateUuid;
-comment Generate uuid
-
+comment Generate a new uuid
+
+command uuid.#null():uuid
+address UUIDnull;
+command uuid.prelude():void
+address UUIDprelude;
+command uuid.#read():uuid
+address UUIDread;
command uuid.str(u:uuid):str
address UUIDuuid2str;
comment Coerce a uuid to its string type
command uuid.#tostr():str
address UUIDtoString;
-comment Convert uuid to string equivalent
-
command uuid.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
+command uuid.#write():int
+address UUIDwrite;
command wkb.FromText{unsafe}(w:str,type:int):wkb
address wkbFromText;
command wkb.#cmp():int
diff --git a/clients/Tests/MAL-signatures_gsl.stable.out
b/clients/Tests/MAL-signatures_gsl.stable.out
--- a/clients/Tests/MAL-signatures_gsl.stable.out
+++ b/clients/Tests/MAL-signatures_gsl.stable.out
@@ -38128,6 +38128,10 @@ address bte_dec2second_interval;
comment cast bte decimal to a second_interval
function calc.surface{unsafe}(wkt:str):wkb;
+command calc.str(s:uuid):str
+address UUIDuuid2str;
+comment Coerce a uuid to a string type
+
command calc.sqlblob(s:str):sqlblob
address BLOBsqlblob_fromstr;
command calc.sqlblob(b:sqlblob):sqlblob
@@ -38484,10 +38488,6 @@ command calc.timestamp(t:timestamp):time
address MTIMEtimestamp2timestamp;
command calc.timestamp(s:str):timestamp
address MTIMEtimestamp_fromstr;
-command calc.uuid(s:uuid):str
-address UUIDuuid2str;
-comment Coerce a uuid to a string type
-
command calc.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
@@ -43203,30 +43203,38 @@ command url.url(s:str):url
address URLnew;
comment Create an URL from a string literal
+command uuid.#cmp():int
+address UUIDcompare;
command uuid.#fromstr():uuid
address UUIDfromString;
-comment Convert string to uuid
-
-command uuid.isaUUID(u:uuid):bit
+command uuid.#hash():int
+address UUIDhash;
+command uuid.isaUUID(u:str):bit
address UUIDisaUUID;
comment Test a string for a UUID format
command uuid.new():uuid
address UUIDgenerateUuid;
-comment Generate uuid
-
+comment Generate a new uuid
+
+command uuid.#null():uuid
+address UUIDnull;
+command uuid.prelude():void
+address UUIDprelude;
+command uuid.#read():uuid
+address UUIDread;
command uuid.str(u:uuid):str
address UUIDuuid2str;
comment Coerce a uuid to its string type
command uuid.#tostr():str
address UUIDtoString;
-comment Convert uuid to string equivalent
-
command uuid.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
+command uuid.#write():int
+address UUIDwrite;
command wkb.FromText{unsafe}(w:str,type:int):wkb
address wkbFromText;
command wkb.#cmp():int
diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out
b/clients/Tests/MAL-signatures_nocfitsio.stable.out
--- a/clients/Tests/MAL-signatures_nocfitsio.stable.out
+++ b/clients/Tests/MAL-signatures_nocfitsio.stable.out
@@ -38116,6 +38116,10 @@ address bte_dec2second_interval;
comment cast bte decimal to a second_interval
function calc.surface{unsafe}(wkt:str):wkb;
+command calc.str(s:uuid):str
+address UUIDuuid2str;
+comment Coerce a uuid to a string type
+
command calc.sqlblob(s:str):sqlblob
address BLOBsqlblob_fromstr;
command calc.sqlblob(b:sqlblob):sqlblob
@@ -38472,10 +38476,6 @@ command calc.timestamp(t:timestamp):time
address MTIMEtimestamp2timestamp;
command calc.timestamp(s:str):timestamp
address MTIMEtimestamp_fromstr;
-command calc.uuid(s:uuid):str
-address UUIDuuid2str;
-comment Coerce a uuid to a string type
-
command calc.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
@@ -43163,30 +43163,38 @@ command url.url(s:str):url
address URLnew;
comment Create an URL from a string literal
+command uuid.#cmp():int
+address UUIDcompare;
command uuid.#fromstr():uuid
address UUIDfromString;
-comment Convert string to uuid
-
-command uuid.isaUUID(u:uuid):bit
+command uuid.#hash():int
+address UUIDhash;
+command uuid.isaUUID(u:str):bit
address UUIDisaUUID;
comment Test a string for a UUID format
command uuid.new():uuid
address UUIDgenerateUuid;
-comment Generate uuid
-
+comment Generate a new uuid
+
+command uuid.#null():uuid
+address UUIDnull;
+command uuid.prelude():void
+address UUIDprelude;
+command uuid.#read():uuid
+address UUIDread;
command uuid.str(u:uuid):str
address UUIDuuid2str;
comment Coerce a uuid to its string type
command uuid.#tostr():str
address UUIDtoString;
-comment Convert uuid to string equivalent
-
command uuid.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
+command uuid.#write():int
+address UUIDwrite;
command wkb.FromText{unsafe}(w:str,type:int):wkb
address wkbFromText;
command wkb.#cmp():int
diff --git a/clients/Tests/MAL-signatures_sphinxclient.stable.out
b/clients/Tests/MAL-signatures_sphinxclient.stable.out
--- a/clients/Tests/MAL-signatures_sphinxclient.stable.out
+++ b/clients/Tests/MAL-signatures_sphinxclient.stable.out
@@ -38116,6 +38116,10 @@ address bte_dec2second_interval;
comment cast bte decimal to a second_interval
function calc.surface{unsafe}(wkt:str):wkb;
+command calc.str(s:uuid):str
+address UUIDuuid2str;
+comment Coerce a uuid to a string type
+
command calc.sqlblob(s:str):sqlblob
address BLOBsqlblob_fromstr;
command calc.sqlblob(b:sqlblob):sqlblob
@@ -38472,10 +38476,6 @@ command calc.timestamp(t:timestamp):time
address MTIMEtimestamp2timestamp;
command calc.timestamp(s:str):timestamp
address MTIMEtimestamp_fromstr;
-command calc.uuid(s:uuid):str
-address UUIDuuid2str;
-comment Coerce a uuid to a string type
-
command calc.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
@@ -43196,30 +43196,38 @@ command url.url(s:str):url
address URLnew;
comment Create an URL from a string literal
+command uuid.#cmp():int
+address UUIDcompare;
command uuid.#fromstr():uuid
address UUIDfromString;
-comment Convert string to uuid
-
-command uuid.isaUUID(u:uuid):bit
+command uuid.#hash():int
+address UUIDhash;
+command uuid.isaUUID(u:str):bit
address UUIDisaUUID;
comment Test a string for a UUID format
command uuid.new():uuid
address UUIDgenerateUuid;
-comment Generate uuid
-
+comment Generate a new uuid
+
+command uuid.#null():uuid
+address UUIDnull;
+command uuid.prelude():void
+address UUIDprelude;
+command uuid.#read():uuid
+address UUIDread;
command uuid.str(u:uuid):str
address UUIDuuid2str;
comment Coerce a uuid to its string type
command uuid.#tostr():str
address UUIDtoString;
-comment Convert uuid to string equivalent
-
command uuid.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
+command uuid.#write():int
+address UUIDwrite;
command wkb.FromText{unsafe}(w:str,type:int):wkb
address wkbFromText;
command wkb.#cmp():int
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
@@ -2321,13 +2321,19 @@ str URLnew3(str *url, str *protocol, str
str URLnew4(str *url, str *protocol, str *server, int *port, str *file);
str URLnoop(str *url, str *val);
int URLtoString(str *s, int *len, str src);
-str UUIDequal(bit *retval, str *l, str *r);
-int UUIDfromString(char *svalue, int *len, str *retval);
-str UUIDgenerateUuid(str *retval);
-str UUIDisaUUID(bit *retval, str *s);
-str UUIDstr2uuid(str *retval, str *s);
-int UUIDtoString(str *retval, int *len, str handle);
-str UUIDuuid2str(str *retval, str *s);
+int UUIDcompare(const uuid *l, const uuid *r);
+str UUIDequal(bit *retval, uuid **l, uuid **r);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
