Changeset: d04fba3927c7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d04fba3927c7
Added Files:
sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.sql
sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.err
sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.out
Modified Files:
.hgtags
MonetDB.spec
NT/wincompile.py
NT/winconfig.py
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/Tests/tomograph--help.stable.err
clients/mapiclient/eventparser.c
clients/mapiclient/eventparser.h
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
configure.ag
debian/control
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_atomic.h
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc.h
gdk/gdk_calc_compare.h
gdk/gdk_cross.c
gdk/gdk_delta.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_join_legacy.c
gdk/gdk_logger.c
gdk/gdk_select.c
gdk/gdk_setop.c
gdk/gdk_storage.c
gdk/gdk_utils.c
gdk/gdk_value.c
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/color.mal
monetdb5/modules/atoms/inet.mal
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.mal
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/atoms/url.mal
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/uuid.mal
monetdb5/modules/atoms/xml.mal
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/logger.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/mal/Tests/inspect00.stable.out
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mdb.mal
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
sql/backends/monet5/generator/generator.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_upgrades.c
sql/include/sql_mem.h
sql/server/rel_schema.c
sql/test/BugTracker-2015/Tests/All
sql/test/pg_regress/Tests/timestamptz.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/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mtest.py.in
testing/malcheck.py
Branch: transaction-replication
Log Message:
Merge with default branch.
diffs (truncated from 7048 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -589,3 +589,5 @@ 6607367487d91eb02c5eb7dfb9d96606f8f7c6f0
e3d0eecdc35dc633fdd89157ba704f60f03756c1 Oct2014_9
d98df578687e677ae3abbc0ba41e3bb0631ef08a Oct2014_SP2_release
c80c3439c5d7b2bddb710e584eb0936adc21d462 MonetDB.R-0.9.6
+0529873485e7ec8e4c723f8bf7fc14020a7390b2 Oct2014_11
+f59ba5dedd0122403ab175cd1d44a88ab6b3be02 Oct2014_SP3_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -161,6 +161,8 @@ more client packages.
Summary: MonetDB development files
Group: Applications/Databases
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-stream-devel = %{version}-%{release}
+Requires: libatomic_ops-devel
%description devel
MonetDB is a database management system that is developed from a
@@ -688,6 +690,7 @@ MonetDB5-server component.
Summary: MonetDB development files
Group: Applications/Databases
Requires: MonetDB5-server = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
%description -n MonetDB5-server-devel
MonetDB is a database management system that is developed from a
diff --git a/NT/wincompile.py b/NT/wincompile.py
--- a/NT/wincompile.py
+++ b/NT/wincompile.py
@@ -65,6 +65,7 @@ def process(args, recursive = False):
dirname = os.path.dirname(arg)
p = subprocess.Popen(['lib', '/nologo', '/list', arg],
shell = False,
+ universal_newlines = True,
stdout = subprocess.PIPE)
for f in p.stdout:
argv.append(os.path.join(dirname, f.strip()))
@@ -78,10 +79,11 @@ argv = process(sys.argv[1:])
if verbose:
sys.stdout.write('EXECUTE: %s\n' % ' '.join(argv))
sys.stdout.flush()
-p = subprocess.Popen(argv, shell = False, stdout = subprocess.PIPE, stderr =
subprocess.PIPE)
+p = subprocess.Popen(argv, shell = False, universal_newlines = True,
+ stdout = subprocess.PIPE, stderr = subprocess.PIPE)
out, err = p.communicate()
-sys.stdout.write(out.replace('\r\n', '\n'))
-sys.stderr.write(err.replace('\r\n', '\n'))
+sys.stdout.write(out)
+sys.stderr.write(err)
if p.returncode and not verbose:
sys.stderr.write('failed invocation: %s\n' % ' '.join(argv))
sys.stderr.flush()
diff --git a/NT/winconfig.py b/NT/winconfig.py
--- a/NT/winconfig.py
+++ b/NT/winconfig.py
@@ -31,7 +31,7 @@ subs = [("@exec_prefix@", r'%prefix%'),
("@DIRSEP@", '\\'),
("@PATHSEP@", ';')]
-if len(sys.argv) > 1 and sys.argv[1][-19:] == '\\winconfig_conds.py':
+if len(sys.argv) > 1 and sys.argv[1].endswith(r'\winconfig_conds.py'):
conds = {}
for line in fileinput.input(sys.argv[1]):
exec(line, None, conds)
@@ -50,8 +50,11 @@ while len(sys.argv) > 2 and '=' in sys.a
subs.append(('@SOURCE@',
os.path.abspath(os.path.dirname(os.path.dirname(sys.argv[0])))))
for key, val in subs[:]:
+ # X prefix for execution-time value
subs.insert(0, ('@X'+key[1:], val))
+ # Q prefix for quoted value (i.e. \ needs to be scaped)
subs.insert(0, ('@Q'+key[1:], val.replace('\\', r'\\')))
+ # QX prefix for quoted execution-time value
subs.insert(0, ('@QX'+key[1:], val.replace('\\', r'\\')))
def substitute(line):
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
@@ -37722,7 +37722,7 @@ command color.color(s:str):color
address CLRcolor;
comment Converts string to color
-command color.#fromstr():color
+command color.#fromstr():void
address color_fromstr;
command color.green(c:color):int
address CLRgreen;
@@ -37764,7 +37764,7 @@ command color.str(s:color):str
address CLRstr;
comment Converts color to string
-command color.#tostr():str
+command color.#tostr():void
address color_tostr;
command color.value(c:color):flt
address CLRvalue;
@@ -37802,13 +37802,13 @@ pattern daytime.>(v:daytime,w:daytime):b
address CMDvarGT;
comment Equality of two daytimes
-command daytime.#fromstr():daytime
+command daytime.#fromstr():void
address daytime_tz_fromstr;
pattern daytime.isnil(v:daytime):bit
address CMDvarISNIL;
comment Nil test for daytime value
-command daytime.#tostr():str
+command daytime.#tostr():void
address daytime_tostr;
pattern date.!=(v:date,w:date):bit
address CMDvarNE;
@@ -37838,13 +37838,13 @@ command date.date(s:date):date
address MTIMEdate_date;
comment Noop routine.
-command date.#fromstr():date
+command date.#fromstr():void
address date_fromstr;
pattern date.isnil(v:date):bit
address CMDvarISNIL;
comment Nil test for date value
-command date.#tostr():str
+command date.#tostr():void
address date_tostr;
command factories.getDeparture():bat[:oid,:timestamp]
address FCTgetDeparture;
@@ -38364,7 +38364,7 @@ command inet.broadcast(X_1:inet):inet
address INETbroadcast;
comment Returns the broadcast address for network
-command inet.#cmp():int
+command inet.#cmp():void
address INETcompare;
command inet.#fromstr():void
address INETfromString;
@@ -38398,7 +38398,7 @@ command inet.new(s:str):inet
address INETnew;
comment Create an inet from a string literal
-command inet.#null():inet
+command inet.#null():void
address INETnull;
command inet.setmasklen(X_1:inet,X_2:int):inet
address INETsetmasklen;
@@ -38562,7 +38562,7 @@ command json.filter(name:json,pathexpr:s
address JSONfilter;
comment Filter all members of an object by a path expression, returning an
array.Non-matching elements are skipped.
-command json.#fromstr():json
+command json.#fromstr():void
address JSONfromString;
comment Validate a string to be JSON compliant. A NOOP if valid json, NULL
otherwise.
@@ -38644,7 +38644,7 @@ command json.text(j:json):str
address JSONjson2text;
comment Convert JSON values to their plain string equivalent.
-command json.#tostr():str
+command json.#tostr():void
address JSONtoString;
comment Convert JSON to its string equivalent. Dealing with escape characters
@@ -39034,19 +39034,19 @@ pattern mal.manifold(mod:str,fcn:str,a:a
address MANIFOLDevaluate;
pattern mal.multiplex(mod:str,fcn:str,a:any...):any...
address MANIFOLDremapMultiplex;
-command mbr.#cmp():int
+command mbr.#cmp():void
address mbrCOMP;
-command mbr.#fromstr():mbr
+command mbr.#fromstr():void
address mbrFROMSTR;
-command mbr.#hash():int
+command mbr.#hash():void
address mbrHASH;
command mbr.mbr(v:str):mbr
address mbrFromString;
-command mbr.#null():int
+command mbr.#null():void
address mbrNULL;
command mbr.#read():void
address mbrREAD;
-command mbr.#tostr():str
+command mbr.#tostr():void
address mbrTOSTR;
command mbr.#write():void
address mbrWRITE;
@@ -39090,7 +39090,7 @@ pattern mdb.getDefinition():bat[:oid,:st
address MDBgetDefinition;
comment Returns a string representation of the current function with
typing information attached
-pattern mdb.getStackTrace() (X_1:bat[:oid,:str],X_2:bat[:oid,:str])
+pattern mdb.getStackTrace() (X_1:bat[:oid,:int],X_2:bat[:oid,:str])
address MDBStkTrace;
pattern mdb.getStackFrame() (X_1:bat[:oid,:str],X_2:bat[:oid,:str])
address MDBgetStackFrame;
@@ -41287,7 +41287,7 @@ pattern sysmon.stop(id:int):void
address SYSMONstop;
pattern sysmon.stop(id:sht):void
address SYSMONstop;
-command timezone.#fromstr():timezone
+command timezone.#fromstr():void
address tzone_fromstr;
command timezone.str(z:timezone):str
address MTIMEtzone_tostr;
@@ -41297,7 +41297,7 @@ comment Utility function to create a tim
command timezone.timestamp(s:str):timestamp
address MTIMEtimestamp_fromstr;
-command timezone.#tostr():str
+command timezone.#tostr():void
address tzone_tostr;
pattern timestamp.!=(v:timestamp,w:timestamp):bit
address CMDvarNE;
@@ -41339,13 +41339,13 @@ command timestamp.epoch{unsafe}():timest
address MTIMEcurrent_timestamp;
comment unix-time (epoch) support: seconds since the Unix epoch
-command timestamp.#fromstr():timestamp
+command timestamp.#fromstr():void
address timestamp_fromstr;
pattern timestamp.isnil(v:timestamp):bit
address CMDvarISNIL;
comment Nil test for timestamp value
-command timestamp.#tostr():str
+command timestamp.#tostr():void
address timestamp_tostr;
command timestamp.unix_epoch{unsafe}():timestamp
address MTIMEunix_epoch;
@@ -41451,7 +41451,7 @@ command udf.reverse(ra1:str):str
address UDFreverse;
comment Reverse a string
-command url.#fromstr():url
+command url.#fromstr():void
address URLfromString;
comment Convert a string to an url.
@@ -41519,7 +41519,7 @@ command url.new(p:str,h:str,prt:int,f:st
address URLnew4;
comment Construct URL from protocol, host, port, and file
-command url.#tostr():str
+command url.#tostr():void
address URLtoString;
comment Convert url to string equivalent
@@ -41531,11 +41531,11 @@ command url.url(s:str):url
address URLnew;
comment Create an URL from a string literal
-command uuid.#cmp():int
+command uuid.#cmp():void
address UUIDcompare;
-command uuid.#fromstr():uuid
+command uuid.#fromstr():void
address UUIDfromString;
-command uuid.#hash():int
+command uuid.#hash():void
address UUIDhash;
command uuid.isaUUID(u:str):bit
address UUIDisaUUID;
@@ -41545,45 +41545,45 @@ command uuid.new():uuid
address UUIDgenerateUuid;
comment Generate a new uuid
-command uuid.#null():uuid
+command uuid.#null():void
address UUIDnull;
command uuid.prelude():void
address UUIDprelude;
-command uuid.#read():uuid
+command uuid.#read():void
address UUIDread;
command uuid.str(u:uuid):str
address UUIDuuid2str;
comment Coerce a uuid to its string type
-command uuid.#tostr():str
+command uuid.#tostr():void
address UUIDtoString;
command uuid.uuid(s:str):uuid
address UUIDstr2uuid;
comment Coerce a string to a uuid, validating its format
-command uuid.#write():int
+command uuid.#write():void
address UUIDwrite;
command wkb.FromText{unsafe}(w:str,type:int):wkb
address wkbFromText;
-command wkb.#cmp():int
+command wkb.#cmp():void
address wkbCOMP;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
