Changeset: 4d37d88be09d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d37d88be09d
Modified Files:
tools/embedded/Tests/embedded-test.R
tools/embedded/embedded.c
Branch: embedded
Log Message:
mc
diffs (39 lines):
diff --git a/tools/embedded/Tests/embedded-test.R
b/tools/embedded/Tests/embedded-test.R
--- a/tools/embedded/Tests/embedded-test.R
+++ b/tools/embedded/Tests/embedded-test.R
@@ -1,5 +1,5 @@
library(MonetDB)
-monetdb_embedded_startup("/tmp/mydb", T)
+monetdb_embedded_startup("/Users/hannes/Desktop/embdb", T)
monetdb_embedded_query("SELECT 42")
monetdb_embedded_query("SELECT 42;;")
@@ -22,7 +22,7 @@ monetdb_embedded_query("SELECT COUNT(*)
monetdb_embedded_query("DROP TABLE lineitem");
monetdb_embedded_query("CREATE TABLE lineitem (l_orderkey INT NOT NULL,
l_partkey INT NOT NULL, l_suppkey INT NOT NULL, l_linenumber INT NOT NULL,
l_quantity INTEGER NOT NULL, l_extendedprice DECIMAL(15,2) NOT NULL, l_discount
DECIMAL(15,2) NOT NULL, l_tax DECIMAL(15,2) NOT NULL, l_returnflag VARCHAR(1)
NOT NULL, l_linestatus VARCHAR(1) NOT NULL, l_shipdate DATE NOT NULL,
l_commitdate DATE NOT NULL, l_receiptdate DATE NOT NULL, l_shipinstruct
VARCHAR(25) NOT NULL, l_shipmode VARCHAR(10) NOT NULL, l_comment VARCHAR(44)
NOT NULL);")
-monetdb_embedded_query("COPY INTO lineitem FROM '/tmp/lineitem6.tbl'")
+monetdb_embedded_query("COPY INTO lineitem FROM '/tmp/lineitem7.tbl.bz2'")
monetdb_embedded_query("SELECT * FROM lineitem LIMIT 10;")
monetdb_embedded_query("SELECT COUNT(*) FROM lineitem")
diff --git a/tools/embedded/embedded.c b/tools/embedded/embedded.c
--- a/tools/embedded/embedded.c
+++ b/tools/embedded/embedded.c
@@ -53,7 +53,7 @@ int monetdb_startup(char* dir, char sile
setlen = mo_builtin_settings(&set);
setlen = mo_add_option(&set, setlen, opt_cmdline, "gdk_dbpath", dir);
- if (GDKinit(set, setlen) == 0) goto cleanup;
+ if (GDKinit(set, setlen) == 0) goto cleanup;
snprintf(mod_path, 1000, "%s/../lib/monetdb5", BINDIR);
GDKsetenv("monet_mod_path", mod_path);
@@ -77,7 +77,6 @@ int monetdb_startup(char* dir, char sile
goto cleanup;
}
retval = 0;
-
cleanup:
mo_free_options(set, setlen);
MT_lock_unset(&monetdb_embedded_lock, "monetdb.startup");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
