hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work in progress - awkmod-mysql

Browse Source
This commit is contained in:
hyung-hwan
2019-05-22 11:21:57 +00:00
parent 4a897bddf8
commit 560298d0d1
7 changed files with 161 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qse/lib/awk/Makefile.am
View File

@ -49,7 +49,7 @@ libqseawkxx_la_SOURCES = Awk.cpp StdAwk.cpp
libqseawkxx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
libqseawkxx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx -lqseawk -lqsesi -lqsecmn $(LIBADD_LIB_COMMON)
libqseawkxx_la_DEPENDENCIES =
libqseawkxx_la_DEPENDENCIES = libqseawk.la
endif
if ENABLE_STATIC_MODULE

11
qse/lib/awk/Makefile.in
View File

@ -219,9 +219,9 @@ libqseawk_sys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_3)
am__libqseawk_la_SOURCES_DIST = awk.c err.c tree.c parse.c run.c rec.c \
val.c val-imp.h fnc.c imap-imp.h misc.c misc-imp.h rio.c std.c mod-dir.c \
mod-dir.h mod-math.c mod-math.h mod-str.c mod-str.h mod-sys.c \
mod-sys.h
val.c val-imp.h fnc.c imap-imp.h misc.c misc-imp.h rio.c std.c \
mod-dir.c mod-dir.h mod-math.c mod-math.h mod-str.c mod-str.h \
mod-sys.c mod-sys.h
@ENABLE_STATIC_MODULE_TRUE@am__objects_1 = libqseawk_la-mod-dir.lo \
@ENABLE_STATIC_MODULE_TRUE@ libqseawk_la-mod-math.lo \
@ENABLE_STATIC_MODULE_TRUE@ libqseawk_la-mod-str.lo \
@ -516,7 +516,8 @@ LIBADD_LIB_COMMON = -lqsecmn -lqsesi $(LIBM) $(am__append_1) \
noinst_HEADERS = awk-prv.h err.h rio.h val.h fnc.h misc.h parse.h run.h tree.h std.h
lib_LTLIBRARIES = libqseawk.la $(am__append_5)
libqseawk_la_SOURCES = awk.c err.c tree.c parse.c run.c rec.c val.c \
val-imp.h fnc.c imap-imp.h misc.c misc-imp.h rio.c std.c $(am__append_6)
val-imp.h fnc.c imap-imp.h misc.c misc-imp.h rio.c std.c \
$(am__append_6)
libqseawk_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
libqseawk_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
libqseawk_la_LIBADD = $(LIBADD_LIB_COMMON) $(am__append_7) \
@ -527,7 +528,7 @@ libqseawk_la_DEPENDENCIES = $(am__append_8) $(am__append_10) \
@ENABLE_CXX_TRUE@libqseawkxx_la_CPPFLAGS = $(CPPFLAGS_LIB_COMMON)
@ENABLE_CXX_TRUE@libqseawkxx_la_LDFLAGS = $(LDFLAGS_LIB_COMMON)
@ENABLE_CXX_TRUE@libqseawkxx_la_LIBADD = -lqseawk -lqsecmnxx -lqseawk -lqsesi -lqsecmn $(LIBADD_LIB_COMMON)
@ENABLE_CXX_TRUE@libqseawkxx_la_DEPENDENCIES =
@ENABLE_CXX_TRUE@libqseawkxx_la_DEPENDENCIES = libqseawk.la
##################################################
# DYNAMIC MODULES

1
qse/lib/awk/imap-imp.h
View File

@ -36,6 +36,7 @@ struct __IMAP_NODE_T
__IMAP_NODE_T_DATA
};
typedef struct __IMAP_LIST_T __IMAP_LIST_T;
struct __IMAP_LIST_T
{
__IMAP_NODE_T* head;

25
qse/lib/awk/mod-dir.c
View File

@ -46,9 +46,6 @@ BEGIN {
#include <qse/cmn/rbt.h>
#include "../cmn/mem-prv.h"
typedef struct dir_list_t dir_list_t;
typedef struct dir_node_t dir_node_t;
enum
{
DIR_ENOERR,
@ -217,7 +214,7 @@ static int read_byid (qse_awk_rtx_t* rtx, dir_list_t* list, qse_awk_int_t id, qs
else
{
list->errnum = DIR_EINVAL;
return -1;
return -1;
}
}
@ -294,18 +291,18 @@ static int fnc_dir_open (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
list = rtx_to_list(rtx, fi);
a0 = qse_awk_rtx_getarg (rtx, 0);
path = qse_awk_rtx_getvalstr (rtx, a0, QSE_NULL);
a0 = qse_awk_rtx_getarg(rtx, 0);
path = qse_awk_rtx_getvalstr(rtx, a0, QSE_NULL);
if (path)
{
if (qse_awk_rtx_getnargs (rtx) >= 2 &&
qse_awk_rtx_valtoint (rtx, qse_awk_rtx_getarg (rtx, 1), &flags) <= -1)
if (qse_awk_rtx_getnargs(rtx) >= 2 &&
qse_awk_rtx_valtoint(rtx, qse_awk_rtx_getarg(rtx, 1), &flags) <= -1)
{
qse_awk_rtx_freevalstr (rtx, a0, path);
goto oops;
}
node = new_dir_node (rtx, list, path, flags);
node = new_dir_node(rtx, list, path, flags);
if (node) ret = node->id;
else ret = -1;
qse_awk_rtx_freevalstr (rtx, a0, path);
@ -313,13 +310,13 @@ static int fnc_dir_open (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
else
{
oops:
list->errnum = awk_err_to_errnum (qse_awk_rtx_geterrnum (rtx));
list->errnum = awk_err_to_errnum(qse_awk_rtx_geterrnum(rtx));
ret = -1;
}
/* ret may not be a statically managed number.
* error checking is required */
retv = qse_awk_rtx_makeintval (rtx, ret);
retv = qse_awk_rtx_makeintval(rtx, ret);
if (retv == QSE_NULL)
{
if (node) free_dir_node (rtx, list, node);
@ -338,10 +335,10 @@ static int fnc_dir_close (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
list = rtx_to_list(rtx, fi);
ret = qse_awk_rtx_valtoint(rtx, qse_awk_rtx_getarg (rtx, 0), &id);
ret = qse_awk_rtx_valtoint(rtx, qse_awk_rtx_getarg(rtx, 0), &id);
if (ret <= -1)
{
list->errnum = awk_err_to_errnum(qse_awk_rtx_geterrnum (rtx));
list->errnum = awk_err_to_errnum(qse_awk_rtx_geterrnum(rtx));
ret = -1;
}
else
@ -349,7 +346,7 @@ static int fnc_dir_close (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
ret = close_byid(rtx, list, id);
}
qse_awk_rtx_setretval (rtx, qse_awk_rtx_makeintval (rtx, ret));
qse_awk_rtx_setretval (rtx, qse_awk_rtx_makeintval(rtx, ret));
return 0;
}

4
qse/lib/awkmod/Makefile.am
View File

@ -52,6 +52,10 @@ if ENABLE_AWKMOD_MPI
pkgmodexec_LTLIBRARIES += libqseawk-mpi.la
endif
if ENABLE_AWKMOD_MYSQL
pkgmodexec_LTLIBRARIES += libqseawk-mysql.la
endif
if ENABLE_AWKMOD_SED
pkgmodexec_LTLIBRARIES += libqseawk-sed.la
endif

11
qse/lib/awkmod/Makefile.in
View File

@ -93,8 +93,9 @@ host_triplet = @host@
@ENABLE_AWKMOD_SED_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_3 = libqseawk-sed.la
@ENABLE_AWKMOD_UCI_TRUE@@ENABLE_STATIC_MODULE_TRUE@am__append_4 = libqseawk-uci.la
@ENABLE_AWKMOD_MPI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_5 = libqseawk-mpi.la
@ENABLE_AWKMOD_SED_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_6 = libqseawk-sed.la
@ENABLE_AWKMOD_UCI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_7 = libqseawk-uci.la
@ENABLE_AWKMOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_6 = libqseawk-mysql.la
@ENABLE_AWKMOD_SED_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_7 = libqseawk-sed.la
@ENABLE_AWKMOD_UCI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am__append_8 = libqseawk-uci.la
subdir = lib/awkmod
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
@ -169,6 +170,9 @@ libqseawk_mysql_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(libqseawk_mysql_la_LDFLAGS) \
$(LDFLAGS) -o $@
@ENABLE_AWKMOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_FALSE@am_libqseawk_mysql_la_rpath = \
@ENABLE_AWKMOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_FALSE@ -rpath \
@ENABLE_AWKMOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_FALSE@ $(pkgmodexecdir)
@ENABLE_AWKMOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_TRUE@am_libqseawk_mysql_la_rpath =
@ENABLE_AWKMOD_SED_TRUE@libqseawk_sed_la_DEPENDENCIES = \
@ENABLE_AWKMOD_SED_TRUE@ $(am__DEPENDENCIES_1)
@ -459,7 +463,8 @@ CPPFLAGS_COMMON = \
@ENABLE_STATIC_MODULE_TRUE@ $(am__append_4)
@ENABLE_STATIC_MODULE_FALSE@pkgmodexecdir = $(libdir)
@ENABLE_STATIC_MODULE_FALSE@pkgmodexec_LTLIBRARIES = $(am__append_5) \
@ENABLE_STATIC_MODULE_FALSE@ $(am__append_6) $(am__append_7)
@ENABLE_STATIC_MODULE_FALSE@ $(am__append_6) $(am__append_7) \
@ENABLE_STATIC_MODULE_FALSE@ $(am__append_8)
##################################################
##################################################

146
qse/lib/awkmod/mod-mysql.c
View File

@ -26,9 +26,12 @@
#include "mod-mysql.h"
#include <mysql/mysql.h>
#include "../cmn/mem-prv.h"
#include <qse/cmn/main.h>
#include <qse/cmn/rbt.h>
#define __IMAP_NODE_T_DATA MYSQL ctx;
#define __IMAP_LIST_T_DATA /* nothing */
#define __IMAP_NODE_T_DATA MYSQL* ctx;
#define __IMAP_LIST_T_DATA int errnum;
#define __IMAP_LIST_T sql_list_t
#define __IMAP_NODE_T sql_node_t
#define __MAKE_IMAP_NODE __new_sql_node
@ -42,9 +45,10 @@ static sql_node_t* new_sql_node (qse_awk_rtx_t* rtx, sql_list_t* list)
node = __new_sql_node(rtx, list);
if (!node) return QSE_NULL;
if (mysql_init(&node->ctx) == QSE_NULL)
node->ctx = mysql_init(QSE_NULL);
if (!node->ctx)
{
__free_sql_node (rtx, list, node);
qse_awk_rtx_seterrfmt (rtx, QSE_AWK_ENOMEM, QSE_NULL, QSE_T("unable to allocate a mysql object"));
return QSE_NULL;
}
@ -53,19 +57,86 @@ static sql_node_t* new_sql_node (qse_awk_rtx_t* rtx, sql_list_t* list)
static void free_sql_node (qse_awk_rtx_t* rtx, sql_list_t* list, sql_node_t* node)
{
mysqL_close (&node->ctx);
mysql_close (node->ctx);
__free_sql_node (rtx, list, node);
}
/* ------------------------------------------------------------------------ */
static int close_byid (qse_awk_rtx_t* rtx, sql_list_t* list, qse_awk_int_t id)
{
if (id >= 0 && id < list->map.high && list->map.tab[id])
{
free_sql_node (rtx, list, list->map.tab[id]);
return 0;
}
else
{
/* TODO: enhance error */
list->errnum = QSE_AWK_EINVAL;
return -1;
}
}
/* ------------------------------------------------------------------------ */
static QSE_INLINE sql_list_t* rtx_to_list (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
{
qse_rbt_pair_t* pair;
pair = qse_rbt_search((qse_rbt_t*)fi->mod->ctx, &rtx, QSE_SIZEOF(rtx));
QSE_ASSERT (pair != QSE_NULL);
return (sql_list_t*)QSE_RBT_VPTR(pair);
}
static int fnc_open (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
{
sql_node_t* node;
return -1;
sql_list_t* list;
sql_node_t* node = QSE_NULL;
qse_awk_int_t ret;
qse_awk_val_t* retv;
list = rtx_to_list(rtx, fi);
node = new_sql_node(rtx, list/*, path, flags*/);
if (node) ret = node->id;
else ret = -1;
/* ret may not be a statically managed number.
* error checking is required */
retv = qse_awk_rtx_makeintval(rtx, ret);
if (retv == QSE_NULL)
{
if (node) free_sql_node (rtx, list, node);
return -1;
}
qse_awk_rtx_setretval (rtx, retv);
return 0;
}
static int fnc_close (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
{
return -1;
sql_list_t* list;
qse_awk_int_t id;
int ret;
list = rtx_to_list(rtx, fi);
ret = qse_awk_rtx_valtoint(rtx, qse_awk_rtx_getarg(rtx, 0), &id);
if (ret <= -1)
{
list->errnum = qse_awk_rtx_geterrnum(rtx);
ret = -1;
}
else
{
ret = close_byid(rtx, list, id);
}
qse_awk_rtx_setretval (rtx, qse_awk_rtx_makeintval(rtx, ret));
return 0;
}
static int fnc_connect (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi)
@ -147,34 +218,77 @@ static int query (qse_awk_mod_t* mod, qse_awk_t* awk, const qse_char_t* name, qs
static int init (qse_awk_mod_t* mod, qse_awk_rtx_t* rtx)
{
mysql_library_init (0, QSE_NULL, QSE_NULL);
qse_rbt_t* rbt;
sql_list_t list;
rbt = (qse_rbt_t*)mod->ctx;
QSE_MEMSET (&list, 0, QSE_SIZEOF(list));
if (qse_rbt_insert (rbt, &rtx, QSE_SIZEOF(rtx), &list, QSE_SIZEOF(list)) == QSE_NULL)
{
qse_awk_rtx_seterrnum (rtx, QSE_AWK_ENOMEM, QSE_NULL);
return -1;
}
return 0;
}
static void fini (qse_awk_mod_t* mod, qse_awk_rtx_t* rtx)
{
/* TODO: anything */
mysql_library_end ();
qse_rbt_t* rbt;
qse_rbt_pair_t* pair;
rbt = (qse_rbt_t*)mod->ctx;
/* garbage clean-up */
pair = qse_rbt_search(rbt, &rtx, QSE_SIZEOF(rtx));
if (pair)
{
sql_list_t* list;
sql_node_t* node, * next;
list = QSE_RBT_VPTR(pair);
node = list->head;
while (node)
{
next = node->next;
free_sql_node (rtx, list, node);
node = next;
}
qse_rbt_delete (rbt, &rtx, QSE_SIZEOF(rtx));
}
}
static void unload (qse_awk_mod_t* mod, qse_awk_t* awk)
{
/* TODO: anything */
qse_rbt_t* rbt;
rbt = (qse_rbt_t*)mod->ctx;
QSE_ASSERT (QSE_RBT_SIZE(rbt) == 0);
qse_rbt_close (rbt);
}
int qse_awk_mod_mysql (qse_awk_mod_t* mod, qse_awk_t* awk)
{
qse_rbt_t* rbt;
mod->query = query;
mod->unload = unload;
mod->init = init;
mod->fini = fini;
/*
mod->ctx...
*/
rbt = qse_rbt_open(qse_awk_getmmgr(awk), 0, 1, 1);
if (rbt == QSE_NULL)
{
qse_awk_seterrnum (awk, QSE_AWK_ENOMEM, QSE_NULL);
return -1;
}
qse_rbt_setstyle (rbt, qse_getrbtstyle(QSE_RBT_STYLE_INLINE_COPIERS));
mod->ctx = rbt;
return 0;
}