Changeset: e6a45ec8fb7f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6a45ec8fb7f
Modified Files:
ctest/tools/embedded/backup.c
ctest/tools/embedded/example1.c
ctest/tools/embedded/example2.c
ctest/tools/embedded/example_append.c
ctest/tools/embedded/example_blob.c
ctest/tools/embedded/example_connections.c
ctest/tools/embedded/example_decimals.c
ctest/tools/embedded/example_temporal.c
ctest/tools/embedded/mapi.c
ctest/tools/embedded/mapi.h
tools/embedded/monetdb_embedded.c
tools/embedded/monetdb_embedded.h
Branch: default
Log Message:
changed monetdb_connection into monetdb_database
removed monetdb_startup and monetdb_shutdown from api
replace monetdb_connect/monetdb_disconnect by monetdb_open/monetdb_close
monetdb_open expects a uri (or NULL, or filename)
(TODO option parsing)
diffs (truncated from 1146 to 300 lines):
diff --git a/ctest/tools/embedded/backup.c b/ctest/tools/embedded/backup.c
--- a/ctest/tools/embedded/backup.c
+++ b/ctest/tools/embedded/backup.c
@@ -18,12 +18,10 @@ main(void)
char* err = NULL;
Mapi mid = (Mapi)malloc(sizeof(struct MapiStruct));
- if ((mid->msg = monetdb_startup(NULL, 0)) != NULL)
- error(mid->msg);
- if ((mid->msg = monetdb_connect(&mid->conn)) != NULL)
+ if ((mid->msg = monetdb_open(&mid->mdbe, NULL)) != NULL)
error(mid->msg);
- if ((err = monetdb_query(mid->conn, "CREATE TABLE test (b bool, t
tinyint, s smallint, x integer, l bigint, "
+ if ((err = monetdb_query(mid->mdbe, "CREATE TABLE test (b bool, t
tinyint, s smallint, x integer, l bigint, "
#ifdef HAVE_HGE
"h hugeint, "
#else
@@ -31,7 +29,7 @@ main(void)
#endif
"f float, d double, y string)", NULL, NULL)) != NULL)
error(err)
- if ((err = monetdb_query(mid->conn, "INSERT INTO test VALUES (TRUE, 42,
42, 42, 42, 42, 42.42, 42.42, 'Hello'), (NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, 'World')", NULL, NULL)) != NULL)
+ if ((err = monetdb_query(mid->mdbe, "INSERT INTO test VALUES (TRUE, 42,
42, 42, 42, 42, 42.42, 42.42, 'Hello'), (NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, 'World')", NULL, NULL)) != NULL)
error(err)
/* open file stream */
@@ -44,8 +42,6 @@ main(void)
}
close_stream(fd);
- if ((mid->msg = monetdb_disconnect(mid->conn)) != NULL)
- error(mid->msg);
- if ((mid->msg = monetdb_shutdown()) != NULL)
+ if ((mid->msg = monetdb_close(mid->mdbe)) != NULL)
error(mid->msg);
}
diff --git a/ctest/tools/embedded/example1.c b/ctest/tools/embedded/example1.c
--- a/ctest/tools/embedded/example1.c
+++ b/ctest/tools/embedded/example1.c
@@ -17,26 +17,24 @@ int
main(void)
{
char* err = NULL;
- monetdb_connection conn = NULL;
+ monetdb_database mdbe = NULL;
monetdb_result* result = NULL;
- // first argument is a string for the db directory or NULL for
in-memory mode
- if ((err = monetdb_startup(NULL, 0)) != NULL)
- error(err)
- if ((err = monetdb_connect(&conn)) != NULL)
+ // second argument is a string for the db directory or NULL for
in-memory mode
+ if ((err = monetdb_open(&mdbe, NULL)) != NULL)
error(err)
- if ((err = monetdb_query(conn, "CREATE TABLE test (x integer, y
string)", NULL, NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "CREATE TABLE test (x integer, y
string)", NULL, NULL)) != NULL)
error(err)
- if ((err = monetdb_query(conn, "INSERT INTO test VALUES (42, 'Hello'),
(NULL, 'World')", NULL, NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "INSERT INTO test VALUES (42, 'Hello'),
(NULL, 'World')", NULL, NULL)) != NULL)
error(err)
- if ((err = monetdb_query(conn, "SELECT x, y FROM test; ", &result,
NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "SELECT x, y FROM test; ", &result,
NULL)) != NULL)
error(err)
fprintf(stdout, "Query result with %zu cols and %"PRId64" rows\n",
result->ncols, result->nrows);
for (int64_t r = 0; r < result->nrows; r++) {
for (size_t c = 0; c < result->ncols; c++) {
monetdb_column* rcol;
- if ((err = monetdb_result_fetch(conn, result, &rcol,
c)) != NULL)
+ if ((err = monetdb_result_fetch(mdbe, result, &rcol,
c)) != NULL)
error(err)
switch (rcol->type) {
case monetdb_int32_t: {
@@ -69,11 +67,9 @@ main(void)
printf("\n");
}
- if ((err = monetdb_cleanup_result(conn, result)) != NULL)
+ if ((err = monetdb_cleanup_result(mdbe, result)) != NULL)
error(err)
- if ((err = monetdb_disconnect(conn)) != NULL)
- error(err)
- if ((err = monetdb_shutdown()) != NULL)
+ if ((err = monetdb_close(mdbe)) != NULL)
error(err)
return 0;
}
diff --git a/ctest/tools/embedded/example2.c b/ctest/tools/embedded/example2.c
--- a/ctest/tools/embedded/example2.c
+++ b/ctest/tools/embedded/example2.c
@@ -17,15 +17,13 @@ int
main(void)
{
char* err = NULL;
- monetdb_connection conn = NULL;
+ monetdb_database mdbe = NULL;
monetdb_result* result = NULL;
- // first argument is a string for the db directory or NULL for
in-memory mode
- if ((err = monetdb_startup(NULL, 0)) != NULL)
+ // second argument is a string for the db directory or NULL for
in-memory mode
+ if ((err = monetdb_open(&mdbe, NULL)) != NULL)
error(err)
- if ((err = monetdb_connect(&conn)) != NULL)
- error(err)
- if ((err = monetdb_query(conn, "CREATE TABLE test (b bool, t tinyint, s
smallint, x integer, l bigint, "
+ if ((err = monetdb_query(mdbe, "CREATE TABLE test (b bool, t tinyint, s
smallint, x integer, l bigint, "
#ifdef HAVE_HGE
"h hugeint, "
#else
@@ -33,16 +31,16 @@ main(void)
#endif
"f float, d double, y string)", NULL, NULL)) != NULL)
error(err)
- if ((err = monetdb_query(conn, "INSERT INTO test VALUES (TRUE, 42, 42,
42, 42, 42, 42.42, 42.42, 'Hello'), (NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, 'World')", NULL, NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "INSERT INTO test VALUES (TRUE, 42, 42,
42, 42, 42, 42.42, 42.42, 'Hello'), (NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, 'World')", NULL, NULL)) != NULL)
error(err)
- if ((err = monetdb_query(conn, "SELECT b, t, s, x, l, h, f, d, y FROM
test; ", &result, NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "SELECT b, t, s, x, l, h, f, d, y FROM
test; ", &result, NULL)) != NULL)
error(err)
fprintf(stdout, "Query result with %zu cols and %"PRId64" rows\n",
result->ncols, result->nrows);
for (int64_t r = 0; r < result->nrows; r++) {
for (size_t c = 0; c < result->ncols; c++) {
monetdb_column* rcol;
- if ((err = monetdb_result_fetch(conn, result, &rcol,
c)) != NULL)
+ if ((err = monetdb_result_fetch(mdbe, result, &rcol,
c)) != NULL)
error(err)
switch (rcol->type) {
case monetdb_bool: {
@@ -139,26 +137,26 @@ main(void)
}
printf("\n");
}
- if ((err = monetdb_cleanup_result(conn, result)) != NULL)
+ if ((err = monetdb_cleanup_result(mdbe, result)) != NULL)
error(err)
/* test empty results */
- if ((err = monetdb_query(conn, "SELECT b, t, s, x, l, h, f, d, y FROM
test where t > 127; ", &result, NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "SELECT b, t, s, x, l, h, f, d, y FROM
test where t > 127; ", &result, NULL)) != NULL)
error(err)
fprintf(stdout, "Query result with %zu cols and %"PRId64" rows\n",
result->ncols, result->nrows);
for (int64_t r = 0; r < result->nrows; r++) {
/* fetching the meta data should work */
for (size_t c = 0; c < result->ncols; c++) {
monetdb_column* rcol;
- if ((err = monetdb_result_fetch(conn, result, &rcol,
c)) != NULL)
+ if ((err = monetdb_result_fetch(mdbe, result, &rcol,
c)) != NULL)
error(err)
}
}
- if ((err = monetdb_cleanup_result(conn, result)) != NULL)
+ if ((err = monetdb_cleanup_result(mdbe, result)) != NULL)
error(err)
monetdb_statement *stmt = NULL;
- if ((err = monetdb_prepare(conn, "SELECT b, t FROM test where t = ?; ",
&stmt)) != NULL)
+ if ((err = monetdb_prepare(mdbe, "SELECT b, t FROM test where t = ?; ",
&stmt)) != NULL)
error(err)
char s = 42;
if ((err = monetdb_bind(stmt, &s, 0)) != NULL)
@@ -166,14 +164,12 @@ main(void)
if ((err = monetdb_execute(stmt, &result, NULL)) != NULL)
error(err)
fprintf(stdout, "Query result with %zu cols and %"PRId64" rows\n",
result->ncols, result->nrows);
- if ((err = monetdb_cleanup_result(conn, result)) != NULL)
+ if ((err = monetdb_cleanup_result(mdbe, result)) != NULL)
error(err)
- if ((err = monetdb_cleanup_statement(conn, stmt)) != NULL)
+ if ((err = monetdb_cleanup_statement(mdbe, stmt)) != NULL)
error(err)
- if ((err = monetdb_disconnect(conn)) != NULL)
- error(err)
- if ((err = monetdb_shutdown()) != NULL)
+ if ((err = monetdb_close(mdbe)) != NULL)
error(err)
return 0;
}
diff --git a/ctest/tools/embedded/example_append.c
b/ctest/tools/embedded/example_append.c
--- a/ctest/tools/embedded/example_append.c
+++ b/ctest/tools/embedded/example_append.c
@@ -17,26 +17,24 @@ int
main(void)
{
char* err = NULL;
- monetdb_connection conn = NULL;
+ monetdb_database mdbe = NULL;
monetdb_result* result = NULL;
- // first argument is a string for the db directory or NULL for
in-memory mode
- if ((err = monetdb_startup(NULL, 0)) != NULL)
+ // second argument is a string for the db directory or NULL for
in-memory mode
+ if ((err = monetdb_open(&mdbe, NULL)) != NULL)
error(err)
- if ((err = monetdb_connect(&conn)) != NULL)
+ if ((err = monetdb_query(mdbe, "CREATE TABLE test (x integer, y
string)", NULL, NULL)) != NULL)
error(err)
- if ((err = monetdb_query(conn, "CREATE TABLE test (x integer, y
string)", NULL, NULL)) != NULL)
- error(err)
- if ((err = monetdb_query(conn, "INSERT INTO test VALUES (42, 'Hello'),
(NULL, 'World')", NULL, NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "INSERT INTO test VALUES (42, 'Hello'),
(NULL, 'World')", NULL, NULL)) != NULL)
error(err)
- if ((err = monetdb_query(conn, "SELECT x, y FROM test; ", &result,
NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "SELECT x, y FROM test; ", &result,
NULL)) != NULL)
error(err)
fprintf(stdout, "Query result with %zu cols and %"PRId64" rows\n",
result->ncols, result->nrows);
monetdb_column* rcol[2];
for (int64_t r = 0; r < result->nrows; r++) {
for (size_t c = 0; c < result->ncols; c++) {
- if ((err = monetdb_result_fetch(conn, result, rcol+c,
c)) != NULL)
+ if ((err = monetdb_result_fetch(mdbe, result, rcol+c,
c)) != NULL)
error(err)
switch (rcol[c]->type) {
case monetdb_int32_t: {
@@ -68,18 +66,18 @@ main(void)
}
printf("\n");
}
- if ((err = monetdb_append(conn, "sys", "test", rcol, 2)) != NULL)
+ if ((err = monetdb_append(mdbe, "sys", "test", rcol, 2)) != NULL)
error(err)
/* we can now cleanup the previous query */
- if ((err = monetdb_cleanup_result(conn, result)) != NULL)
+ if ((err = monetdb_cleanup_result(mdbe, result)) != NULL)
error(err)
- if ((err = monetdb_query(conn, "SELECT x, y FROM test; ", &result,
NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "SELECT x, y FROM test; ", &result,
NULL)) != NULL)
error(err)
fprintf(stdout, "Query result after append with %zu cols and %"PRId64"
rows\n", result->ncols, result->nrows);
for (int64_t r = 0; r < result->nrows; r++) {
for (size_t c = 0; c < result->ncols; c++) {
- if ((err = monetdb_result_fetch(conn, result, rcol+c,
c)) != NULL)
+ if ((err = monetdb_result_fetch(mdbe, result, rcol+c,
c)) != NULL)
error(err)
switch (rcol[c]->type) {
case monetdb_int32_t: {
@@ -111,12 +109,10 @@ main(void)
}
printf("\n");
}
- if ((err = monetdb_cleanup_result(conn, result)) != NULL)
+ if ((err = monetdb_cleanup_result(mdbe, result)) != NULL)
error(err)
- if ((err = monetdb_disconnect(conn)) != NULL)
- error(err)
- if ((err = monetdb_shutdown()) != NULL)
+ if ((err = monetdb_close(mdbe)) != NULL)
error(err)
return 0;
}
diff --git a/ctest/tools/embedded/example_blob.c
b/ctest/tools/embedded/example_blob.c
--- a/ctest/tools/embedded/example_blob.c
+++ b/ctest/tools/embedded/example_blob.c
@@ -19,26 +19,24 @@ int
main(void)
{
char* err = NULL;
- monetdb_connection conn = NULL;
+ monetdb_database mdbe = NULL;
monetdb_result* result = NULL;
- // first argument is a string for the db directory or NULL for
in-memory mode
- if ((err = monetdb_startup(NULL, 0)) != NULL)
- error(err)
- if ((err = monetdb_connect(&conn)) != NULL)
+ // second argument is a string for the db directory or NULL for
in-memory mode
+ if ((err = monetdb_open(&mdbe, NULL )) != NULL)
error(err)
- if ((err = monetdb_query(conn, "CREATE TABLE test (name string, data
blob)", NULL, NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "CREATE TABLE test (name string, data
blob)", NULL, NULL)) != NULL)
error(err)
- if ((err = monetdb_query(conn, "INSERT INTO test VALUES ('Hello',
'01020308')", NULL, NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "INSERT INTO test VALUES ('Hello',
'01020308')", NULL, NULL)) != NULL)
error(err)
- if ((err = monetdb_query(conn, "SELECT name, data FROM test; ",
&result, NULL)) != NULL)
+ if ((err = monetdb_query(mdbe, "SELECT name, data FROM test; ",
&result, NULL)) != NULL)
error(err)
fprintf(stdout, "Query result with %zu cols and %"PRId64" rows\n",
result->ncols, result->nrows);
for (int64_t r = 0; r < result->nrows; r++) {
for (size_t c = 0; c < result->ncols; c++) {
monetdb_column* rcol;
- if ((err = monetdb_result_fetch(conn, result, &rcol,
c)) != NULL)
+ if ((err = monetdb_result_fetch(mdbe, result, &rcol,
c)) != NULL)
error(err)
switch (rcol->type) {
case monetdb_blob: {
@@ -76,11 +74,9 @@ main(void)
printf("\n");
}
- if ((err = monetdb_cleanup_result(conn, result)) != NULL)
+ if ((err = monetdb_cleanup_result(mdbe, result)) != NULL)
error(err)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
