Changeset: a838f81aa347 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a838f81aa347
Modified Files:
NT/updatecodes.py
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
java/ChangeLog.Jul2015
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/str.h
monetdb5/modules/atoms/str.mal
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/batstr.mal
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/scripts/45_uuid.sql
sql/server/sql_qc.c
sql/test/ADT2006/Tests/bram.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/var_char_cast_truncate.SF-1150907.stable.out
sql/test/Tests/str-pad.stable.out
sql/test/Tests/str-trim.stable.out
sql/test/Tests/string.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/pg_regress/Tests/strings.stable.out
Branch: Jun2016
Log Message:
Merge with Jul2015 branch.
diffs (truncated from 1137 to 300 lines):
diff --git a/NT/updatecodes.py b/NT/updatecodes.py
--- a/NT/updatecodes.py
+++ b/NT/updatecodes.py
@@ -13,20 +13,22 @@ prcdre = re.compile('"ProductCode" = "8:
pacdre = re.compile('"PackageCode" = "8:{(.*)}"')
def update(f):
- p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE)
+ p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE,
+ universal_newlines = True)
u, e = p.communicate()
- productcode = u.strip('\r\n').upper()
- p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE)
+ productcode = u.strip('\n').upper()
+ p = subprocess.Popen(['uuidgen'], stdout = subprocess.PIPE,
+ universal_newlines = True)
u, e = p.communicate()
- packagecode = u.strip('\r\n').upper()
- fp = open(f, 'rb')
+ packagecode = u.strip('\n').upper()
+ fp = open(f)
data = fp.read()
fp.close()
repl = '"ProductCode" = "8:{%s}"' % productcode
data = prcdre.sub(repl, data)
repl = '"PackageCode" = "8:{%s}"' % packagecode
data = pacdre.sub(repl, data)
- fp = open(f, 'wb')
+ fp = open(f, 'w')
fp.write(data)
fp.close()
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
@@ -3142,10 +3142,6 @@ command batstr.startsWith(s:bat[:str],pr
address STRbatPrefix;
comment Prefix check.
-command batstr.stringlength(s:bat[:str]):bat[:int]
-address STRbatstringLength;
-comment Return the length of a right trimed string.
-
command batstr.trim(s:bat[:str],s2:bat[:str]):bat[:str]
address STRbatStrip2_bat;
comment Strip characters in the second strings around the first strings.
@@ -52031,10 +52027,6 @@ command str.startsWith(s:str,prefix:str)
address STRPrefix;
comment Prefix check.
-command str.stringlength(s:str):int
-address STRSQLLength;
-comment Return the length of a right trimed string (SQL semantics).
-
command str.string(s:str,offset:int,count:int):str
address STRSubString;
comment Return substring s[offset..offset+count] of a string s[0..n]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -3142,10 +3142,6 @@ command batstr.startsWith(s:bat[:str],pr
address STRbatPrefix;
comment Prefix check.
-command batstr.stringlength(s:bat[:str]):bat[:int]
-address STRbatstringLength;
-comment Return the length of a right trimed string.
-
command batstr.trim(s:bat[:str],s2:bat[:str]):bat[:str]
address STRbatStrip2_bat;
comment Strip characters in the second strings around the first strings.
@@ -52031,10 +52027,6 @@ command str.startsWith(s:str,prefix:str)
address STRPrefix;
comment Prefix check.
-command str.stringlength(s:str):int
-address STRSQLLength;
-comment Return the length of a right trimed string (SQL semantics).
-
command str.string(s:str,offset:int,count:int):str
address STRSubString;
comment Return substring s[offset..offset+count] of a string s[0..n]
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -936,7 +936,6 @@ create filter function "ilike"(val strin
create function sys.imprintsize(i bigint, nme string) returns bigint begin if
nme = 'boolean' or nme = 'tinyint' or nme = 'smallint' or nme = 'int' or nme =
'bigint' or nme = 'hugeint' or nme = 'decimal' or nme = 'date' or nme =
'timestamp' or nme = 'real' or nme = 'double' then return cast(i * 0.12 as
bigint); end if ; return 0; end;
create function internaltransform(geom geometry, srid_src integer, srid_dest
integer, proj4_src string, proj4_dest string) returns geometry external name
geom."Transform";
create function isaurl(theurl url) returns bool external name url."isaURL";
-create function sys.isauuid(u uuid) returns boolean begin return true; end;
create function sys.isauuid(s string) returns boolean external name
uuid."isaUUID";
create function "left_shift"(i1 inet, i2 inet) returns boolean external name
inet."<<";
create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external
name inet."<<=";
@@ -2033,7 +2032,6 @@ drop function pcre_replace(string, strin
[ "sys", "internaltransform", "create function internaltransform(geom
geometry, srid_src integer, srid_dest integer, proj4_src string, proj4_dest
string) returns geometry external name geom.\"Transform\";", "geom", 1,
1, false, false, false ]
[ "sys", "isaurl", "create function isaurl(theurl url) returns
bool external name url.\"isaURL\";", "url", 1, 1, false,
false, false ]
[ "sys", "isauuid", "create function sys.isauuid(s string) returns
boolean external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
-[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
boolean begin return true; end;", "user", 2, 1, false, false,
false ]
[ "sys", "isnull", "isnil", "calc", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
@@ -2055,9 +2053,9 @@ drop function pcre_replace(string, strin
[ "sys", "left_shift", "mbrLeft", "geom", 0, 1, false,
false, false ]
[ "sys", "left_shift", "mbrLeft", "geom", 0, 1, false,
false, false ]
[ "sys", "left_shift_assign", "create function
\"left_shift_assign\"(i1 inet, i2 inet) returns boolean external name
inet.\"<<=\";", "inet", 1, 1, false, false, false ]
-[ "sys", "length", "stringlength", "str", 0, 1, false,
false, false ]
-[ "sys", "length", "stringlength", "str", 0, 1, false,
false, false ]
-[ "sys", "length", "stringlength", "str", 0, 1, false,
false, false ]
+[ "sys", "length", "length", "str", 0, 1, false,
false, false ]
+[ "sys", "length", "length", "str", 0, 1, false,
false, false ]
+[ "sys", "length", "length", "str", 0, 1, false,
false, false ]
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
@@ -3672,7 +3670,6 @@ drop function pcre_replace(string, strin
[ "sys", "internaltransform", "geom", "geometry", 0, 0,
1, "srid_src", "int", 32, 0, 1, "srid_dest", "int",
32, 0, 1, "proj4_src", "clob", 0, 0, 1,
"proj4_dest", "clob", 0, 0, 1, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "isaurl", "theurl", "url", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "isauuid", "s", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
-[ "sys", "isauuid", "u", "uuid", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "isnull", "arg_1", "any", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "lcase", "arg_1", "char", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "lcase", "arg_1", "clob", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -5319,7 +5316,6 @@ drop function pcre_replace(string, strin
[ "inet", "inet", "sys", "host", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "hostmask", "TYPE_DEPENDENCY" ]
[ "url", "url", "sys", "isaurl", "TYPE_DEPENDENCY" ]
-[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift_assign", "TYPE_DEPENDENCY"
]
[ "inet", "inet", "sys", "masklen", "TYPE_DEPENDENCY" ]
@@ -5762,7 +5758,6 @@ drop function pcre_replace(string, strin
[ "isarray" ]
[ "isaurl" ]
[ "isauuid" ]
-[ "isauuid" ]
[ "isnull" ]
[ "isobject" ]
[ "isobject" ]
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -936,7 +936,6 @@ create filter function "ilike"(val strin
create function sys.imprintsize(i bigint, nme string) returns bigint begin if
nme = 'boolean' or nme = 'tinyint' or nme = 'smallint' or nme = 'int' or nme =
'bigint' or nme = 'hugeint' or nme = 'decimal' or nme = 'date' or nme =
'timestamp' or nme = 'real' or nme = 'double' then return cast(i * 0.12 as
bigint); end if ; return 0; end;
create function internaltransform(geom geometry, srid_src integer, srid_dest
integer, proj4_src string, proj4_dest string) returns geometry external name
geom."Transform";
create function isaurl(theurl url) returns bool external name url."isaURL";
-create function sys.isauuid(u uuid) returns boolean begin return true; end;
create function sys.isauuid(s string) returns boolean external name
uuid."isaUUID";
create function "left_shift"(i1 inet, i2 inet) returns boolean external name
inet."<<";
create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external
name inet."<<=";
@@ -2054,7 +2053,6 @@ drop function pcre_replace(string, strin
[ "sys", "internaltransform", "create function internaltransform(geom
geometry, srid_src integer, srid_dest integer, proj4_src string, proj4_dest
string) returns geometry external name geom.\"Transform\";", "geom", 1,
1, false, false, false ]
[ "sys", "isaurl", "create function isaurl(theurl url) returns
bool external name url.\"isaURL\";", "url", 1, 1, false,
false, false ]
[ "sys", "isauuid", "create function sys.isauuid(s string) returns
boolean external name uuid.\"isaUUID\";", "uuid", 1, 1, false,
false, false ]
-[ "sys", "isauuid", "create function sys.isauuid(u uuid) returns
boolean begin return true; end;", "user", 2, 1, false, false,
false ]
[ "sys", "isnull", "isnil", "calc", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
[ "sys", "lcase", "toLower", "str", 0, 1, false,
false, false ]
@@ -2078,9 +2076,9 @@ drop function pcre_replace(string, strin
[ "sys", "left_shift", "mbrLeft", "geom", 0, 1, false,
false, false ]
[ "sys", "left_shift", "mbrLeft", "geom", 0, 1, false,
false, false ]
[ "sys", "left_shift_assign", "create function
\"left_shift_assign\"(i1 inet, i2 inet) returns boolean external name
inet.\"<<=\";", "inet", 1, 1, false, false, false ]
-[ "sys", "length", "stringlength", "str", 0, 1, false,
false, false ]
-[ "sys", "length", "stringlength", "str", 0, 1, false,
false, false ]
-[ "sys", "length", "stringlength", "str", 0, 1, false,
false, false ]
+[ "sys", "length", "length", "str", 0, 1, false,
false, false ]
+[ "sys", "length", "length", "str", 0, 1, false,
false, false ]
+[ "sys", "length", "length", "str", 0, 1, false,
false, false ]
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
[ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1,
false, false, false ]
@@ -3881,7 +3879,6 @@ drop function pcre_replace(string, strin
[ "sys", "internaltransform", "geom", "geometry", 0, 0,
1, "srid_src", "int", 32, 0, 1, "srid_dest", "int",
32, 0, 1, "proj4_src", "clob", 0, 0, 1,
"proj4_dest", "clob", 0, 0, 1, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "isaurl", "theurl", "url", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "isauuid", "s", "clob", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
-[ "sys", "isauuid", "u", "uuid", 0, 0, 1, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ]
[ "sys", "isnull", "arg_1", "any", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "lcase", "arg_1", "char", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
[ "sys", "lcase", "arg_1", "clob", 0, 0, 1,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
]
@@ -5702,7 +5699,6 @@ drop function pcre_replace(string, strin
[ "inet", "inet", "sys", "host", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "hostmask", "TYPE_DEPENDENCY" ]
[ "url", "url", "sys", "isaurl", "TYPE_DEPENDENCY" ]
-[ "uuid", "uuid", "sys", "isauuid", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift", "TYPE_DEPENDENCY" ]
[ "inet", "inet", "sys", "left_shift_assign", "TYPE_DEPENDENCY"
]
[ "inet", "inet", "sys", "masklen", "TYPE_DEPENDENCY" ]
@@ -6160,7 +6156,6 @@ drop function pcre_replace(string, strin
[ "isarray" ]
[ "isaurl" ]
[ "isauuid" ]
-[ "isauuid" ]
[ "isnull" ]
[ "isobject" ]
[ "isobject" ]
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
@@ -1742,7 +1742,6 @@ str STRRpad(str *res, const str *arg1, c
str STRRpad2(str *res, const str *arg1, const int *len, const str *arg2);
str STRRtrim(str *res, const str *arg1);
str STRRtrim2(str *res, const str *arg1, const str *arg2);
-str STRSQLLength(int *res, const str *s);
str STRStrip(str *res, const str *arg1);
str STRStrip2(str *res, const str *arg1, const str *arg2);
str STRSubString(str *res, const str *arg1, const int *offset, const int
*length);
@@ -1790,7 +1789,6 @@ str STRbatWChrAt(bat *ret, const bat *l,
str STRbatWChrAtcst(bat *ret, const bat *l, const int *cst);
str STRbatstrSearch(bat *ret, const bat *l, const bat *r);
str STRbatstrSearchcst(bat *ret, const bat *l, const str *cst);
-str STRbatstringLength(bat *ret, const bat *l);
str STRbatsubstring(bat *ret, const bat *l, const bat *r, const bat *t);
str STRbatsubstringcst(bat *ret, const bat *bid, const int *start, const int
*length);
str STRinsert(str *ret, const str *s, const int *start, const int *l, const
str *s2);
diff --git a/java/ChangeLog.Jul2015 b/java/ChangeLog.Jul2015
--- a/java/ChangeLog.Jul2015
+++ b/java/ChangeLog.Jul2015
@@ -1,3 +1,7 @@
# ChangeLog file for java
# This file is updated with Maddlog
+* Sun May 8 2016 Jennie Zhang <y.zh...@cwi.nl>
+- Fixed Connection.isValid(): this method should never attempt to
+ close the connection, even an error has occurred
+
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -1493,18 +1493,6 @@ convertCase(BAT *from, BAT *to, str *res
throw(MAL, malfunc, "Allocation failed");
}
-str
-STRSQLLength(int *res, const str *s)
-{
- str r = NULL;
- str msg;
- if ((msg = STRRtrim(&r, s)) != MAL_SUCCEED)
- return msg;
- STRLength(res, &r);
- GDKfree(r);
- return MAL_SUCCEED;
-}
-
/*
* Here you find the wrappers around the version 4 library code
* It also contains the direct implementation of the string
diff --git a/monetdb5/modules/atoms/str.h b/monetdb5/modules/atoms/str.h
--- a/monetdb5/modules/atoms/str.h
+++ b/monetdb5/modules/atoms/str.h
@@ -52,7 +52,6 @@ str_export str STRLpad2(str *res, const
str_export str STRRpad2(str *res, const str *arg1, const int *len, const str
*arg2);
str_export str STRSubstitute(str *res, const str *arg1, const str *arg2, const
str *arg3, const bit *g);
-str_export str STRSQLLength(int *res, const str *s);
str_export str STRsubstringTail(str *ret, const str *s, const int *start);
str_export str STRsubstring(str *ret, const str *s, const int *start, const
int *l);
str_export str STRlikewrap2(bit *ret, const str *s, const str *pat);
diff --git a/monetdb5/modules/atoms/str.mal b/monetdb5/modules/atoms/str.mal
--- a/monetdb5/modules/atoms/str.mal
+++ b/monetdb5/modules/atoms/str.mal
@@ -24,10 +24,6 @@ command length( s:str ) :int
address STRLength
comment "Return the length of a string.";
-command stringlength( s:str ) :int
-address STRSQLLength
-comment "Return the length of a right trimed string (SQL semantics).";
-
command nbytes( s:str ) :int
address STRBytes
comment "Return the string length in bytes.";
diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -72,7 +72,6 @@ batstr_export str STRbatLpad2_bat_bat(ba
batstr_export str STRbatRpad2_bat_bat(bat *ret, const bat *l, const bat *n,
const bat *l2);
batstr_export str STRbatLength(bat *ret, const bat *l);
-batstr_export str STRbatstringLength(bat *ret, const bat *l);
batstr_export str STRbatBytes(bat *ret, const bat *l);
batstr_export str STRbatsubstringcst(bat *ret, const bat *bid, const int
*start, const int *length);
@@ -168,12 +167,6 @@ STRbatLength(bat *ret, const bat *l)
}
str
-STRbatstringLength(bat *ret, const bat *l)
-{
- return do_batstr_int(ret, l, "batstr.stringLength", STRSQLLength);
-}
-
-str
STRbatBytes(bat *ret, const bat *l)
{
return do_batstr_int(ret, l, "batstr.Bytes", STRBytes);
diff --git a/monetdb5/modules/kernel/batstr.mal
b/monetdb5/modules/kernel/batstr.mal
--- a/monetdb5/modules/kernel/batstr.mal
+++ b/monetdb5/modules/kernel/batstr.mal
@@ -10,10 +10,6 @@ command batstr.length( s:bat[:oid,:str]
address STRbatLength
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
