Changeset: 9e7244a891c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e7244a891c3
Modified Files:
clients/mapiclient/mclient.1
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
clients/mapilib/mapi.h
Branch: default
Log Message:
Remove some legacy code
diffs (127 lines):
diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1
--- a/clients/mapiclient/mclient.1
+++ b/clients/mapiclient/mclient.1
@@ -17,7 +17,7 @@ mclient \- the MonetDB command-line tool
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
automatic index management, extensibility of data types and search
-accelerators, SQL- and JAQL- frontends.
+accelerators, and a SQL frontend.
.PP
.I Mclient
is the command-line interface to the MonetDB server.
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -69,8 +69,7 @@
enum modes {
MAL,
- SQL,
- JAQL
+ SQL
};
static enum modes mode = SQL;
@@ -3076,8 +3075,6 @@ main(int argc, char **argv)
mode = SQL;
} else if (strcmp(language, "mal") == 0) {
mode = MAL;
- } else if (strcmp(language, "jaql") == 0) {
- mode = JAQL;
}
} else {
language = strdup("sql");
@@ -3133,13 +3130,6 @@ main(int argc, char **argv)
free(language);
language = strdup("mal");
mode = MAL;
- } else if (strcmp(optarg, "jaql") == 0 ||
- strcmp(optarg, "jaq") == 0 ||
- strcmp(optarg, "ja") == 0 ||
- strcmp(optarg, "j") == 0) {
- free(language);
- language = strdup("jaql");
- mode = JAQL;
} else if (strcmp(optarg, "msql") == 0) {
free(language);
language = strdup("msql");
@@ -3344,8 +3334,6 @@ main(int argc, char **argv)
} else {
if (mode == SQL) {
setFormatter("sql");
- } else if (mode == JAQL) {
- setFormatter("jaql");
} else {
setFormatter("raw");
}
@@ -3356,8 +3344,6 @@ main(int argc, char **argv)
if (mode == SQL) {
lang = "/SQL";
- } else if (mode == JAQL) {
- lang = "/JAQL";
} else {
lang = "";
}
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1467,10 +1467,6 @@ mapi_ping(Mapi mid)
break;
case LANG_MAL:
hdl = mapi_query(mid, "io.print(1);");
- break;
- case LANG_JAQL:
- hdl = mapi_query(mid, "[1];");
- break;
}
if (hdl)
mapi_close_handle(hdl);
@@ -2013,8 +2009,6 @@ mapi_mapiuri(const char *url, const char
mid->languageId = LANG_MAL;
else if (strstr(lang, "sql") == lang)
mid->languageId = LANG_SQL;
- else if (strstr(lang, "jaql") == lang)
- mid->languageId = LANG_JAQL;
if (mid->database)
free(mid->database);
mid->database = NULL;
@@ -2223,8 +2217,6 @@ mapi_mapi(const char *host, int port, co
mid->languageId = LANG_MAL;
else if (strstr(lang, "sql") == lang)
mid->languageId = LANG_SQL;
- else if (strstr(lang, "jaql") == lang)
- mid->languageId = LANG_JAQL;
if (mid->database)
free(mid->database);
@@ -2306,8 +2298,6 @@ parse_uri_query(Mapi mid, char *uri)
mid->languageId = LANG_MAL;
else if (strstr(val, "sql") == val)
mid->languageId = LANG_SQL;
- else if (strstr(val, "jaql") == val)
- mid->languageId = LANG_JAQL;
} else if (strcmp("user", uri) == 0) {
/* until we figure out how this can be
done safely wrt security, ignore */
@@ -3293,8 +3283,6 @@ mapi_param_store(MapiHdl hdl)
checkSpace(5);
if (hdl->mid->languageId == LANG_MAL)
nullstr = "nil";
- else if (hdl->mid->languageId == LANG_JAQL)
- nullstr = "null";
strcpy(hdl->query + k, nullstr);
} else {
void *src = hdl->params[i].inparam; /* abbrev */
diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h
--- a/clients/mapilib/mapi.h
+++ b/clients/mapilib/mapi.h
@@ -50,7 +50,6 @@ typedef int MapiMsg;
#define LANG_MAL 0
#define LANG_SQL 2
-#define LANG_JAQL 3
/* prompts for MAPI protocol */
#define PROMPTBEG '\001' /* start prompt bracket */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
