Skip to content

Commit c4d5056

Browse files
sjoerdmullendersjoerdmullender
committed
Ported Bo Tang's MonetDB driver to the latest version.
1 parent e50bd52 commit c4d5056

File tree

6 files changed

+288
-4
lines changed

6 files changed

+288
-4
lines changed

‎Makefile.am

+7-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ bin_PROGRAMS = sqlsmith
77

88
DUT = postgres.cc
99

10+
if DUT_MONETDB
11+
DUT += monetdb.cc
12+
endif
13+
1014
if DUT_SQLITE
1115
DUT += sqlite.cc
1216
endif
@@ -16,16 +20,16 @@ sqlsmith_SOURCES = relmodel.cc schema.cc $(DUT) \
1620
random.cc prod.cc expr.cc grammar.cc log.cc dump.cc impedance.cc \
1721
sqlsmith.cc
1822

19-
sqlsmith_LDADD = $(LIBPQXX_LIBS) $(BOOST_REGEX_LIB) $(POSTGRESQL_LIBS)
23+
sqlsmith_LDADD = $(LIBPQXX_LIBS) $(MONETDB_MAPI_LIBS) $(BOOST_REGEX_LIB) $(POSTGRESQL_LIBS)
2024

2125
AM_LDFLAGS = $(BOOST_LDFLAGS) $(POSTGRESQL_LDFLAGS)
22-
AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(PQXX_CFLAGS) $(POSTGRESQL_CPPFLAGS) -Wall -Wextra
26+
AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(PQXX_CFLAGS) $(POSTGRESQL_CPPFLAGS) $(MONETDB_MAPI_CFLAGS) -Wall -Wextra
2327

2428

2529
EXTRA_DIST = gitrev.h dump.hh expr.hh grammar.hh log.hh prod.hh \
2630
random.hh relmodel.hh schema.hh impedance.hh filter.sql log.sql \
2731
README.org TODO.org ast.png logo.png dump.xsl util.hh sqlite.hh \
28-
dut.hh postgres.hh log-v1.0-to-v1.1.sql
32+
dut.hh postgres.hh monetdb.hh log-v1.0-to-v1.1.sql
2933

3034
gitrev.h: $(HEADERS) $(SOURCES)
3135
echo "#define GITREV \"$$(git describe --dirty --tags --always)\"" > $@

‎configure.ac

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ AX_CXX_COMPILE_STDCXX_11(noext,mandatory)
88
AX_LIB_POSTGRESQL()
99
PKG_CHECK_MODULES(LIBPQXX, libpqxx >= 4.0)
1010

11+
PKG_CHECK_MODULES(MONETDB_MAPI, monetdb-mapi >= 11.23.0)
12+
AM_CONDITIONAL([DUT_MONETDB], [test x$pkg_failed = xno])
13+
1114
AX_BOOST_BASE()
1215
AX_BOOST_REGEX
1316

‎grammar.cc

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#include "schema.hh"
1111
#include "impedance.hh"
1212

13+
#define MONETDB
14+
1315
using namespace std;
1416

1517
shared_ptr<table_ref> table_ref::factory(prod *p) {
@@ -55,9 +57,13 @@ table_sample::table_sample(prod *p) : table_ref(p) {
5557

5658
void table_sample::out(std::ostream &out) {
5759
out << t->ident() <<
60+
#ifdef MONETDB
61+
" as " << refs[0]->ident();
62+
#else
5863
" as " << refs[0]->ident() <<
5964
" tablesample " << method <<
6065
" (" << percent << ") ";
66+
#endif
6167
}
6268

6369
table_subquery::table_subquery(prod *p, bool lateral)

‎monetdb.cc

+231
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
1+
#include <stdexcept>
2+
#include <cassert>
3+
#include "monetdb.hh"
4+
#include <iostream>
5+
6+
#ifndef HAVE_BOOST_REGEX
7+
#include <regex>
8+
#else
9+
#include <boost/regex.hpp>
10+
using boost::regex;
11+
using boost::smatch;
12+
using boost::regex_match;
13+
#endif
14+
15+
using namespace std;
16+
17+
static regex e_syntax("near \".*\": syntax error");
18+
static regex e_user_abort("callback requested query abort");
19+
20+
extern "C" {
21+
#include <mapi.h>
22+
#include <unistd.h>
23+
}
24+
25+
// connect montetdb
26+
monetdb_connection::monetdb_connection(std::string &conninfo)
27+
{
28+
dbh = mapi_mapiuri(conninfo.c_str(), "monetdb", "monetdb", "sql");
29+
if (mapi_error(dbh)) {
30+
if (dbh != NULL) {
31+
mapi_explain(dbh, stderr);
32+
mapi_destroy(dbh);
33+
} else {
34+
fprintf(stderr, "command failed\n");
35+
}
36+
exit(-1);
37+
}
38+
mapi_reconnect(dbh);
39+
if (mapi_error(dbh)) {
40+
mapi_explain(dbh, stderr);
41+
mapi_destroy(dbh);
42+
exit(-1);
43+
}
44+
}
45+
46+
// execute queries on MonetDB
47+
void monetdb_connection::q(const char* query)
48+
{
49+
MapiHdl hdl = mapi_query(dbh, query);
50+
if (mapi_result_error(hdl) != NULL)
51+
mapi_explain_result(hdl, stderr);
52+
mapi_close_handle(hdl);
53+
}
54+
55+
// disconnect MonetDB
56+
monetdb_connection::~monetdb_connection()
57+
{
58+
mapi_destroy(dbh);
59+
}
60+
61+
//load schema from MonetDB
62+
schema_monetdb::schema_monetdb(std::string &conninfo):monetdb_connection(conninfo)
63+
{
64+
65+
66+
cerr << "init booltype, inttype, internaltype, arraytype here" << endl;
67+
booltype = sqltype::get("boolean");
68+
inttype = sqltype::get("int");
69+
internaltype = sqltype::get("internal");
70+
arraytype = sqltype::get("ARRAY");
71+
72+
cerr << "Loading tables from database: " << conninfo << endl;
73+
// string qry = "select t.name, s.name, t.system, t.type from sys.tables t, sys.schemas s where t.schema_id=s.id and t.system=false";
74+
string qry = "select t.name, s.name, t.system, t.type from sys.tables t, sys.schemas s where t.schema_id=s.id ";
75+
MapiHdl hdl = mapi_query(dbh,qry.c_str());
76+
while (mapi_fetch_row(hdl)) {
77+
cerr << ".";
78+
tables.push_back(table(mapi_fetch_field(hdl,0),mapi_fetch_field(hdl,1),strcmp(mapi_fetch_field(hdl,2),"false")==0 ? true : false , atoi(mapi_fetch_field(hdl,3))==0 ? false : true));
79+
}
80+
mapi_close_handle(hdl);
81+
cerr << " done." << endl;
82+
83+
cerr << "Loading columns and constraints...";
84+
for (auto t = tables.begin(); t!=tables.end(); t++) {
85+
string q("select col.name,"
86+
" col.type "
87+
" from sys.columns col, sys.tables tab"
88+
" where tab.name= '");
89+
q += t->name;
90+
q += "' and tab.id = col.table_id";
91+
cerr << ".";
92+
93+
hdl = mapi_query(dbh,q.c_str());
94+
while (mapi_fetch_row(hdl)) {
95+
cerr << ".";
96+
column c(mapi_fetch_field(hdl,0), sqltype::get(mapi_fetch_field(hdl,1)));
97+
t->columns().push_back(c);
98+
}
99+
mapi_close_handle(hdl);
100+
}
101+
// TODO: confirm with Martin or Stefan about column
102+
// constraints in MonetDB
103+
cerr << " done." << endl;
104+
105+
cerr << "Loading operators...";
106+
string opq("select f.func, a.type, b.type, c.type"
107+
" from sys.functions f, sys.args a, sys.args b, sys.args c"
108+
" where f.id=a.func_id and f.id=b.func_id and f.id=c.func_id and a.name='arg_1' and b.name='arg_2' and c.number=0");
109+
hdl = mapi_query(dbh,opq.c_str());
110+
while (mapi_fetch_row(hdl)) {
111+
cerr << ".";
112+
op o(mapi_fetch_field(hdl,0),sqltype::get(mapi_fetch_field(hdl,1)),sqltype::get(mapi_fetch_field(hdl,2)),sqltype::get(mapi_fetch_field(hdl,3)));
113+
register_operator(o);
114+
}
115+
mapi_close_handle(hdl);
116+
cerr << " done." << endl;
117+
118+
119+
cerr << "Loading routines...";
120+
string routq("select s.name, f.id, a.type, f.name from sys.schemas s, sys.args a, sys.types t, sys.functions f where f.schema_id = s.id and f.id=a.func_id and a.number=0 and a.type = t.sqlname and f.mod<>'aggr'");
121+
hdl = mapi_query(dbh,routq.c_str());
122+
while (mapi_fetch_row(hdl)) {
123+
cerr << ".";
124+
routine proc(mapi_fetch_field(hdl,0),mapi_fetch_field(hdl,1),sqltype::get(mapi_fetch_field(hdl,2)),mapi_fetch_field(hdl,3));
125+
register_routine(proc);
126+
}
127+
mapi_close_handle(hdl);
128+
cerr << " done." << endl;
129+
130+
cerr << "Loading routine parameters...";
131+
for (auto &proc : routines) {
132+
string routpq ("select a.type from sys.args a,"
133+
" sys.functions f "
134+
" where f.id = a.func_id and a.number <> 0 and f.id = '");
135+
routpq += proc.specific_name;
136+
routpq += "'";
137+
hdl = mapi_query(dbh,routpq.c_str());
138+
while (mapi_fetch_row(hdl)) {
139+
proc.argtypes.push_back(sqltype::get(mapi_fetch_field(hdl,0)));
140+
cerr<<".";
141+
}
142+
mapi_close_handle(hdl);
143+
}
144+
cerr << " done."<< endl;
145+
146+
147+
148+
cerr << "Loading aggregates...";
149+
string aggq("select s.name, f.id, a.type, f.name from sys.schemas s, sys.args a, sys.types t, sys.functions f where f.schema_id = s.id and f.id=a.func_id and a.number=0 and a.type = t.sqlname and f.mod='aggr'");
150+
151+
hdl = mapi_query(dbh,aggq.c_str());
152+
while (mapi_fetch_row(hdl)) {
153+
cerr << ".";
154+
routine proc(mapi_fetch_field(hdl,0),mapi_fetch_field(hdl,1),sqltype::get(mapi_fetch_field(hdl,2)),mapi_fetch_field(hdl,3));
155+
register_aggregate(proc);
156+
}
157+
mapi_close_handle(hdl);
158+
cerr << " done." << endl;
159+
160+
cerr << "Loading aggregates parameters...";
161+
for (auto &proc: aggregates) {
162+
string aggpq ("select a.type from sys.args a, sys.functions f "
163+
"where f.id = a.func_id and a.number <> 0 and f.id = '");
164+
aggpq += proc.specific_name;
165+
aggpq += "'";
166+
hdl = mapi_query(dbh,aggpq.c_str());
167+
while (mapi_fetch_row(hdl)) {
168+
proc.argtypes.push_back(sqltype::get(mapi_fetch_field(hdl,0)));
169+
cerr<<".";
170+
}
171+
mapi_close_handle(hdl);
172+
}
173+
cerr << " done."<< endl;
174+
175+
mapi_destroy(dbh);
176+
generate_indexes();
177+
178+
// cerr << "print loaded information to check correctness" << endl;
179+
// cerr << "Loaded tables.... " << endl;
180+
/* for (auto item : tables) {
181+
cerr << item.name << "; " << item.schema << "; " << item.is_insertable << "; " << item.is_base_table << endl;
182+
}
183+
*/
184+
// cerr << "Loaded columns... " << endl;
185+
/* for (auto tab : tables) {
186+
for (auto col: tab.columns())
187+
cerr << tab.name << "; " << col.name << "; "<<col.type->name << endl;
188+
}
189+
*/
190+
// cerr << "Loaded aggregates and parameters... " << endl;
191+
/* for (auto &proc : aggregates) {
192+
cerr << proc.specific_name << "; " << proc.schema << "; " << proc.name <<"; " << proc.restype->name ;
193+
for (auto item : proc.argtypes)
194+
cerr << "; " << item->name;
195+
cerr << endl;
196+
}
197+
*/
198+
}
199+
200+
dut_monetdb::dut_monetdb(std::string &conninfo):monetdb_connection(conninfo)
201+
{
202+
//build connection
203+
}
204+
205+
void dut_monetdb::test(const std::string &stmt)
206+
{
207+
MapiHdl hdl = mapi_query(dbh,"CALL sys.settimeout(1)");
208+
mapi_close_handle(hdl);
209+
cerr << stmt << endl;
210+
hdl = mapi_query(dbh,stmt.c_str());
211+
if (mapi_error(dbh)!=MOK) {
212+
try {
213+
if (mapi_error(dbh)==MERROR) {
214+
mapi_explain_result(hdl, stdout);
215+
mapi_close_handle(hdl);
216+
throw dut::syntax("e");
217+
} else if (mapi_error(dbh)==MTIMEOUT) {
218+
mapi_explain_result(hdl, stdout);
219+
mapi_close_handle(hdl);
220+
throw dut::timeout("t");
221+
} else {
222+
mapi_explain_result(hdl, stdout);
223+
mapi_close_handle(hdl);
224+
throw dut::failure("er");
225+
}
226+
} catch (dut::failure &e) {
227+
throw dut::failure("et");
228+
}
229+
}
230+
mapi_close_handle(hdl);
231+
}

‎monetdb.hh

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/// @file
2+
/// @brief schema and dut classes for MonetDB
3+
4+
5+
#ifndef MONETDB_HH
6+
#define MONETDB_HH
7+
8+
#include "dut.hh"
9+
#include "relmodel.hh"
10+
#include "schema.hh"
11+
#include <string.h>
12+
13+
#include <mapi.h>
14+
15+
struct monetdb_connection {
16+
Mapi dbh;
17+
monetdb_connection(std::string &conninfo);
18+
void q(const char* query);
19+
~monetdb_connection();
20+
};
21+
22+
struct schema_monetdb : schema, monetdb_connection {
23+
schema_monetdb(std::string &conninfo);
24+
virtual std::string quote_name(const std::string &id) {
25+
return id;
26+
}
27+
};
28+
29+
struct dut_monetdb : dut_base, monetdb_connection {
30+
virtual void test(const std::string &stmt);
31+
dut_monetdb(std::string &conninfo);
32+
};
33+
34+
#endif

‎sqlsmith.cc

+7-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ using boost::regex_match;
3131
#endif
3232

3333
#include "postgres.hh"
34+
#include "monetdb.hh"
3435

3536
using namespace std;
3637

@@ -58,7 +59,7 @@ int main(int argc, char *argv[])
5859
cerr << PACKAGE_NAME " " GITREV << endl;
5960

6061
map<string,string> options;
61-
regex optregex("--(help|log-to|verbose|target|sqlite|version|dump-all-graphs|seed|dry-run|max-queries|rng-state|exclude-catalog)(?:=((?:.|\n)*))?");
62+
regex optregex("--(help|log-to|verbose|target|sqlite|monetdb|version|dump-all-graphs|seed|dry-run|max-queries|rng-state|exclude-catalog)(?:=((?:.|\n)*))?");
6263

6364
for(char **opt = argv+1 ;opt < argv+argc; opt++) {
6465
smatch match;
@@ -77,6 +78,7 @@ int main(int argc, char *argv[])
7778
#ifdef HAVE_LIBSQLITE3
7879
" --sqlite=URI SQLite database to send queries to" << endl <<
7980
#endif
81+
" --monetdb=connstr MonetDB database to send queries to" <<endl <<
8082
" --log-to=connstr log errors to postgres database" << endl <<
8183
" --seed=int seed RNG with specified int instead of PID" << endl <<
8284
" --dump-all-graphs dump generated ASTs" << endl <<
@@ -103,6 +105,8 @@ int main(int argc, char *argv[])
103105
return 1;
104106
#endif
105107
}
108+
else if(options.count("monetdb"))
109+
schema = make_shared<schema_monetdb>(options["monetdb"]);
106110
else
107111
schema = make_shared<schema_pqxx>(options["target"], options.count("exclude-catalog"));
108112

@@ -160,6 +164,8 @@ int main(int argc, char *argv[])
160164
return 1;
161165
#endif
162166
}
167+
else if(options.count("monetdb"))
168+
dut = make_shared<dut_monetdb>(options["monetdb"]);
163169
else
164170
dut = make_shared<dut_libpq>(options["target"]);
165171

0 commit comments

Comments
 (0)