Changeset: f4a41ad70a9d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4a41ad70a9d
Removed Files:
monetdb5/modules/atoms/Tests/curl00.malC
monetdb5/modules/atoms/Tests/curl00.stable.err
monetdb5/modules/atoms/Tests/curl00.stable.out
monetdb5/modules/atoms/mcurl.c
monetdb5/modules/atoms/mcurl.mal
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/mal/mal_init.mal
Branch: default
Log Message:
Removed module mcurl.
diffs (252 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
@@ -10523,10 +10523,6 @@ Ready.
[ "mbr", "#read", "command mbr.#read():void ", "mbrREAD;",
"" ]
[ "mbr", "#tostr", "command mbr.#tostr():void ", "mbrTOSTR;",
"" ]
[ "mbr", "#write", "command mbr.#write():void ", "mbrWRITE;",
"" ]
-[ "mcurl", "deleterequest", "command mcurl.deleterequest(s:str):str
", "CURLdeleteRequest;", "Perform a http delete request" ]
-[ "mcurl", "getrequest", "command mcurl.getrequest(s:str):str ",
"CURLgetRequest;", "Perform a http get request" ]
-[ "mcurl", "postrequest", "command mcurl.postrequest(s:str):str ",
"CURLpostRequest;", "Perform a http post request" ]
-[ "mcurl", "putrequest", "command mcurl.putrequest(s:str):str ",
"CURLputRequest;", "Perform a http put request" ]
[ "mdb", "List", "pattern mdb.List(M:str, F:str):void ",
"MDBlist3Detail;", "Dump the routine M.F on standard out." ]
[ "mdb", "List", "pattern mdb.List():void ", "MDBlistDetail;",
"Dump the current routine on standard out." ]
[ "mdb", "dump", "pattern mdb.dump():void ", "MDBdump;", "Dump
instruction, stacktrace, and stack" ]
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
@@ -14737,10 +14737,6 @@ Ready.
[ "mbr", "#read", "command mbr.#read():void ", "mbrREAD;",
"" ]
[ "mbr", "#tostr", "command mbr.#tostr():void ", "mbrTOSTR;",
"" ]
[ "mbr", "#write", "command mbr.#write():void ", "mbrWRITE;",
"" ]
-[ "mcurl", "deleterequest", "command mcurl.deleterequest(s:str):str
", "CURLdeleteRequest;", "Perform a http delete request" ]
-[ "mcurl", "getrequest", "command mcurl.getrequest(s:str):str ",
"CURLgetRequest;", "Perform a http get request" ]
-[ "mcurl", "postrequest", "command mcurl.postrequest(s:str):str ",
"CURLpostRequest;", "Perform a http post request" ]
-[ "mcurl", "putrequest", "command mcurl.putrequest(s:str):str ",
"CURLputRequest;", "Perform a http put request" ]
[ "mdb", "List", "pattern mdb.List(M:str, F:str):void ",
"MDBlist3Detail;", "Dump the routine M.F on standard out." ]
[ "mdb", "List", "pattern mdb.List():void ", "MDBlistDetail;",
"Dump the current routine on standard out." ]
[ "mdb", "dump", "pattern mdb.dump():void ", "MDBdump;", "Dump
instruction, stacktrace, and stack" ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1180,10 +1180,6 @@ str CMDvarSUBsignal(Client cntxt, MalBlk
str CMDvarXOR(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str COPYrejects(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str COPYrejects_clear(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CURLdeleteRequest(str *retval, str *url);
-str CURLgetRequest(str *retval, str *url);
-str CURLpostRequest(str *retval, str *url);
-str CURLputRequest(str *retval, str *url);
str FCTgetArrival(bat *ret);
str FCTgetCaller(int *ret);
str FCTgetDeparture(bat *ret);
diff --git a/monetdb5/modules/atoms/Makefile.ag
b/monetdb5/modules/atoms/Makefile.ag
--- a/monetdb5/modules/atoms/Makefile.ag
+++ b/monetdb5/modules/atoms/Makefile.ag
@@ -21,7 +21,6 @@ lib_atoms = {
identifier.c \
inet.c \
json.c json.h \
- mcurl.c \
mtime.c mtime.h \
str.c str.h \
streams.c streams.h \
@@ -40,7 +39,6 @@ headers_mal = {
identifier.mal \
inet.mal \
json.mal \
- mcurl.mal \
mtime.mal \
streams.mal \
str.mal \
diff --git a/monetdb5/modules/atoms/Tests/curl00.malC
b/monetdb5/modules/atoms/Tests/curl00.malC
deleted file mode 100644
--- a/monetdb5/modules/atoms/Tests/curl00.malC
+++ /dev/null
@@ -1,8 +0,0 @@
-
-a:="http://localhost:8998/";;
-b:str:= mcurl.getrequest(a);
-io.print(b);
-
-#a:="http://www.example.com/";;
-#b:str:= mcurl.getrequest(a);
-#io.print(b);
diff --git a/monetdb5/modules/atoms/Tests/curl00.stable.err
b/monetdb5/modules/atoms/Tests/curl00.stable.err
deleted file mode 100644
--- a/monetdb5/modules/atoms/Tests/curl00.stable.err
+++ /dev/null
@@ -1,29 +0,0 @@
-stderr of test 'curl00` in directory 'monetdb5/modules/atoms` itself:
-
-
-# 18:14:24 >
-# 18:14:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35895" "--set"
"mapi_usock=/var/tmp/mtest-19428/.s.monetdb.35895" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/work/arjen/monetdb/monetdb/default/var/MonetDB/mTests_monetdb5_modules_atoms"
"curl00.mal"
-# 18:14:24 >
-
-# builtin opt gdk_dbpath =
/export/work/arjen/monetdb/monetdb/default/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
-# builtin opt mapi_port = 50000
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_optimizer = default_pipe
-# builtin opt sql_debug = 0
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 35895
-# cmdline opt mapi_usock = /var/tmp/mtest-19428/.s.monetdb.35895
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/export/work/arjen/monetdb/monetdb/default/var/MonetDB/mTests_monetdb5_modules_atoms
-
-# 18:14:25 >
-# 18:14:25 > "Done."
-# 18:14:25 >
-
diff --git a/monetdb5/modules/atoms/Tests/curl00.stable.out
b/monetdb5/modules/atoms/Tests/curl00.stable.out
deleted file mode 100644
--- a/monetdb5/modules/atoms/Tests/curl00.stable.out
+++ /dev/null
@@ -1,37 +0,0 @@
-stdout of test 'curl00` in directory 'monetdb5/modules/atoms` itself:
-
-
-# 18:14:24 >
-# 18:14:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35895" "--set"
"mapi_usock=/var/tmp/mtest-19428/.s.monetdb.35895" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/work/arjen/monetdb/monetdb/default/var/MonetDB/mTests_monetdb5_modules_atoms"
"curl00.mal"
-# 18:14:24 >
-
-# MonetDB 5 server v11.16.0
-# This is an unreleased version
-# Serving database 'mTests_monetdb5_modules_atoms', using 2 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 3.875 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://harvest:35895/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-19428/.s.monetdb.35895
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-function user.main():void;
- a := "http://localhost:8888/";;
- b:str := mcurl.getrequest(a);
- io.print(b);
- a := "http://www.example.com/";;
- b:str := mcurl.getrequest(a);
- io.print(b);
-end main;
-38 bytes retrieved
-[ "<html><body>Hello, json!</body></html>" ]
-0 bytes retrieved
-[ "<html><body>Hello, json!</body></html>" ]
-
-# 18:14:25 >
-# 18:14:25 > "Done."
-# 18:14:25 >
-
diff --git a/monetdb5/modules/atoms/mcurl.c b/monetdb5/modules/atoms/mcurl.c
deleted file mode 100644
--- a/monetdb5/modules/atoms/mcurl.c
+++ /dev/null
@@ -1,58 +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 - 2018 MonetDB B.V.
- */
-
-/*
- * A. de Rijke
- * The cURL module
- * The cURL module contains a wrapper for all function in
- * libcurl.
- */
-
-#include "monetdb_config.h"
-#include "mal.h"
-#include "mal_exception.h"
-
-#include <unistd.h>
-#include <string.h>
-
-mal_export str CURLgetRequest(str *retval, str *url);
-mal_export str CURLputRequest(str *retval, str *url);
-mal_export str CURLpostRequest(str *retval, str *url);
-mal_export str CURLdeleteRequest(str *retval, str *url);
-
-str
-CURLgetRequest(str *retval, str *url)
-{
- (void)retval;
- (void)url;
- return MAL_SUCCEED;
-}
-
-str
-CURLputRequest(str *retval, str *url)
-{
- (void)retval;
- (void)url;
- return MAL_SUCCEED;
-}
-
-str
-CURLpostRequest(str *retval, str *url)
-{
- (void)retval;
- (void)url;
- return MAL_SUCCEED;
-}
-
-str
-CURLdeleteRequest(str *retval, str *url)
-{
- (void)retval;
- (void)url;
- return MAL_SUCCEED;
-}
diff --git a/monetdb5/modules/atoms/mcurl.mal b/monetdb5/modules/atoms/mcurl.mal
deleted file mode 100644
--- a/monetdb5/modules/atoms/mcurl.mal
+++ /dev/null
@@ -1,23 +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 - 2018 MonetDB B.V.
-
-module mcurl;
-
-command getrequest(s:str):str
-address CURLgetRequest
-comment "Perform a http get request";
-
-command putrequest(s:str):str
-address CURLputRequest
-comment "Perform a http put request";
-
-command postrequest(s:str):str
-address CURLpostRequest
-comment "Perform a http post request";
-
-command deleterequest(s:str):str
-address CURLdeleteRequest
-comment "Perform a http delete request";
diff --git a/monetdb5/modules/mal/mal_init.mal
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -45,7 +45,6 @@ include color;
include str;
include url;
include uuid;
-include mcurl;
include json;
include json_util;
include mtime;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
