Changeset: 66308d02abfa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66308d02abfa
Removed Files:
sql/backends/monet5/sql_session.c
sql/backends/monet5/sql_session.h
sql/backends/monet5/sql_session.mal
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/modules/mal/CMakeLists.txt
monetdb5/modules/mal/clients.c
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/sql.c
sql/backends/monet5/vaults/fits/fits.c
Branch: default
Log Message:
Removed unused code.
diffs (286 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -9429,20 +9429,6 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "sessions", "pattern sql.sessions() (X_0:bat[:int],
X_1:bat[:str], X_2:bat[:timestamp], X_3:bat[:timestamp], X_4:bat[:str],
X_5:bat[:int], X_6:bat[:int], X_7:bat[:int], X_8:bat[:int]) ",
"sql_sessions_wrap;", "" ]
[ "sql", "setVariable", "unsafe pattern sql.setVariable(X_1:int,
X_2:str, X_3:str, X_4:any_1):int ", "setVariable;", "" ]
[ "sql", "set_protocol", "unsafe pattern sql.set_protocol(X_1:int):int
", "SQLset_protocol;", "" ]
-[ "sql", "setmemorylimit", "unsafe pattern
sql.setmemorylimit(X_1:int):void ", "SQLsetmemorylimit;", "" ]
-[ "sql", "setmemorylimit", "unsafe pattern
sql.setmemorylimit(X_1:sht, X_2:int):void ", "SQLsetmemorylimit;", ""
]
-[ "sql", "setoptimizer", "unsafe pattern sql.setoptimizer(X_1:int,
X_2:str):void ", "SQLsetoptimizer;", "" ]
-[ "sql", "setoptimizer", "unsafe pattern sql.setoptimizer(X_1:str):void
", "SQLsetoptimizer;", "" ]
-[ "sql", "setquerytimeout", "unsafe pattern
sql.setquerytimeout(X_1:bte, X_2:int):void ", "SQLqueryTimeout;", ""
]
-[ "sql", "setquerytimeout", "unsafe pattern
sql.setquerytimeout(X_1:int):void ", "SQLqueryTimeout;", "" ]
-[ "sql", "setquerytimeout", "unsafe pattern
sql.setquerytimeout(X_1:int, X_2:int):void ", "SQLqueryTimeout;", ""
]
-[ "sql", "setquerytimeout", "unsafe pattern
sql.setquerytimeout(X_1:sht, X_2:int):void ", "SQLqueryTimeout;", ""
]
-[ "sql", "setsessiontimeout", "unsafe pattern
sql.setsessiontimeout(X_1:bte, X_2:int):void ", "SQLsessionTimeout;", ""
]
-[ "sql", "setsessiontimeout", "unsafe pattern
sql.setsessiontimeout(X_1:int):void ", "SQLsessionTimeout;", "" ]
-[ "sql", "setsessiontimeout", "unsafe pattern
sql.setsessiontimeout(X_1:int, X_2:int):void ", "SQLsessionTimeout;", ""
]
-[ "sql", "setsessiontimeout", "unsafe pattern
sql.setsessiontimeout(X_1:sht, X_2:int):void ", "SQLsessionTimeout;", ""
]
-[ "sql", "setworkerlimit", "unsafe pattern
sql.setworkerlimit(X_1:int):void ", "SQLsetworkerlimit;", "" ]
-[ "sql", "setworkerlimit", "unsafe pattern
sql.setworkerlimit(X_1:int, X_2:int):void ", "SQLsetworkerlimit;", ""
]
[ "sql", "shrink", "unsafe pattern sql.shrink(X_1:str,
X_2:str):void ", "SQLshrink;", "" ]
[ "sql", "shutdown", "pattern sql.shutdown(X_1:bte):str ",
"SQLshutdown_wrap;", "" ]
[ "sql", "shutdown", "pattern sql.shutdown(X_1:bte, X_2:bit):str ",
"SQLshutdown_wrap;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -12741,20 +12741,6 @@ stdout of test 'MAL-signatures` in direc
[ "sql", "sessions", "pattern sql.sessions() (X_0:bat[:int],
X_1:bat[:str], X_2:bat[:timestamp], X_3:bat[:timestamp], X_4:bat[:str],
X_5:bat[:int], X_6:bat[:int], X_7:bat[:int], X_8:bat[:int]) ",
"sql_sessions_wrap;", "" ]
[ "sql", "setVariable", "unsafe pattern sql.setVariable(X_1:int,
X_2:str, X_3:str, X_4:any_1):int ", "setVariable;", "" ]
[ "sql", "set_protocol", "unsafe pattern sql.set_protocol(X_1:int):int
", "SQLset_protocol;", "" ]
-[ "sql", "setmemorylimit", "unsafe pattern
sql.setmemorylimit(X_1:int):void ", "SQLsetmemorylimit;", "" ]
-[ "sql", "setmemorylimit", "unsafe pattern
sql.setmemorylimit(X_1:sht, X_2:int):void ", "SQLsetmemorylimit;", ""
]
-[ "sql", "setoptimizer", "unsafe pattern sql.setoptimizer(X_1:int,
X_2:str):void ", "SQLsetoptimizer;", "" ]
-[ "sql", "setoptimizer", "unsafe pattern sql.setoptimizer(X_1:str):void
", "SQLsetoptimizer;", "" ]
-[ "sql", "setquerytimeout", "unsafe pattern
sql.setquerytimeout(X_1:bte, X_2:int):void ", "SQLqueryTimeout;", ""
]
-[ "sql", "setquerytimeout", "unsafe pattern
sql.setquerytimeout(X_1:int):void ", "SQLqueryTimeout;", "" ]
-[ "sql", "setquerytimeout", "unsafe pattern
sql.setquerytimeout(X_1:int, X_2:int):void ", "SQLqueryTimeout;", ""
]
-[ "sql", "setquerytimeout", "unsafe pattern
sql.setquerytimeout(X_1:sht, X_2:int):void ", "SQLqueryTimeout;", ""
]
-[ "sql", "setsessiontimeout", "unsafe pattern
sql.setsessiontimeout(X_1:bte, X_2:int):void ", "SQLsessionTimeout;", ""
]
-[ "sql", "setsessiontimeout", "unsafe pattern
sql.setsessiontimeout(X_1:int):void ", "SQLsessionTimeout;", "" ]
-[ "sql", "setsessiontimeout", "unsafe pattern
sql.setsessiontimeout(X_1:int, X_2:int):void ", "SQLsessionTimeout;", ""
]
-[ "sql", "setsessiontimeout", "unsafe pattern
sql.setsessiontimeout(X_1:sht, X_2:int):void ", "SQLsessionTimeout;", ""
]
-[ "sql", "setworkerlimit", "unsafe pattern
sql.setworkerlimit(X_1:int):void ", "SQLsetworkerlimit;", "" ]
-[ "sql", "setworkerlimit", "unsafe pattern
sql.setworkerlimit(X_1:int, X_2:int):void ", "SQLsetworkerlimit;", ""
]
[ "sql", "shrink", "unsafe pattern sql.shrink(X_1:str,
X_2:str):void ", "SQLshrink;", "" ]
[ "sql", "shutdown", "pattern sql.shutdown(X_1:bte):str ",
"SQLshutdown_wrap;", "" ]
[ "sql", "shutdown", "pattern sql.shutdown(X_1:bte, X_2:bit):str ",
"SQLshutdown_wrap;", "" ]
diff --git a/monetdb5/modules/mal/CMakeLists.txt
b/monetdb5/modules/mal/CMakeLists.txt
--- a/monetdb5/modules/mal/CMakeLists.txt
+++ b/monetdb5/modules/mal/CMakeLists.txt
@@ -41,7 +41,7 @@ target_sources(malmodules
tracer.c
projectionpath.c
tablet.c tablet.h
- batcalc.c calc.c
+ batcalc.c calc.c
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/wlc.h)
@@ -51,6 +51,7 @@ target_include_directories(malmodules
$<TARGET_PROPERTY:kernel,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:mapi,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:atoms,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:optimizer,INTERFACE_INCLUDE_DIRECTORIES>
$<$<BOOL:${COMMONCRYPTO_FOUND}>:${COMMONCRYPTO_INCLUDE_DIR}>
$<$<BOOL:${OPENSSL_FOUND}>:$<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_INCLUDE_DIRECTORIES>>
PUBLIC
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
@@ -24,6 +24,7 @@
#include "mal_client.h"
#include "mal_authorize.h"
#include "mal_internal.h"
+#include "opt_pipes.h"
#include "gdk_time.h"
static int
@@ -244,7 +245,7 @@ CLTsetoptimizer(Client cntxt, MalBlkPtr
opt = *getArgReference_str(stk,pci,1);
}
- if( idx < 0 || idx > MAL_MAXCLIENTS)
+ if (idx < 0 || idx > MAL_MAXCLIENTS)
throw(MAL,"clients.setoptimizer","Illegal session id");
if (strNil(opt))
throw(MAL,"clients.setoptimizer","Input string cannot be NULL");
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
@@ -73,7 +73,6 @@ target_sources(sql
sql_statement.c sql_statement.h
sql_statistics.c sql_statistics.h
sql_gencode.c sql_gencode.h
- sql_session.c sql_session.h
sql_optimizer.c sql_optimizer.h
sql_result.c sql_result.h
sql_cast.c sql_cast.h
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
@@ -5440,7 +5440,6 @@ finalize:
#include "sql_rank.h"
#include "sql_user.h"
#include "sql_assert.h"
-#include "sql_session.h"
#include "sql_execute.h"
#include "sql_orderidx.h"
#include "sql_subquery.h"
@@ -6373,21 +6372,6 @@ static mel_func sql_init_funcs[] = {
pattern("sql", "transaction_rollback", SQLtransaction_rollback, true, "A
transaction statement (type can be commit,release,rollback or start)",
args(1,3, arg("",void),arg("chain",int),arg("name",str))),
pattern("sql", "transaction_begin", SQLtransaction_begin, true, "A
transaction statement (type can be commit,release,rollback or start)",
args(1,3, arg("",void),arg("chain",int),arg("name",str))),
pattern("sql", "transaction", SQLtransaction2, true, "Start an autocommit
transaction", noargs),
- /* sql_sesssion */
- pattern("sql", "setquerytimeout", SQLqueryTimeout, true, "", args(1,2,
arg("",void),arg("n",int))),
- pattern("sql", "setquerytimeout", SQLqueryTimeout, true, "", args(1,3,
arg("",void),arg("sid",bte),arg("n",int))),
- pattern("sql", "setquerytimeout", SQLqueryTimeout, true, "", args(1,3,
arg("",void),arg("sid",sht),arg("n",int))),
- pattern("sql", "setquerytimeout", SQLqueryTimeout, true, "A query is aborted
after q seconds (q=0 means run undisturbed).", args(1,3,
arg("",void),arg("sid",int),arg("n",int))),
- pattern("sql", "setsessiontimeout", SQLsessionTimeout, true, "", args(1,2,
arg("",void),arg("n",int))),
- pattern("sql", "setsessiontimeout", SQLsessionTimeout, true, "", args(1,3,
arg("",void),arg("sid",bte),arg("n",int))),
- pattern("sql", "setsessiontimeout", SQLsessionTimeout, true, "", args(1,3,
arg("",void),arg("sid",sht),arg("n",int))),
- pattern("sql", "setsessiontimeout", SQLsessionTimeout, true, "Set the session
timeout for a particulat session id", args(1,3,
arg("",void),arg("sid",int),arg("n",int))),
- pattern("sql", "setoptimizer", SQLsetoptimizer, true, "", args(1,2,
arg("",void),arg("opt",str))),
- pattern("sql", "setoptimizer", SQLsetoptimizer, true, "Set the session
optimizer", args(1,3, arg("",void),arg("sid",int),arg("opt",str))),
- pattern("sql", "setworkerlimit", SQLsetworkerlimit, true, "", args(1,2,
arg("",void),arg("n",int))),
- pattern("sql", "setworkerlimit", SQLsetworkerlimit, true, "Limit the number
of worker threads per query", args(1,3,
arg("",void),arg("sid",int),arg("n",int))),
- pattern("sql", "setmemorylimit", SQLsetmemorylimit, true, "", args(1,2,
arg("",void),arg("n",int))),
- pattern("sql", "setmemorylimit", SQLsetmemorylimit, true, "Limit the memory
claim in MB per query", args(1,3, arg("",void),arg("sid",sht),arg("n",int))),
#ifdef HAVE_HGE
/* sql_hge */
command("calc", "dec_round", hge_dec_round_wrap, false, "round off the value
v to nearests multiple of r", args(1,3, arg("",hge),arg("v",hge),arg("r",hge))),
diff --git a/sql/backends/monet5/sql_session.c
b/sql/backends/monet5/sql_session.c
deleted file mode 100644
--- a/sql/backends/monet5/sql_session.c
+++ /dev/null
@@ -1,62 +0,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 - 2020 MonetDB B.V.
- */
-
-/* (c) M.L. Kersten
- * The SQL session parameters can be pre-tested
-*/
-#include "monetdb_config.h"
-#include "mal_client.h"
-#include "mal_instruction.h"
-#include "clients.h"
-#include "opt_pipes.h"
-#include "sql_scenario.h"
-#include "sql_session.h"
-
-str
-SQLsetoptimizer(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- str opt;
-
- if( pci->argc == 3){
- opt = *getArgReference_str(stk,pci,2);
- } else {
- opt = *getArgReference_str(stk,pci,1);
- }
- if( ! isOptimizerPipe(opt))
- throw(SQL, "sqloptimizer", "Valid optimizer pipe expected");
-
- return CLTsetoptimizer(cntxt, mb, stk, pci);
-}
-
-str
-SQLsetworkerlimit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- // We might restrict this based on DBA limitations set
- return CLTsetworkerlimit(cntxt, mb, stk, pci);
-}
-
-str
-SQLsetmemorylimit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- // We might restrict this based on DBA limitations set
- return CLTsetmemorylimit(cntxt, mb, stk, pci);
-}
-
-str
-SQLqueryTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- // We might restrict this based on DBA limitations set
- return CLTqueryTimeout(cntxt, mb, stk, pci);
-}
-
-str
-SQLsessionTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- // We might restrict this based on DBA limitations set
- return CLTsessionTimeout(cntxt, mb, stk, pci);
-}
diff --git a/sql/backends/monet5/sql_session.h
b/sql/backends/monet5/sql_session.h
deleted file mode 100644
--- a/sql/backends/monet5/sql_session.h
+++ /dev/null
@@ -1,21 +0,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 - 2020 MonetDB B.V.
- */
-
-/* (co) M.L. Kersten */
-#ifndef _SQL_SESSION_H
-#define _SQL_SESSION_H
-
-#include "sql.h"
-
-sql5_export str SQLsetoptimizer(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str SQLsetworkerlimit(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str SQLsetmemorylimit(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str SQLqueryTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str SQLsessionTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-
-#endif /* _SQL_SESSION_H */
diff --git a/sql/backends/monet5/sql_session.mal
b/sql/backends/monet5/sql_session.mal
deleted file mode 100644
--- a/sql/backends/monet5/sql_session.mal
+++ /dev/null
@@ -1,45 +0,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 - 2020 MonetDB B.V.
-
-module sql;
-
-unsafe pattern sql.setquerytimeout(n:int):void
-address SQLqueryTimeout;
-unsafe pattern sql.setquerytimeout(sid:bte, n:int):void
-address SQLqueryTimeout;
-unsafe pattern sql.setquerytimeout(sid:sht, n:int):void
-address SQLqueryTimeout;
-unsafe pattern sql.setquerytimeout(sid:int, n:int):void
-address SQLqueryTimeout
-comment "A query is aborted after q seconds (q=0 means run undisturbed).";
-
-unsafe pattern sql.setsessiontimeout(n:int):void
-address SQLsessionTimeout;
-unsafe pattern sql.setsessiontimeout(sid:bte, n:int):void
-address SQLsessionTimeout;
-unsafe pattern sql.setsessiontimeout(sid:sht, n:int):void
-address SQLsessionTimeout;
-unsafe pattern sql.setsessiontimeout(sid:int, n:int):void
-address SQLsessionTimeout
-comment "Set the session timeout for a particular session id";
-
-unsafe pattern sql.setoptimizer(opt:str):void
-address SQLsetoptimizer;
-unsafe pattern sql.setoptimizer(sid:int, opt:str):void
-address SQLsetoptimizer
-comment "Set the session optimizer";
-
-unsafe pattern sql.setworkerlimit(n:int):void
-address SQLsetworkerlimit;
-unsafe pattern sql.setworkerlimit(sid:int, n:int):void
-address SQLsetworkerlimit
-comment "Limit the number of worker threads per query";
-
-unsafe pattern sql.setmemorylimit(n:int):void
-address SQLsetmemorylimit;
-unsafe pattern sql.setmemorylimit(sid:sht, n:int):void
-address SQLsetmemorylimit
-comment "Limit the memory claim in MB per query";
diff --git a/sql/backends/monet5/vaults/fits/fits.c
b/sql/backends/monet5/vaults/fits/fits.c
--- a/sql/backends/monet5/vaults/fits/fits.c
+++ b/sql/backends/monet5/vaults/fits/fits.c
@@ -27,7 +27,6 @@
#include "sql_scenario.h"
#include "sql_execute.h"
#include "sql.h"
-#include "clients.h"
#include "mal_exception.h"
#define FITS_INS_COL "INSERT INTO sys.fits_columns(id, name, type, units,
number, table_id) \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
