Changeset: 1f3ed84d73b9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1f3ed84d73b9
Modified Files:
sql/backends/monet5/CMakeLists.txt
Branch: txtsim
Log Message:
merged with default
diffs (truncated from 704 to 300 lines):
diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog
--- a/clients/odbc/ChangeLog
+++ b/clients/odbc/ChangeLog
@@ -1,3 +1,8 @@
# ChangeLog file for odbc
# This file is updated with Maddlog
+* Thu Apr 13 2023 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
+- Enhanced SQLTables() by adding support for table type names: 'BASE TABLE',
+ 'GLOBAL TEMPORARY' and 'LOCAL TEMPORARY' in parameter TableType. These are
+ synonyms of: 'TABLE', 'GLOBAL TEMPORARY TABLE' and 'LOCAL TEMPORARY TABLE'.
+
diff --git a/clients/odbc/driver/SQLTables.c b/clients/odbc/driver/SQLTables.c
--- a/clients/odbc/driver/SQLTables.c
+++ b/clients/odbc/driver/SQLTables.c
@@ -221,6 +221,18 @@ MNDBTables(ODBCStmt *stmt,
continue;
}
buf[j] = 0;
+ /* Some ODBC applications use different
table type names.
+ * Replace those names to valid MonetDB
table type names
+ * as defined in sys.tables_types */
+ if (strcmp("BASE TABLE", buf) == 0) {
+ strcpy(buf, "TABLE");
+ } else
+ if (strcmp("GLOBAL TEMPORARY", buf) ==
0) {
+ strcpy(buf, "GLOBAL TEMPORARY
TABLE");
+ } else
+ if (strcmp("LOCAL TEMPORARY", buf) ==
0) {
+ strcpy(buf, "LOCAL TEMPORARY
TABLE");
+ }
pos += snprintf(query + pos, querylen -
pos, "'%s',", buf);
j = 0;
} else if (j < sizeof(buf) &&
diff --git a/clients/odbc/tests/ODBCmetadata.c
b/clients/odbc/tests/ODBCmetadata.c
--- a/clients/odbc/tests/ODBCmetadata.c
+++ b/clients/odbc/tests/ODBCmetadata.c
@@ -529,6 +529,36 @@ main(int argc, char **argv)
"NULL odbctst pk2c TABLE NULL\n"
"NULL odbctst pk_uc TABLE odbctst.pk_uc table comment\n");
+ ret = SQLTables(stmt, (SQLCHAR*)"", SQL_NTS,
+ (SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"%", SQL_NTS,
+ (SQLCHAR*)"BASE TABLE,GLOBAL TEMPORARY,LOCAL
TEMPORARY", SQL_NTS);
+ compareResult(stmt, ret, "SQLTables (odbctst, %)",
+ "Resultset with 5 columns\n"
+ "Resultset with 7 rows\n"
+ "TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE
REMARKS\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(25)
WVARCHAR(65000)\n"
+ "NULL odbctst CUSTOMERS TABLE NULL\n"
+ "NULL odbctst LINES TABLE NULL\n"
+ "NULL odbctst ORDERS TABLE NULL\n"
+ "NULL odbctst fk2c TABLE NULL\n"
+ "NULL odbctst nopk_twoucs TABLE odbctst.nopk_twoucs
table comment\n"
+ "NULL odbctst pk2c TABLE NULL\n"
+ "NULL odbctst pk_uc TABLE odbctst.pk_uc table comment\n");
+
+ // All user tables in schema tmp
+ ret = SQLTables(stmt, (SQLCHAR*)"", SQL_NTS,
+ (SQLCHAR*)"tmp", SQL_NTS, (SQLCHAR*)"%", SQL_NTS,
+ (SQLCHAR*)"'BASE TABLE','GLOBAL TEMPORARY','LOCAL
TEMPORARY'", SQL_NTS);
+ compareResult(stmt, ret, "SQLTables (tmp, %)",
+ "Resultset with 5 columns\n"
+ "Resultset with 4 rows\n"
+ "TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE
REMARKS\n"
+ "WVARCHAR(1) WVARCHAR(1024) WVARCHAR(1024) WVARCHAR(25)
WVARCHAR(65000)\n"
+ "NULL tmp glbl_nopk_twoucs GLOBAL TEMPORARY TABLE
NULL\n"
+ "NULL tmp glbl_pk_uc GLOBAL TEMPORARY TABLE NULL\n"
+ "NULL tmp tmp_nopk_twoucs LOCAL TEMPORARY TABLE NULL\n"
+ "NULL tmp tmp_pk_uc LOCAL TEMPORARY TABLE
NULL\n");
+
// All user tables and views in schema odbctst
ret = SQLTables(stmt, (SQLCHAR*)"", SQL_NTS,
(SQLCHAR*)"odbctst", SQL_NTS, (SQLCHAR*)"%", SQL_NTS,
diff --git a/clients/odbc/tests/ODBCtester.c b/clients/odbc/tests/ODBCtester.c
--- a/clients/odbc/tests/ODBCtester.c
+++ b/clients/odbc/tests/ODBCtester.c
@@ -17,7 +17,9 @@
#include <string.h>
#include <sql.h>
#include <sqlext.h>
+#include <ctype.h>
#include <inttypes.h>
+#include <wchar.h>
static void
prerr(SQLSMALLINT tpe, SQLHANDLE hnd, const char *func, const char *pref)
@@ -74,6 +76,29 @@ check(SQLRETURN ret, SQLSMALLINT tpe, SQ
}
}
+static size_t
+retrieveDiagMsg(SQLHANDLE stmt, char * outp, size_t outp_len)
+{
+ SQLCHAR state[6];
+ SQLINTEGER errnr = 0;
+ char msg[256];
+ SQLSMALLINT msglen = 0;
+ SQLRETURN ret = SQLGetDiagRec(SQL_HANDLE_STMT, stmt, 1, state, &errnr,
(SQLCHAR *) msg, sizeof(msg), &msglen);
+ if (ret == SQL_SUCCESS || ret == SQL_SUCCESS_WITH_INFO) {
+ /* The message layout is: "[MonetDB][ODBC Driver
11.46.0][MonetDB-Test]error/warning text".
+ The ODBC driver version numbers changes in time. Overwrite
it to get a stable output */
+ if (strncmp(msg, "[MonetDB][ODBC Driver 11.", 25) == 0) {
+ for (int i = 25; msg[i] != ']'; i++) {
+ if (isdigit(msg[i])) {
+ msg[i] = '#';
+ }
+ }
+ }
+ return snprintf(outp, outp_len, "SQLstate %s, Errnr %d, Message
%s\n", (char*)state, (int)errnr, (char*)msg);
+ }
+ return 0;
+}
+
static void
compareResult(char * testname, char * testresult, char * expected)
{
@@ -91,7 +116,7 @@ testGetDataTruncatedString(SQLHANDLE stm
SQLLEN RowCount = 0;
SWORD NumResultCols = 0;
- size_t outp_len = 600;
+ size_t outp_len = 800;
char * outp = malloc(outp_len);
size_t pos = 0;
@@ -115,28 +140,45 @@ testGetDataTruncatedString(SQLHANDLE stm
for (SWORD col = 1; col <= NumResultCols; col++) {
char buf[99];
+ wchar_t wbuf[99];
char buf2[99];
+ wchar_t wbuf2[99];
SQLLEN vallen = 0;
+ SQLLEN NumAttr = 0;
char * ctype_str = (ctype == SQL_C_CHAR ? "SQL_C_CHAR" : ctype
== SQL_C_WCHAR ? "SQL_C_WCHAR" : "NYI");
+ /* retrieve query result column metadata */
+ ret = SQLColAttribute(stmt, (UWORD)col, SQL_DESC_CONCISE_TYPE,
(PTR)&buf, (SQLLEN)20, NULL, &NumAttr);
+ pos += snprintf(outp + pos, outp_len - pos,
"SQLColAttribute(%d, SQL_DESC_CONCISE_TYPE) returns %d, NumAttr " LLFMT "\n",
col, ret, (int64_t) NumAttr);
+ ret = SQLColAttribute(stmt, (UWORD)col, SQL_DESC_LENGTH,
(PTR)&buf, (SQLLEN)20, NULL, &NumAttr);
+ pos += snprintf(outp + pos, outp_len - pos,
"SQLColAttribute(%d, SQL_DESC_LENGTH) returns %d, NumAttr " LLFMT "\n", col,
ret, (int64_t) NumAttr);
+ ret = SQLColAttribute(stmt, (UWORD)col, SQL_DESC_DISPLAY_SIZE,
(PTR)&buf, (SQLLEN)20, NULL, &NumAttr);
+ pos += snprintf(outp + pos, outp_len - pos,
"SQLColAttribute(%d, SQL_DESC_DISPLAY_SIZE) returns %d, NumAttr " LLFMT "\n",
col, ret, (int64_t) NumAttr);
+
/* 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);
+ ret = SQLGetData(stmt, (UWORD)col, (SWORD)ctype, ctype ==
SQL_C_WCHAR ? (PTR)&wbuf : (PTR)&buf, (SQLLEN)20, &vallen);
+ if (ctype == SQL_C_WCHAR) {
+ /* snprintf does not allow printing wchar strings.
convert it to a char string */
+ /* tried: wcstombs(buf, wbuf, 99); but it doesn't work
*/
+ /* workaround: just empty the buffer to get a stable
output on all platforms (power8 gives a different output) */
+ buf[0] = 0;
+ }
pos += snprintf(outp + pos, outp_len - pos, "SQLGetData(%d, %s,
20) returns %d, vallen " LLFMT ", buf: '%s'\n", col, ctype_str, ret, (int64_t)
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);
+ pos += retrieveDiagMsg(stmt, outp + pos, outp_len -
pos);
/* 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);
+ ret = SQLGetData(stmt, (UWORD)col, (SWORD)ctype, ctype
== SQL_C_WCHAR ? (PTR)&wbuf2 : (PTR)&buf2, (SQLLEN)30, &vallen);
+ if (ctype == SQL_C_WCHAR) {
+ /* tried: wcstombs(buf2, wbuf2, 99); but it
doesn't work */
+ /* workaround: just empty the buffer to get a
stable output on all platforms (power8 gives a different output) */
+ buf2[0] = 0;
+ }
pos += snprintf(outp + pos, outp_len - pos,
"SQLGetData(%d, %s, 30) returns %d, vallen " LLFMT ", buf: '%s'\n", col,
ctype_str, ret, (int64_t) 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);
+ pos += retrieveDiagMsg(stmt, outp + pos,
outp_len - pos);
+ ret = SQL_SUCCESS;
}
}
check(ret, SQL_HANDLE_STMT, stmt, "SQLGetData(col)");
@@ -145,17 +187,23 @@ testGetDataTruncatedString(SQLHANDLE stm
if (ctype == SQL_C_CHAR) {
compareResult("testGetDataTruncatedString(SQL_C_CHAR)", outp,
"SQLExecDirect\nSQLRowCount is 1\nSQLNumResultCols is
1\nSQLFetch\n"
+ "SQLColAttribute(1, SQL_DESC_CONCISE_TYPE) returns 0,
NumAttr -10\n" /* -10 = SQL_WLONGVARCHAR */
+ "SQLColAttribute(1, SQL_DESC_LENGTH) returns 0, NumAttr
47\n"
+ "SQLColAttribute(1, SQL_DESC_DISPLAY_SIZE) returns 0,
NumAttr 47\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"
+ "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver
11.##.#][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");
+ "SQLColAttribute(1, SQL_DESC_CONCISE_TYPE) returns 0,
NumAttr -10\n" /* -10 = SQL_WLONGVARCHAR */
+ "SQLColAttribute(1, SQL_DESC_LENGTH) returns 0, NumAttr
47\n"
+ "SQLColAttribute(1, SQL_DESC_DISPLAY_SIZE) returns 0,
NumAttr 47\n"
+ "SQLGetData(1, SQL_C_WCHAR, 20) returns 1, vallen 94,
buf: ''\n"
+ "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver
11.##.#][MonetDB-Test]String data, right truncated\n"
+ "SQLGetData(1, SQL_C_WCHAR, 30) returns 1, vallen 76,
buf: ''\n"
+ "SQLstate 01004, Errnr 0, Message [MonetDB][ODBC Driver
11.##.#][MonetDB-Test]String data, right truncated\n");
}
/* cleanup */
@@ -205,13 +253,13 @@ main(int argc, char **argv)
/* run tests */
ret = testGetDataTruncatedString(stmt, SQL_C_CHAR);
- check(ret, SQL_HANDLE_STMT, stmt, "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)");
+ check(ret, SQL_HANDLE_STMT, stmt, "SQLCloseCursor");
ret = testGetDataTruncatedString(stmt, SQL_C_WCHAR);
- check(ret, SQL_HANDLE_STMT, stmt, "testGetDataTruncatedString (STMT,
SQL_C_WCHAR)");
+ check(ret, SQL_HANDLE_STMT, stmt, "testGetDataTruncatedString(STMT,
SQL_C_WCHAR)");
/* cleanup */
ret = SQLFreeHandle(SQL_HANDLE_STMT, stmt);
diff --git a/documentation/source/build.rst b/documentation/source/build.rst
--- a/documentation/source/build.rst
+++ b/documentation/source/build.rst
@@ -104,7 +104,7 @@ Run as Administrator::
@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile
-InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object
System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" &&
SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
choco feature enable -n allowGlobalConfirmation
choco install ActivePerl ant ruby python3 hg git winflexbison
- cinst VisualStudio2017community --package-parameters "--add
Microsoft.VisualStudio.Workload.NativeDesktop --add
microsoft.visualstudio.component.vc.cmake.project --add
microsoft.visualstudio.component.vc.ATLMFC"
+ cinst VisualStudio2019community --package-parameters "--add
Microsoft.VisualStudio.Workload.NativeDesktop --add
microsoft.visualstudio.component.vc.cmake.project --add
microsoft.visualstudio.component.vc.ATLMFC"
refreshenv
cd \
@@ -120,13 +120,13 @@ To compile MonetDB (as normal user)::
hg clone https://dev.monetdb.org/hg/MonetDB/
- "c:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\common7\tools\vsdevcmd.bat"
- "c:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+ "c:\Program Files (x86)\Microsoft Visual
Studio\2019\Community\common7\tools\vsdevcmd.bat"
+ "c:\Program Files (x86)\Microsoft Visual
Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
cd MonetDB
mkdir build
cd build
- cmake -G "Visual Studio 15 2017"
-DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake
-DCMAKE_INSTALL_PREFIX=%HOME%\install -A x64 ..
+ cmake -G "Visual Studio 16 2019"
-DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake
-DCMAKE_INSTALL_PREFIX=%HOME%\install -A x64 ..
cmake --build . --target ALL_BUILD --config Release
cmake --build . --target INSTALL --config Release
set
PATH=%HOME%\install\bin;%HOME%\install\lib;%HOME%\install\lib\monetdb5;\vcpkg\installed\x64-windows\bin;\vcpkg\installed\x64-windows\debug\bin;%PATH%
diff --git a/documentation/source/cmake.rst b/documentation/source/cmake.rst
--- a/documentation/source/cmake.rst
+++ b/documentation/source/cmake.rst
@@ -184,6 +184,6 @@ You need to install the wixtoolset (with
Then you can run the following command from the build directory: ::
- "C:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\CPack"
-G WIX -C Debug --config CPackConfig.cmake
+ "C:\Program Files (x86)\Microsoft Visual
Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\CPack"
-G WIX -C Debug --config CPackConfig.cmake
This will create the "msi" file.
diff --git a/sql/backends/monet5/CMakeLists.txt
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -132,6 +132,7 @@ target_sources(sql
sql_assert.c sql_assert.h
sql_upgrades.c sql_upgrades.h
rel_bin.c rel_bin.h
+ rel_physical.c rel_physical.h
rel_predicates.c rel_predicates.h
sql_cat.c sql_cat.h
sql_transaction.c sql_transaction.h
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -3544,18 +3544,34 @@ rel2bin_inter(backend *be, sql_rel *rel,
return rel_rename(be, rel, sub);
}
+static int
+find_matching_exp(list *exps, sql_exp *e)
+{
+ int i = 0;
+ for (node *n = exps->h; n; n = n->next, i++) {
+ if (exp_match(n->data, e))
+ return i;
+ }
+ return -1;
+}
+
static stmt *
-sql_reorder(backend *be, stmt *order, stmt *s)
+sql_reorder(backend *be, stmt *order, list *exps, stmt *s, list *oexps, list
*ostmts)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
