Changeset: 8f9b7df7ca3e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f9b7df7ca3e
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
java/ChangeLog.Jun2016
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_decimal.mal.sh
sql/backends/monet5/sql_decimal_hge.mal.sh
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/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/pg_regress/Tests/strings.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (truncated from 13945 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
@@ -16,17 +16,9 @@ stdout of test 'MAL-signatures` in direc
Ready.
-# 15:16:50 >
-# 15:16:50 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9622" "--port=32080"
-# 15:16:50 >
-
-command aggr.avg(b:bat[:hge],g:bat[:oid],e:bat[:any_1])
(X_4:bat[:dbl],X_5:bat[:wrd])
-address AGGRavg23_dbl;
-comment Grouped tail average on hge, also returns count
-
-command aggr.avg(b:bat[:hge],g:bat[:oid],e:bat[:any_1]):bat[:dbl]
-address AGGRavg13_dbl;
-comment Grouped tail average on hge
+# 12:27:16 >
+# 12:27:16 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-25748" "--port=36923"
+# 12:27:16 >
command aggr.avg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1])
(X_4:bat[:dbl],X_5:bat[:wrd])
address AGGRavg23_dbl;
@@ -88,8 +80,6 @@ pattern aggr.avg(b:bat[:any_2]):dbl
address CMDcalcavg;
comment Gives the avg of all tail values
-function aggr.corr(e1:bat[:hge],e2:bat[:hge]):hge;
-function aggr.covar(e1:bat[:hge],e2:bat[:hge]):hge;
function aggr.corr(e1:bat[:dbl],e2:bat[:dbl]):dbl;
function aggr.covar(e1:bat[:dbl],e2:bat[:dbl]):dbl;
function aggr.corr(e1:bat[:flt],e2:bat[:flt]):flt;
@@ -523,142 +513,6 @@ pattern aggr.prod(b:bat[:bte]):bte
address CMDBATprod;
comment Calculate aggregate product of B.
-pattern aggr.prod(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):dbl
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:hge],s:bat[:oid]):dbl
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:hge],nil_if_empty:bit):dbl
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:hge]):dbl
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:hge],s:bat[:oid]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:hge],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:hge]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:lng],s:bat[:oid],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:lng],s:bat[:oid]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:lng],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:lng]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:wrd],s:bat[:oid],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:wrd],s:bat[:oid]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:wrd],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:wrd]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:int],s:bat[:oid],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:int],s:bat[:oid]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:int],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:int]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:sht],s:bat[:oid],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:sht],s:bat[:oid]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:sht],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:sht]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:bte],s:bat[:oid],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:bte],s:bat[:oid]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B with candidate list.
-
-pattern aggr.prod(b:bat[:bte],nil_if_empty:bit):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-pattern aggr.prod(b:bat[:bte]):hge
-address CMDBATprod;
-comment Calculate aggregate product of B.
-
-command aggr.prod(b:bat[:hge],g:bat[:oid],e:bat[:any_1]):bat[:hge]
-address AGGRprod3_hge;
-comment Grouped tail product on hge
-
-command aggr.prod(b:bat[:lng],g:bat[:oid],e:bat[:any_1]):bat[:hge]
-address AGGRprod3_hge;
-comment Grouped tail product on lng
-
-command aggr.prod(b:bat[:wrd],g:bat[:oid],e:bat[:any_1]):bat[:hge]
-address AGGRprod3_hge;
-comment Grouped tail product on wrd
-
-command aggr.prod(b:bat[:int],g:bat[:oid],e:bat[:any_1]):bat[:hge]
-address AGGRprod3_hge;
-comment Grouped tail product on int
-
-command aggr.prod(b:bat[:sht],g:bat[:oid],e:bat[:any_1]):bat[:hge]
-address AGGRprod3_hge;
-comment Grouped tail product on sht
-
-command aggr.prod(b:bat[:bte],g:bat[:oid],e:bat[:any_1]):bat[:hge]
-address AGGRprod3_hge;
-comment Grouped tail product on bte
-
command aggr.prod(b:bat[:dbl],g:bat[:oid],e:bat[:any_1]):bat[:dbl]
address AGGRprod3_dbl;
comment Grouped tail product on dbl
@@ -736,8 +590,6 @@ command aggr.quantile(b:bat[:any_1],g:ba
address AGGRquantile3;
comment Grouped quantile aggregate
-function
aggr.subcorr(e1:bat[:hge],e2:bat[:hge],g:bat[:oid],e:bat[:any_2],f:bit):bat[:hge];
-function
aggr.subcovar(e1:bat[:hge],e2:bat[:hge],g:bat[:oid],e:bat[:any_2],f:bit):bat[:hge];
function
aggr.subcorr(e1:bat[:dbl],e2:bat[:dbl],g:bat[:oid],e:bat[:any_2],f:bit):bat[:dbl];
function
aggr.subcovar(e1:bat[:dbl],e2:bat[:dbl],g:bat[:oid],e:bat[:any_2],f:bit):bat[:dbl];
function
aggr.subcorr(e1:bat[:flt],e2:bat[:flt],g:bat[:oid],e:bat[:any_2],f:bit):bat[:flt];
@@ -1120,294 +972,6 @@ pattern aggr.sum(b:bat[:bte]):bte
address CMDBATsum;
comment Calculate aggregate sum of B.
-pattern aggr.sum(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):dbl
-address CMDBATsum;
-comment Calculate aggregate sum of B with candidate list.
-
-pattern aggr.sum(b:bat[:hge],s:bat[:oid]):dbl
-address CMDBATsum;
-comment Calculate aggregate sum of B with candidate list.
-
-pattern aggr.sum(b:bat[:hge],nil_if_empty:bit):dbl
-address CMDBATsum;
-comment Calculate aggregate sum of B.
-
-pattern aggr.sum(b:bat[:hge]):dbl
-address CMDBATsum;
-comment Calculate aggregate sum of B.
-
-pattern aggr.sum(b:bat[:hge],s:bat[:oid],nil_if_empty:bit):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B with candidate list.
-
-pattern aggr.sum(b:bat[:hge],s:bat[:oid]):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B with candidate list.
-
-pattern aggr.sum(b:bat[:hge],nil_if_empty:bit):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B.
-
-pattern aggr.sum(b:bat[:hge]):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B.
-
-pattern aggr.sum(b:bat[:lng],s:bat[:oid],nil_if_empty:bit):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B with candidate list.
-
-pattern aggr.sum(b:bat[:lng],s:bat[:oid]):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B with candidate list.
-
-pattern aggr.sum(b:bat[:lng],nil_if_empty:bit):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B.
-
-pattern aggr.sum(b:bat[:lng]):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B.
-
-pattern aggr.sum(b:bat[:wrd],s:bat[:oid],nil_if_empty:bit):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B with candidate list.
-
-pattern aggr.sum(b:bat[:wrd],s:bat[:oid]):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B with candidate list.
-
-pattern aggr.sum(b:bat[:wrd],nil_if_empty:bit):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B.
-
-pattern aggr.sum(b:bat[:wrd]):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B.
-
-pattern aggr.sum(b:bat[:int],s:bat[:oid],nil_if_empty:bit):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B with candidate list.
-
-pattern aggr.sum(b:bat[:int],s:bat[:oid]):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B with candidate list.
-
-pattern aggr.sum(b:bat[:int],nil_if_empty:bit):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B.
-
-pattern aggr.sum(b:bat[:int]):hge
-address CMDBATsum;
-comment Calculate aggregate sum of B.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
