Changeset: e154388a88e1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e154388a88e1
Modified Files:
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/modules/mal/clients.c
Branch: simplify_scenario
Log Message:
merged with default
diffs (truncated from 374 to 300 lines):
diff --git a/clients/odbc/tests/CMakeLists.txt
b/clients/odbc/tests/CMakeLists.txt
--- a/clients/odbc/tests/CMakeLists.txt
+++ b/clients/odbc/tests/CMakeLists.txt
@@ -30,10 +30,18 @@ target_link_libraries(ODBCmetadata
PRIVATE
ODBC::ODBC)
+add_executable(ODBCtester
+ ODBCtester.c)
+
+target_link_libraries(ODBCtester
+ PRIVATE
+ ODBC::ODBC)
+
install(TARGETS
ODBCgetInfo
ODBCStmtAttr
ODBCmetadata
+ ODBCtester
RUNTIME
DESTINATION
${CMAKE_INSTALL_BINDIR}
@@ -44,6 +52,7 @@ if(WIN32)
$<TARGET_PDB_FILE:ODBCgetInfo>
$<TARGET_PDB_FILE:ODBCStmtAttr>
$<TARGET_PDB_FILE:ODBCmetadata>
+ $<TARGET_PDB_FILE:ODBCtester>
DESTINATION ${CMAKE_INSTALL_BINDIR}
OPTIONAL)
endif()
diff --git a/clients/odbc/tests/ODBCtester.c b/clients/odbc/tests/ODBCtester.c
new file mode 100644
--- /dev/null
+++ b/clients/odbc/tests/ODBCtester.c
@@ -0,0 +1,227 @@
+/*
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * 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/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
+ */
+
+#ifdef _MSC_VER
+#include <WTypes.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <sql.h>
+#include <sqlext.h>
+
+static void
+prerr(SQLSMALLINT tpe, SQLHANDLE hnd, const char *func, const char *pref)
+{
+ SQLCHAR state[6];
+ SQLINTEGER errnr;
+ SQLCHAR msg[256];
+ SQLSMALLINT msglen;
+ SQLRETURN ret;
+
+ ret = SQLGetDiagRec(tpe, hnd, 1, state, &errnr, msg, sizeof(msg),
&msglen);
+ switch (ret) {
+ case SQL_SUCCESS_WITH_INFO:
+ if (msglen >= (signed int) sizeof(msg))
+ fprintf(stderr, "(message truncated)\n");
+ /* fall through */
+ case SQL_SUCCESS:
+ fprintf(stderr, "%s: %s: SQLstate %s, Errnr %d, Message %s\n",
func, pref, (char*)state, (int)errnr, (char*)msg);
+ break;
+ case SQL_INVALID_HANDLE:
+ fprintf(stderr, "%s: %s, invalid handle passed to error
function\n", func, pref);
+ break;
+ case SQL_ERROR:
+ fprintf(stderr, "%s: %s, unexpected error from
SQLGetDiagRec\n", func, pref);
+ break;
+ case SQL_NO_DATA:
+ break;
+ default:
+ fprintf(stderr, "%s: %s, weird return value from
SQLGetDiagRec\n", func, pref);
+ break;
+ }
+}
+
+static void
+check(SQLRETURN ret, SQLSMALLINT tpe, SQLHANDLE hnd, const char *func)
+{
+ switch (ret) {
+ case SQL_SUCCESS:
+ break;
+ case SQL_SUCCESS_WITH_INFO:
+ prerr(tpe, hnd, func, "Info");
+ break;
+ case SQL_ERROR:
+ prerr(tpe, hnd, func, "Error");
+ break;
+ case SQL_NO_DATA:
+ break;
+ case SQL_INVALID_HANDLE:
+ fprintf(stderr, "%s: Error: invalid handle\n", func);
+ break;
+ default:
+ fprintf(stderr, "%s: Unexpected return value\n", func);
+ break;
+ }
+}
+
+static void
+compareResult(char * testname, char * testresult, char * expected)
+{
+ if (strcmp(expected, testresult) != 0) {
+ fprintf(stderr, "Testing %s\nGotten:\n%s\nExpected:\n%s\n",
testname, testresult, expected);
+ }
+}
+
+static SQLRETURN
+testGetDataTruncatedString(SQLHANDLE stmt, SWORD ctype)
+{
+ SQLRETURN ret;
+ SQLLEN RowCount = 0;
+ SWORD NumResultCols = 0;
+
+ size_t outp_len = 600;
+ char * outp = malloc(outp_len);
+ size_t pos = 0;
+
+// char * sql = "select tag as \"qtag\", sessionid as \"sessionid\",
username as \"username\", started as \"started\", status as \"status\", query
as \"query\", finished as \"finished\", maxworkers as \"maxworkers\", footprint
as \"footprint\" from sys.queue() where query like
'/*e6dbd251960c49bbbeff9784fa70c86d*/%';";
+ char * sql = "select cast('12345678901234567890
abcdefghijklmnopqrstuvwxyz' as clob) as val;";
+ ret = SQLExecDirect(stmt, (SQLCHAR *) sql, SQL_NTS);
+ pos += snprintf(outp + pos, outp_len - pos, "SQLExecDirect\n");
+ check(ret, SQL_HANDLE_STMT, stmt, "SQLExecDirect");
+
+ ret = SQLRowCount(stmt, &RowCount);
+ pos += snprintf(outp + pos, outp_len - pos, "SQLRowCount is %ld\n",
RowCount);
+ check(ret, SQL_HANDLE_STMT, stmt, "SQLRowCount");
+
+ ret = SQLNumResultCols(stmt, &NumResultCols);
+ pos += snprintf(outp + pos, outp_len - pos, "SQLNumResultCols is %d\n",
NumResultCols);
+ check(ret, SQL_HANDLE_STMT, stmt, "SQLNumResultCols");
+
+ ret = SQLFetch(stmt);
+ pos += snprintf(outp + pos, outp_len - pos, "SQLFetch\n");
+ check(ret, SQL_HANDLE_STMT, stmt, "SQLFetch");
+
+ for (SWORD col = 1; col <= NumResultCols; col++) {
+ char buf[99];
+ char buf2[99];
+ SQLLEN vallen = 0;
+ char * ctype_str = (ctype == SQL_C_CHAR ? "SQL_C_CHAR" : ctype
== SQL_C_WCHAR ? "SQL_C_WCHAR" : "NYI");
+
+ /* test SQLGetData(SQL_C_(W)CHAR, 20) with a restricted buffer
size (20) for the queried string value (47) */
+ ret = SQLGetData(stmt, (UWORD)col, (SWORD)ctype, (PTR)&buf,
(SQLLEN)20, &vallen);
+ pos += snprintf(outp + pos, outp_len - pos, "SQLGetData(%d, %s,
20) returns %d, vallen %ld, buf: '%s'\n", col, ctype_str, ret, vallen, buf);
+ /* we expect SQL_SUCCESS_WITH_INFO with warning msg set, fetch
them */
+ if (ret == SQL_SUCCESS_WITH_INFO) {
+ SQLCHAR state[6];
+ SQLINTEGER errnr;
+ SQLCHAR msg[256];
+ SQLSMALLINT msglen;
+ ret = SQLGetDiagRec(SQL_HANDLE_STMT, stmt, 1, state,
&errnr, msg, sizeof(msg), &msglen);
+ pos += snprintf(outp + pos, outp_len - pos, "SQLstate
%s, Errnr %d, Message %s\n", (char*)state, (int)errnr, (char*)msg);
+
+ /* get the next data part of the value (this is how
SQLGetData is intended to be used to get large data in chunks) */
+ ret = SQLGetData(stmt, (UWORD)col, (SWORD)ctype,
(PTR)&buf2, (SQLLEN)30, &vallen);
+ pos += snprintf(outp + pos, outp_len - pos,
"SQLGetData(%d, %s, 30) returns %d, vallen %ld, buf: '%s'\n", col, ctype_str,
ret, vallen, buf2);
+ if (ret == SQL_SUCCESS_WITH_INFO) {
+ ret = SQLGetDiagRec(SQL_HANDLE_STMT, stmt, 1,
state, &errnr, msg, sizeof(msg), &msglen);
+ pos += snprintf(outp + pos, outp_len - pos,
"SQLstate %s, Errnr %d, Message %s\n", (char*)state, (int)errnr, (char*)msg);
+ }
+ }
+ check(ret, SQL_HANDLE_STMT, stmt, "SQLGetData(col)");
+ }
+
+ if (ctype == SQL_C_CHAR) {
+ compareResult("testGetDataTruncatedString(SQL_C_CHAR)", outp,
+ "SQLExecDirect\nSQLRowCount is 1\nSQLNumResultCols is
1\nSQLFetch\n"
+ "SQLGetData(1, SQL_C_CHAR, 20) returns 1, vallen 47,
buf: '1234567890123456789'\n"
+ "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver
11.46.0][MonetDB-Test]String data, right truncated\n"
+ "SQLGetData(1, SQL_C_CHAR, 30) returns 0, vallen 28,
buf: '0 abcdefghijklmnopqrstuvwxyz'\n");
+ } else
+ if (ctype == SQL_C_WCHAR) {
+ compareResult("testGetDataTruncatedString(SQL_C_WCHAR)", outp,
+ "SQLExecDirect\nSQLRowCount is 1\nSQLNumResultCols is
1\nSQLFetch\n"
+ "SQLGetData(1, SQL_C_WCHAR, 20) returns 1, vallen 94,
buf: '1'\n"
+ "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver
11.46.0][MonetDB-Test]String data, right truncated\n"
+ "SQLGetData(1, SQL_C_WCHAR, 30) returns 1, vallen 76,
buf: '0'\n"
+ "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver
11.46.0][MonetDB-Test]String data, right truncated\n");
+ }
+
+ /* cleanup */
+ free(outp);
+ return ret;
+}
+
+int
+main(int argc, char **argv)
+{
+ SQLRETURN ret;
+ SQLHANDLE env;
+ SQLHANDLE dbc;
+ SQLHANDLE stmt;
+ char *dsn = "MonetDB";
+ char *user = "monetdb";
+ char *pass = "monetdb";
+
+ if (argc > 1)
+ dsn = argv[1];
+ if (argc > 2)
+ user = argv[2];
+ if (argc > 3)
+ pass = argv[3];
+ if (argc > 4 || *dsn == '-') {
+ fprintf(stderr, "Wrong arguments. Usage: %s [datasource [user
[password]]]\n", argv[0]);
+ exit(1);
+ }
+
+ ret = SQLAllocHandle(SQL_HANDLE_ENV, NULL, &env);
+ if (ret != SQL_SUCCESS) {
+ fprintf(stderr, "Cannot allocate ODBC environment handle!\n");
+ exit(1);
+ }
+
+ ret = SQLSetEnvAttr(env, SQL_ATTR_ODBC_VERSION, (SQLPOINTER)
(uintptr_t) SQL_OV_ODBC3, 0);
+ check(ret, SQL_HANDLE_ENV, env, "SQLSetEnvAttr (SQL_ATTR_ODBC_VERSION
ODBC3)");
+
+ ret = SQLAllocHandle(SQL_HANDLE_DBC, env, &dbc);
+ check(ret, SQL_HANDLE_ENV, env, "SQLAllocHandle (DBC)");
+
+ ret = SQLConnect(dbc, (SQLCHAR *) dsn, SQL_NTS, (SQLCHAR *) user,
SQL_NTS, (SQLCHAR *) pass, SQL_NTS);
+ check(ret, SQL_HANDLE_DBC, dbc, "SQLConnect");
+
+ ret = SQLAllocHandle(SQL_HANDLE_STMT, dbc, &stmt);
+ check(ret, SQL_HANDLE_DBC, dbc, "SQLAllocHandle (STMT)");
+
+ /* run tests */
+ ret = testGetDataTruncatedString(stmt, SQL_C_CHAR);
+ check(ret, SQL_HANDLE_STMT, stmt, "testGetDataTruncatedString (STMT,
SQL_C_CHAR)");
+
+ ret = SQLCloseCursor(stmt);
+ check(ret, SQL_HANDLE_STMT, stmt, "SQLCloseCursor (STMT)");
+
+ ret = testGetDataTruncatedString(stmt, SQL_C_WCHAR);
+ check(ret, SQL_HANDLE_STMT, stmt, "testGetDataTruncatedString (STMT,
SQL_C_WCHAR)");
+
+ /* cleanup */
+ ret = SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+ check(ret, SQL_HANDLE_STMT, stmt, "SQLFreeHandle (STMT)");
+
+ ret = SQLDisconnect(dbc);
+ check(ret, SQL_HANDLE_DBC, dbc, "SQLDisconnect");
+
+ ret = SQLFreeHandle(SQL_HANDLE_DBC, dbc);
+ check(ret, SQL_HANDLE_DBC, dbc, "SQLFreeHandle (DBC)");
+
+ ret = SQLFreeHandle(SQL_HANDLE_ENV, env);
+ check(ret, SQL_HANDLE_ENV, env, "SQLFreeHandle (ENV)");
+
+ return 0;
+}
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -257,6 +257,7 @@ MCinitClientRecord(Client c, oid user, b
c->memorylimit = 0;
c->qryctx.querytimeout = 0;
c->sessiontimeout = 0;
+ c->logical_sessiontimeout = 0;
c->qryctx.starttime = 0;
ATOMIC_SET(&c->qryctx.datasize, 0);
c->qryctx.maxmem = 0;
@@ -397,6 +398,7 @@ MCcloseClient(Client c)
c->memorylimit = 0;
c->qryctx.querytimeout = 0;
c->sessiontimeout = 0;
+ c->logical_sessiontimeout = 0;
c->user = oid_nil;
if (c->username) {
GDKfree(c->username);
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
@@ -75,6 +75,7 @@ typedef struct CLIENT {
int memorylimit; /* maximum memory currently
allowed in MB */
lng maxmem; /* max_memory from
db_user_info table */
lng sessiontimeout; /* session abort after x usec,
0 = no limit */
+ lng logical_sessiontimeout; /* logical session timeout, client
defined */
QryCtx qryctx; /* per query limitations */
time_t login; /* Time when this session started */
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -533,8 +533,10 @@ CLTsessionTimeout(Client cntxt, MalBlkPt
MT_lock_set(&mal_contextLock);
if (mal_clients[idx].mode == FREECLIENT)
msg = createException(MAL,"clients.setsessiontimeout","Session
not active anymore");
- else
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
