MonetDB: Aug2024 - Thinko: setsessiontimeout is a timeout from t...
Changeset: 76aff4fc7c3d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/76aff4fc7c3d
Modified Files:
testing/sqllogictest.py
Branch: Aug2024
Log Message:
Thinko: setsessiontimeout is a timeout from the start of the session.
diffs (22 lines):
diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py
--- a/testing/sqllogictest.py
+++ b/testing/sqllogictest.py
@@ -797,12 +797,16 @@ class SQLLogic:
self.approve = approve
self.initfile(f, defines, run_until=run_until)
nthreads = None
+if self.timeout:
+timeout = int((time.time() - self.starttime) + self.timeout)
+else:
+timeout = 0
if self.language == 'sql':
-self.crs.execute(f'call sys.setsessiontimeout({self.timeout or
0})')
+self.crs.execute(f'call sys.setsessiontimeout({timeout})')
global hashge
hashge = self.crs.execute("select * from sys.types where sqlname =
'hugeint'") == 1
else:
-self.crs.execute(f'clients.setsessiontimeout({self.timeout or
0}:int)')
+self.crs.execute(f'clients.setsessiontimeout({timeout}:int)')
skiprest = False
while True:
skipping = skiprest
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Aug2024 - Timeout handling.
Changeset: b57122268af2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b57122268af2
Modified Files:
testing/sqllogictest.py
Branch: Aug2024
Log Message:
Timeout handling.
diffs (32 lines):
diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py
--- a/testing/sqllogictest.py
+++ b/testing/sqllogictest.py
@@ -156,7 +156,7 @@ class SQLLogic:
if self.timeout > 0:
t = time.time()
if self.starttime + self.timeout > t:
-return self.starttime + self.timeout - t
+return int(self.starttime + self.timeout - t)
return 0
return -1
@@ -213,6 +213,9 @@ class SQLLogic:
autocommit=True,
connect_timeout=t)
crs = dbh.cursor()
+if t > 0:
+dbh.settimeout(t)
+crs.execute(f'call sys.setsessiontimeout({t})')
else:
dbh = malmapi.Connection()
dbh.connect(database=database,
@@ -223,6 +226,9 @@ class SQLLogic:
port=port,
connect_timeout=t)
crs = MapiCursor(dbh)
+if t > 0:
+dbh.settimeout(t)
+crs.execute(f'clients.setsessiontimeout({t}:int)')
conn = SQLLogicConnection(conn_id, dbh=dbh, crs=crs,
language=language)
self.conn_map[conn_id] = conn
return conn
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Aug2024 - Only attempt to connect if we actually have a...
Changeset: 3988d4e22333 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/3988d4e22333 Modified Files: testing/Mtest.py.in Branch: Aug2024 Log Message: Only attempt to connect if we actually have a running server. diffs (12 lines): diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in --- a/testing/Mtest.py.in +++ b/testing/Mtest.py.in @@ -2913,7 +2913,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te elif CALL == 'python': # do clean up between tests if no dependent tests # borrow clean up function from sqllogictest -if not nodrop and not os.path.exists(TST+'.reqtests'): +if not nodrop and not os.path.exists(TST+'.reqtests') and pSrvr is not None: import MonetDBtesting.sqllogictest as sqllogictest with sqllogictest.SQLLogic(out=ClntErr) as sql: try: ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Merge with Aug2024 branch.
Changeset: fde7f69e370f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fde7f69e370f
Modified Files:
testing/Mtest.py.in
testing/sqllogictest.py
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (75 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2979,7 +2979,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
elif CALL == 'python':
# do clean up between tests if no dependent tests
# borrow clean up function from sqllogictest
-if not nodrop and not os.path.exists(TST+'.reqtests'):
+if not nodrop and not os.path.exists(TST+'.reqtests') and
pSrvr is not None:
import MonetDBtesting.sqllogictest as sqllogictest
with sqllogictest.SQLLogic(out=ClntErr) as sql:
try:
diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py
--- a/testing/sqllogictest.py
+++ b/testing/sqllogictest.py
@@ -156,7 +156,7 @@ class SQLLogic:
if self.timeout > 0:
t = time.time()
if self.starttime + self.timeout > t:
-return self.starttime + self.timeout - t
+return int(self.starttime + self.timeout - t)
return 0
return -1
@@ -213,6 +213,9 @@ class SQLLogic:
autocommit=True,
connect_timeout=t)
crs = dbh.cursor()
+if t > 0:
+dbh.settimeout(t)
+crs.execute(f'call sys.setsessiontimeout({t})')
else:
dbh = malmapi.Connection()
dbh.connect(database=database,
@@ -223,6 +226,9 @@ class SQLLogic:
port=port,
connect_timeout=t)
crs = MapiCursor(dbh)
+if t > 0:
+dbh.settimeout(t)
+crs.execute(f'clients.setsessiontimeout({t}:int)')
conn = SQLLogicConnection(conn_id, dbh=dbh, crs=crs,
language=language)
self.conn_map[conn_id] = conn
return conn
@@ -242,7 +248,10 @@ class SQLLogic:
pass
self.crs = None
if self.dbh:
-self.dbh.close()
+try:
+self.dbh.close()
+except AttributeError:
+pass
self.dbh = None
@@ -808,12 +817,16 @@ class SQLLogic:
self.approve = approve
self.initfile(f, defines, run_until=run_until)
nthreads = None
+if self.timeout:
+timeout = int((time.time() - self.starttime) + self.timeout)
+else:
+timeout = 0
if self.language == 'sql':
-self.crs.execute(f'call sys.setsessiontimeout({self.timeout or
0})')
+self.crs.execute(f'call sys.setsessiontimeout({timeout})')
global hashge
hashge = self.crs.execute("select * from sys.types where sqlname =
'hugeint'") == 1
else:
-self.crs.execute(f'clients.setsessiontimeout({self.timeout or
0}:int)')
+self.crs.execute(f'clients.setsessiontimeout({timeout}:int)')
skiprest = False
while True:
skipping = skiprest
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Aug2024 - Backed out changeset fce090da651f: pymonetdb ...
Changeset: 0dc71e18dc50 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0dc71e18dc50 Modified Files: testing/sqllogictest.py Branch: Aug2024 Log Message: Backed out changeset fce090da651f: pymonetdb has been fixed. diffs (15 lines): diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py --- a/testing/sqllogictest.py +++ b/testing/sqllogictest.py @@ -248,10 +248,7 @@ class SQLLogic: pass self.crs = None if self.dbh: -try: -self.dbh.close() -except AttributeError: -pass +self.dbh.close() self.dbh = None ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: nested - modify test
Changeset: 466bb236f337 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/466bb236f337
Modified Files:
sql/backends/monet5/sql.c
sql/test/nested/Tests/webclicks.test
Branch: nested
Log Message:
modify test
diffs (47 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5765,10 +5765,10 @@ insert_json_object(char **msg, JSON *js,
}
}
- if (elm > 0 && BUNappend(bats[w], &id, false) != GDK_SUCCEED)
- elm = -3;
- if (t->multiset == MS_ARRAY && elm > 0 && BUNappend(bats[w+1], &anr,
false) != GDK_SUCCEED)
- elm = -3;
+ //if (elm > 0 && BUNappend(bats[w], &id, false) != GDK_SUCCEED)
+ // elm = -3;
+ //if (t->multiset == MS_ARRAY && elm > 0 && BUNappend(bats[w+1], &anr,
false) != GDK_SUCCEED)
+ // elm = -3;
return elm;
}
diff --git a/sql/test/nested/Tests/webclicks.test
b/sql/test/nested/Tests/webclicks.test
--- a/sql/test/nested/Tests/webclicks.test
+++ b/sql/test/nested/Tests/webclicks.test
@@ -2,14 +2,20 @@ statement ok
create type kv as (key varchar, value varchar)
statement ok
-create type loc as (list kv[])
+create type elem as (element kv)
statement ok
-create type event as (id int , type varchar, location loc)
+create type webusr as (list elem[])
+
+statement ok
+create type loc as (list elem[])
statement ok
-create table events(ev event[])
+create type event as (eventid varchar, event varchar, timestamp timestamp,
location loc, "user" webusr)
-statement error
-insert into events values (array[(1, "click", array[("hostname",
"localhost")])])
+statement ok
+create table events(events event[])
+statement ok
+insert into events values (array[('111', 'click', '2024-11-30 22:13:37.823000
UTC', (array[(('hostname', 'localhost'))]), null)])
+
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: resource_management - merge with default
Changeset: ff40f1a3e3f4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/ff40f1a3e3f4 Modified Files: clients/Tests/exports.stable.out gdk/gdk.h gdk/gdk_bat.c monetdb5/mal/mal.h sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_scenario.c sql/server/rel_optimize_proj.c sql/server/rel_optimize_sel.c sql/server/rel_rel.h sql/server/rel_rewriter.h sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_parser.y sql/server/sql_var.c Branch: resource_management Log Message: merge with default diffs (truncated from 118863 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -923,6 +923,7 @@ sed -i 's/1\.2/1.1/' misc/selinux/monetd -DWITH_PCRE=ON \ -DWITH_PROJ=OFF \ -DWITH_READLINE=ON \ +-DWITH_RTREE=OFF \ -DWITH_SQLPARSE=OFF \ -DWITH_VALGRIND=OFF \ -DWITH_XML2=ON \ diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -6,50881 +6,50876 @@ select * from sys.malfunctions() order b aggr Collect command aggr.Collect(X_0:bat[:wkb]):wkb -wkbCollectAggr; +wkbCollectAggr TODO aggr MakeLine command aggr.MakeLine(X_0:bat[:wkb]):wkb -wkbMakeLineAggr; +wkbMakeLineAggr Gets a BAT with point or linestring geometries and returns a single linestring geometry aggr all command aggr.all(X_0:bat[:any_1]):any_1 -SQLall; +SQLall if all values in b are equal return this, else nil aggr allnotequal pattern aggr.allnotequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit -SQLallnotequal; +SQLallnotequal if all values in r are not equal to l, return true, else if r has nil, return nil, else return false aggr anyequal pattern aggr.anyequal(X_0:any_1, X_1:any_1):bit -CMDvarEQ; +CMDvarEQ (empty) aggr anyequal pattern aggr.anyequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit -SQLanyequal; +SQLanyequal if any value in r is equal to l, return true, else if r has nil, return nil, else return false aggr avg command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] -AGGRavg13_dbl; +AGGRavg13_dbl Grouped tail average on bte aggr avg command aggr.avg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] -AGGRavg13_dbl; +AGGRavg13_dbl Grouped tail average on dbl aggr avg command aggr.avg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] -AGGRavg13_dbl; +AGGRavg13_dbl Grouped tail average on flt aggr avg command aggr.avg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] -AGGRavg13_dbl; +AGGRavg13_dbl Grouped tail average on hge aggr avg command aggr.avg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] -AGGRavg13_dbl; +AGGRavg13_dbl Grouped tail average on int aggr avg command aggr.avg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] -AGGRavg13_dbl; +AGGRavg13_dbl Grouped tail average on lng aggr avg command aggr.avg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl] -AGGRavg13_dbl; +AGGRavg13_dbl Grouped tail average on sht aggr avg command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] -AGGRavg14_dbl; +AGGRavg14_dbl Grouped tail average on bte aggr avg command aggr.avg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] -AGGRavg14_dbl; +AGGRavg14_dbl Grouped tail average on dbl aggr avg command aggr.avg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] -AGGRavg14_dbl; +AGGRavg14_dbl Grouped tail average on flt aggr avg command aggr.avg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] -AGGRavg14_dbl; +AGGRavg14_dbl Grouped tail average on int aggr avg command aggr.avg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] -AGGRavg14_dbl; +AGGRavg14_dbl Grouped tail average on lng aggr avg command aggr.avg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:int):bat[:dbl] -AGGRavg14_dbl; +AGGRavg14_dbl Grouped tail average on sht aggr avg command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) -AGGRavg23_dbl; +AGGRavg23_dbl Grouped tail average on bte, also returns count aggr avg command aggr.avg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) -AGGRavg23_dbl; +AGGRavg23_dbl Grouped tail average on dbl, also returns count aggr avg command aggr.avg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) -AGGRavg23_dbl; +AGGRavg23_dbl Grouped tail average on flt, also returns count aggr avg command aggr.avg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1]) (X_3:bat[:dbl], X_4:bat[:lng]) -AGGRavg23_dbl; +AGGRavg23_dbl Grouped tail average on hge, also returns c
