Changeset: c34a7b9d362c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c34a7b9d362c
Modified Files:
monetdb5/mal/mal_sabaoth.c
monetdb5/mal/mal_sabaoth.h
monetdb5/modules/mal/sabaoth.c
monetdb5/modules/mal/sabaoth.h
monetdb5/modules/mal/sabaoth.mal
Branch: default
Log Message:
MAL: remove SABAOTHwildRetreat, SABAOTHregisterStart, SABAOTHregisterStop
these functions are not necessary/useful from the MAL language, so don't
provide them
diffs (114 lines):
diff --git a/monetdb5/mal/mal_sabaoth.c b/monetdb5/mal/mal_sabaoth.c
--- a/monetdb5/mal/mal_sabaoth.c
+++ b/monetdb5/mal/mal_sabaoth.c
@@ -175,34 +175,6 @@ str SABAOTHgetLocalConnection(str *ret)
}
/**
- * Removes all known publications of available services. The function
- * name is a nostalgic phrase from "Defender of the Crown" from the
- * Commodore Amiga age.
- */
-str SABAOTHwildRetreat(int *ret) {
- *ret = 0;
- throw(MAL, "sabaoth.wildRetreat", "function no longer supported");
-}
-
-/**
- * Writes a start attempt to the sabaoth start/stop log. Examination of
- * the log at a later stage might reveal crashes of the server.
- */
-str SABAOTHregisterStart(int *ret) {
- *ret = 0;
- throw(MAL, "sabaoth.registerStart", "function no longer supported");
-}
-
-/**
- * Writes a start attempt to the sabaoth start/stop log. Examination of
- * the log at a later stage might reveal crashes of the server.
- */
-str SABAOTHregisterStop(int *ret) {
- *ret = 0;
- throw(MAL, "sabaoth.registerStop", "function no longer supported");
-}
-
-/**
* Returns the status as NULL terminated sabdb struct list for the
* current database. Since the current database should always exist,
* this function never returns NULL.
diff --git a/monetdb5/mal/mal_sabaoth.h b/monetdb5/mal/mal_sabaoth.h
--- a/monetdb5/mal/mal_sabaoth.h
+++ b/monetdb5/mal/mal_sabaoth.h
@@ -31,9 +31,6 @@ mal_export str SABAOTHmarchScenario(int
mal_export str SABAOTHretreatScenario(int *ret, str *lang);
mal_export str SABAOTHmarchConnection(int *ret, str *host, int *port);
mal_export str SABAOTHgetLocalConnection(str *ret);
-mal_export str SABAOTHwildRetreat(int *ret);
-mal_export str SABAOTHregisterStart(int *ret);
-mal_export str SABAOTHregisterStop(int *ret);
mal_export str SABAOTHgetMyStatus(sabdb** ret);
mal_export str SABAOTHgetStatus(sabdb** ret, str dbname);
mal_export str SABAOTHfreeStatus(sabdb** ret);
diff --git a/monetdb5/modules/mal/sabaoth.c b/monetdb5/modules/mal/sabaoth.c
--- a/monetdb5/modules/mal/sabaoth.c
+++ b/monetdb5/modules/mal/sabaoth.c
@@ -42,11 +42,6 @@
* is best coined under "cloud". While this module does not perform any
* actions itself, let alone remote onces, it is a local building block for
* components that do facilitate the cloud, such as Merovingian.
- *
- */
-/*
- * @-
- *
*/
#include "monetdb_config.h"
#include <mal.h>
@@ -174,8 +169,3 @@ str SABgetLocalConnectionPort(int *ret)
GDKfree(tmp);
return(MAL_SUCCEED);
}
-
-str SABwildRetreat(int *ret) {
- *ret = 0;
- throw(MAL, "sabaoth.wildRetreat", "function no longer supported");
-}
diff --git a/monetdb5/modules/mal/sabaoth.h b/monetdb5/modules/mal/sabaoth.h
--- a/monetdb5/modules/mal/sabaoth.h
+++ b/monetdb5/modules/mal/sabaoth.h
@@ -17,11 +17,6 @@
* All Rights Reserved.
*/
-/*
- * @- Implementation
- *
- */
-
#ifndef _SABAOTH_DEF
#define _SABAOTH_DEF
@@ -43,6 +38,5 @@ sabaoth_export str SABmarchConnection(in
sabaoth_export str SABgetLocalConnectionURI(str *ret);
sabaoth_export str SABgetLocalConnectionHost(str *ret);
sabaoth_export str SABgetLocalConnectionPort(int *ret);
-sabaoth_export str SABwildRetreat(int *ret);
#endif
diff --git a/monetdb5/modules/mal/sabaoth.mal b/monetdb5/modules/mal/sabaoth.mal
--- a/monetdb5/modules/mal/sabaoth.mal
+++ b/monetdb5/modules/mal/sabaoth.mal
@@ -49,13 +49,3 @@ comment "Returns the hostname this serve
command getLocalConnectionPort():int
address SABgetLocalConnectionPort
comment "Returns the port this server can be connected to, or 0 if none";
-
-command wildRetreat()
-address SABwildRetreat
-comment "Unpublishes everything known for this server";
-
-# serialise and deserialise are not available from MAL, but can be made
-# available if there is reasonable need for it (haven't found one to date)
-
-#sabaoth.prelude();
-
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
