Changeset: b505fe0f59b9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b505fe0f59b9
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (109 lines):
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -34,7 +34,7 @@ static oid qtag= 1; // A unique query i
UserStats USRstats = NULL;
size_t usrstatscnt = 0;
-static void
+static inline void
clearUSRstats(size_t idx)
{
USRstats[idx] = (struct USERSTAT){0};
@@ -87,10 +87,8 @@ updateUserStats(Client cntxt, MalBlkPtr
}
if (USRstats[idx].username == NULL || USRstats[idx].user != cntxt->user
|| strcmp(USRstats[idx].username, cntxt->username) != 0) {
- if (USRstats[idx].username)
- GDKfree(USRstats[idx].username);
- if (USRstats[idx].maxquery)
- GDKfree(USRstats[idx].maxquery);
+ GDKfree(USRstats[idx].username);
+ GDKfree(USRstats[idx].maxquery);
clearUSRstats(idx);
USRstats[idx].user = cntxt->user;
USRstats[idx].username = GDKstrdup(cntxt->username);
@@ -101,8 +99,7 @@ updateUserStats(Client cntxt, MalBlkPtr
USRstats[idx].started = started;
USRstats[idx].finished = finished;
USRstats[idx].maxticks = ticks;
- if (USRstats[idx].maxquery)
- GDKfree(USRstats[idx].maxquery);
+ GDKfree(USRstats[idx].maxquery);
USRstats[idx].maxquery = GDKstrdup(query);
}
}
@@ -147,7 +144,7 @@ isaSQLquery(MalBlkPtr mb){
*/
/* clear the next entry for a new call unless it is a running query */
-static void
+static inline void
clearQRYqueue(size_t idx)
{
QRYqueue[idx] = (struct QRYQUEUE){0};
@@ -246,7 +243,8 @@ runtimeProfileInit(Client cntxt, MalBlkP
QRYqueue[j].finished = 0;
QRYqueue[j].start = time(0);
q = isaSQLquery(mb);
- QRYqueue[j].query = q? GDKstrdup(q):0;
+ GDKfree(QRYqueue[j].query);
+ QRYqueue[j].query = GDKstrdup(q); /* NULL in, NULL out
*/
GDKfree(QRYqueue[j].username);
if (!GDKembedded())
QRYqueue[j].username =
GDKstrdup(cntxt->username);
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -27,7 +27,7 @@ dce_bug-6177
default-insert-update.Bug-6249
crash_on_NULL_ptr.Bug-6130
sqlsmith01
-HAVE_GEOM&HAVE_NETCDF?sqlsmith02
+HAVE_GEOM?sqlsmith02
HAVE_GEOM?sqlsmith03
sqlsmith04
nested_with.Bug-6187
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith02.test
b/sql/test/BugTracker-2017/Tests/sqlsmith02.test
--- a/sql/test/BugTracker-2017/Tests/sqlsmith02.test
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith02.test
@@ -1,3 +1,6 @@
+statement ok
+CREATE TABLE my_vardim ("var_id" INTEGER,"dim_id" INTEGER,"dimpos" INTEGER)
+
query TT rowsort
select
ref_78.mod as c0,
@@ -18,7 +21,7 @@ from
on (ref_38.type_digits = ref_75.srid )
left join sys.schemas as ref_80
inner join sys.schemas as ref_81
- left join sys.netcdf_vardim as ref_95
+ left join my_vardim as ref_95
inner join sys._columns as ref_96
on (ref_95.dim_id = ref_96.id )
on (ref_81.owner = ref_96.id )
@@ -40,3 +43,6 @@ where ref_38.table_id is NULL
limit 63
----
+statement ok
+DROP TABLE my_vardim
+
diff --git a/sql/test/concurrent/Tests/segments-corruption.py
b/sql/test/concurrent/Tests/segments-corruption.SQL.py
rename from sql/test/concurrent/Tests/segments-corruption.py
rename to sql/test/concurrent/Tests/segments-corruption.SQL.py
diff --git a/testing/suppres.txt b/testing/suppress.txt
rename from testing/suppres.txt
rename to testing/suppress.txt
--- a/testing/suppres.txt
+++ b/testing/suppress.txt
@@ -1,6 +1,6 @@
-# when running testing with sanatizer use
+# when running testing with sanitizer use
# export ASAN_OPTIONS=print_suppressions=0
-# export LSAN_OPTIONS=suppressions=$src/testing/suppres.txt
+# export LSAN_OPTIONS=suppressions=$src/testing/suppress.txt
# This is a known leak.
leak:PyObject_Malloc
leak:PyMem_Malloc
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
