MonetDB: Apr2019 - Deprecate sql.start() and sql.start2().

[Martin Kersten]

Changeset: 533f3bb12c06 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=533f3bb12c06
Modified Files:
        sql/backends/monet5/sql_scenario.c
Branch: Apr2019
Log Message:

Deprecate sql.start() and sql.start2().


diffs (54 lines):

diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -86,47 +86,19 @@ monet5_freecode(int clientid, backend_co
 str
 SQLsession(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
-       str msg = MAL_SUCCEED;
-       str logmsg;
-       int cnt=0;
-
        (void) mb;
        (void) stk;
        (void) pci;
-       if (SQLinitialized == 0)// && (msg = SQLprelude(NULL)) != MAL_SUCCEED)
-               return msg;
-       msg = setScenario(cntxt, "sql");
-       // Wait for any recovery process to be finished
-       do {
-               MT_sleep_ms(1000);
-               logmsg = GDKgetenv("recovery");
-               if( logmsg== NULL && ++cnt  == 5)
-                       throw(SQL,"SQLinit", "#WARNING server not ready, 
recovery in progress\n");
-       } while (logmsg == NULL);
-       return msg;
+       throw(SQL,"SQLinit", "#ERROR Deprecated functionality\n");
 }
 
 str
 SQLsession2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
-       str msg = MAL_SUCCEED;
-       str logmsg;
-       int cnt=0;
-
        (void) mb;
        (void) stk;
-       (void) pci;
-       if (SQLinitialized == 0)// && (msg = SQLprelude(NULL)) != MAL_SUCCEED)
-               return msg;
-       msg = setScenario(cntxt, "msql");
-       // Wait for any recovery process to be finished
-       do {
-               MT_sleep_ms(1000);
-               logmsg = GDKgetenv("recovery");
-               if( logmsg== NULL && ++cnt  == 5)
-                       throw(SQL,"SQLinit","#WARNING server not ready, 
recovery in progress\n");
-       } while (logmsg == NULL);
-       return msg;
+       (svoid) pci;
+       throw(SQL,"SQLinit", "#ERROR Deprecated functionality\n");
 }
 
 static str SQLinit(Client c);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list