Changeset: f43b94cbe90d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f43b94cbe90d
Modified Files:
gdk/gdk.h
sql/backends/monet5/sql_scenario.c
sql/storage/store.c
Branch: unlock
Log Message:
merged with default
diffs (99 lines):
diff --git a/.editorconfig b/.editorconfig
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,7 +5,7 @@ root = true
end_of_line = lf
insert_final_newline = true
-[*.{c,h}]
+[*.{c,h}{,.in}]
indent_style = tab
tab_width = 4
indent_size = tab
@@ -13,8 +13,13 @@ trim_trailing_whitespace = true
charset = utf-8
max_line_length = 120
-[*.py]
+[*.py{,.in}]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
charset = utf-8
+
+[{CMakeLists.txt,*.cmake}{,.in}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1383,17 +1383,18 @@ gdk_export bat BBPlimit;
gdk_export BBPrec *BBP[N_BBPINIT];
/* fast defines without checks; internal use only */
-#define BBP_cache(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].cache
-#define BBP_logical(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].logical
-#define BBP_bak(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].bak
-#define BBP_next(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].next
-#define BBP_physical(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].physical
-#define BBP_options(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].options
-#define BBP_desc(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].desc
-#define BBP_refs(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].refs
-#define BBP_lrefs(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].lrefs
-#define BBP_status(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].status
-#define BBP_pid(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)].pid
+#define BBP_record(i) BBP[(i)>>BBPINITLOG][(i)&(BBPINIT-1)]
+#define BBP_cache(i) BBP_record(i).cache
+#define BBP_logical(i) BBP_record(i).logical
+#define BBP_bak(i) BBP_record(i).bak
+#define BBP_next(i) BBP_record(i).next
+#define BBP_physical(i) BBP_record(i).physical
+#define BBP_options(i) BBP_record(i).options
+#define BBP_desc(i) BBP_record(i).desc
+#define BBP_refs(i) BBP_record(i).refs
+#define BBP_lrefs(i) BBP_record(i).lrefs
+#define BBP_status(i) BBP_record(i).status
+#define BBP_pid(i) BBP_record(i).pid
#define BATgetId(b) BBP_logical((b)->batCacheid)
#define BBPvalid(i) (BBP_logical(i) != NULL && *BBP_logical(i) != '.')
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -260,6 +260,7 @@ SQLprepareClient(Client c, int login)
}
if (m->session->tr)
reset_functions(m->session->tr);
+ MT_lock_unset(&sql_contextLock);
if (login) {
str schema = monet5_user_set_def_schema(m, c->user);
if (!schema) {
@@ -270,6 +271,7 @@ SQLprepareClient(Client c, int login)
}
bailout:
+ MT_lock_set(&sql_contextLock);
/* expect SQL text first */
if (be)
be->language = 'S';
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -4098,14 +4098,13 @@ def main(argv) :
CONDITIONALS['BAD_HOSTNAME'] = '#' # True
if THISFILE == "Mtest.py": # env['MAPIPORT'] not available on Mapprove.py
- s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
try:
- s.bind(('::1', int(env['MAPIPORT'])))
+ with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s:
+ s.bind(('::1', int(env['MAPIPORT'])))
except socket.error as err:
CONDITIONALS['HAVE_IPV6'] = '' # False
else:
CONDITIONALS['HAVE_IPV6'] = '#' # True
- s.close()
# read '.Mapprove.rc'
if THISFILE == 'Mapprove.py':
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
