Changeset: faa601b015da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=faa601b015da
Modified Files:
buildtools/autogen/setup.py
clients/R/MonetDB.R/R/dplyr.R
clients/Tests/exports.stable.out
clients/odbc/driver/Copyright
gdk/gdk_system.c
gdk/gdk_system.h
monetdb5/mal/Tests/tst044.stable.out
monetdb5/mal/Tests/tst804.stable.out
monetdb5/mal/mal_client.h
monetdb5/optimizer/opt_mitosis.c
testing/malcheck.py
Branch: default
Log Message:
Merger with default
diffs (225 lines):
diff --git a/buildtools/autogen/setup.py b/buildtools/autogen/setup.py
--- a/buildtools/autogen/setup.py
+++ b/buildtools/autogen/setup.py
@@ -16,6 +16,6 @@ setup(name = "autogen",
url = "http://www.monetdb.org/";,
maintainer = "Sjoerd Mullender",
maintainer_email = "[email protected]",
- license = "MonetDB Public License",
+ license = "Mozilla Public License, v. 2.0",
packages = ['autogen'],
scripts = ['autogen.py'])
diff --git a/clients/R/MonetDB.R/R/dplyr.R b/clients/R/MonetDB.R/R/dplyr.R
--- a/clients/R/MonetDB.R/R/dplyr.R
+++ b/clients/R/MonetDB.R/R/dplyr.R
@@ -113,4 +113,4 @@ unique_name <- local({
i <<- i + 1
paste0("_W", i)
}
-})
\ No newline at end of file
+})
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
@@ -2277,6 +2277,7 @@ int hasSameSignature(MalBlkPtr mb, Instr
int hasSideEffects(InstrPtr p, int strict);
str hashRef;
int headProp;
+str hgeRef;
int hlbProp;
int horiginProp;
int hubProp;
diff --git a/clients/odbc/driver/Copyright b/clients/odbc/driver/Copyright
--- a/clients/odbc/driver/Copyright
+++ b/clients/odbc/driver/Copyright
@@ -7,7 +7,7 @@ The original code is licensed under the
General Public License, Version 2, June 1991), and therefore the code
in this directory is also licensed under the LPGL (see the file
COPYING in this directory), unlike the other directories in this
-project which are under the MonetDB Public License.
+project which are under the Mozilla Public License, v. 2.0.
All original files have been modified, often heavily, and some have
been deleted since they were originally copied in June 2001. The
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -90,11 +90,11 @@ sortlocklist(MT_Lock *l)
* start of unprocessed part of left and right lists */
t = ll = NULL;
while (l && r) {
- if (l->contention < r->contention ||
- (l->contention == r->contention &&
- l->sleep < r->sleep) ||
- (l->contention == r->contention &&
- l->sleep == r->sleep &&
+ if (l->sleep < r->sleep ||
+ (l->sleep == r->sleep &&
+ l->contention < r->contention) ||
+ (l->sleep == r->sleep &&
+ l->contention == r->contention &&
l->count <= r->count)) {
/* l is smaller */
if (ll == NULL) {
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -210,16 +210,13 @@ gdk_export ATOMIC_TYPE volatile GDKlocks
do { \
TEMDEBUG fprintf(stderr, "#lock %s contention in %s\n",
(l)->name, n); \
(void) ATOMIC_INC(GDKlockcontentioncnt, dummy, n); \
+ (l)->contention++; \
} while (0)
#define _DBG_LOCK_SLEEP(l, n) \
do { \
if (_spincnt == 1024) \
(void) ATOMIC_INC(GDKlocksleepcnt, dummy, n); \
- } while (0)
-#define _DBG_LOCK_COUNT_1(l) \
- do { \
- (l)->contention++; \
- (l)->sleep += _spincnt >= 1024; \
+ (l)->sleep++; \
} while (0)
#define _DBG_LOCK_COUNT_2(l) \
do { \
@@ -282,7 +279,6 @@ gdk_export ATOMIC_TYPE volatile GDKlocks
#define _DBG_LOCK_COUNT_0(l, n) ((void) (n))
#define _DBG_LOCK_CONTENTION(l, n) ((void) (n))
#define _DBG_LOCK_SLEEP(l, n) ((void) (n))
-#define _DBG_LOCK_COUNT_1(l) ((void) 0)
#define _DBG_LOCK_COUNT_2(l) ((void) 0)
#define _DBG_LOCK_INIT(l, n) ((void) (n))
#define _DBG_LOCK_DESTROY(l) ((void) 0)
@@ -300,10 +296,9 @@ gdk_export ATOMIC_TYPE volatile GDKlocks
do { \
if (++_spincnt >= 1024) { \
_DBG_LOCK_SLEEP(l, n); \
- MT_sleep_ms(_spincnt >> 10); \
+ MT_sleep_ms(1); \
} \
} while (ATOMIC_TAS((l)->lock, dummy, n) != 0); \
- _DBG_LOCK_COUNT_1(l); \
} \
_DBG_LOCK_LOCKER(l, n); \
_DBG_LOCK_COUNT_2(l); \
diff --git a/monetdb5/mal/Tests/tst044.stable.out
b/monetdb5/mal/Tests/tst044.stable.out
--- a/monetdb5/mal/Tests/tst044.stable.out
+++ b/monetdb5/mal/Tests/tst044.stable.out
@@ -34,23 +34,23 @@ function user.main():void;
io.print(a);
a := 0.3415:flt;
io.print(a);
- b := 3.1449999809265137:dbl;
+ b := 3.145:dbl;
io.print(b);
b := -3.145:dbl;
io.print(b);
- b := 3.450000047683716:dbl;
+ b := 3.45:dbl;
io.print(b);
- b := 0.34150001406669617:dbl;
+ b := 0.3415:dbl;
io.print(b);
end user.main;
[ 3.145 ]
[ -3.145 ]
[ 3.45 ]
[ 0.3415 ]
-[ 3.1449999809265137 ]
+[ 3.145 ]
[ -3.145 ]
-[ 3.450000047683716 ]
-[ 0.34150001406669617 ]
+[ 3.45 ]
+[ 0.3415 ]
# 16:38:20 >
# 16:38:20 > Done.
diff --git a/monetdb5/mal/Tests/tst804.stable.out
b/monetdb5/mal/Tests/tst804.stable.out
--- a/monetdb5/mal/Tests/tst804.stable.out
+++ b/monetdb5/mal/Tests/tst804.stable.out
@@ -13,7 +13,7 @@ stdout of test 'tst804` in directory 'mo
## test definiton of a function in a unknown module
#function wrong.message():void;
!SyntaxException:parseError:function wrong.message():void;
-!SyntaxException:parseError: ^<module> name not defined
+
!SyntaxException:parseError: io.print("shouldn't come here");
!SyntaxException:parseError:^';' expected
!SyntaxException:parseError:end message;
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -28,8 +28,8 @@
/*
* The prompt structure is designed to simplify recognition of the
* language framework for interaction. For direct console access it is a
- * short printable ascii string. For access through an API we assume the
- * prompt is an ascii string surrounded by a \001 character. This
+ * short printable ASCII string. For access through an API we assume the
+ * prompt is an ASCII string surrounded by a \001 character. This
* simplifies recognition. The information between the prompt brackets
* can be used to pass the mode to the front-end. Moreover, the prompt
* can be dropped if a single stream of information is expected from the
@@ -57,9 +57,9 @@ typedef struct CLIENT {
oid user; /* user id in the auth administration */
/*
* The actions for a client is separated into several stages:
- * parsing, strategic optimization, tactial optimization, and
+ * parsing, strategic optimization, tactical optimization, and
* execution. The routines to handle them are obtained once the
- * scenario is choosen. Each stage carries a state descriptor, but
+ * scenario is chosen. Each stage carries a state descriptor, but
* they share the IO state description. A backup structure is
* provided to temporarily switch to another scenario.
*/
@@ -92,7 +92,7 @@ typedef struct CLIENT {
bstream *fdin;
int yycur; /* the scanners current position */
/*
- * Keeping track of instructions executed is a valueable tool for
+ * Keeping track of instructions executed is a valuable tool for
* script processing and debugging. It can be changed at runtime
* for individual clients using the operation clients.listing(mask).
* A listing bit controls the level of detail to be generated during
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -1,20 +1,9 @@
/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2015 MonetDB B.V.
- * All Rights Reserved.
+ * Copyright 2008-2015 MonetDB B.V.
*/
#include "monetdb_config.h"
diff --git a/testing/malcheck.py b/testing/malcheck.py
--- a/testing/malcheck.py
+++ b/testing/malcheck.py
@@ -50,6 +50,7 @@ pdecls = {}
def process(f):
data = open(f).read()
if f.endswith('.mal'):
+ data = re.sub(r'[ \t]*#.*', '', data) # remove comments
res = comreg.search(data)
while res is not None:
malf, args, rets, func = res.groups()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
