Changeset: 0758a5e6d2e0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0758a5e6d2e0
Modified Files:
sql/src/backends/monet5/vaults/Makefile.ag
sql/src/backends/monet5/vaults/vault.mx
sql/src/sql/createdb.mx
Branch: default
Log Message:
Next step to get library working
The name resolution does not work properly yet for the vault
primitives.
diffs (66 lines):
diff -r 9d81c7b5a874 -r 0758a5e6d2e0 sql/src/backends/monet5/vaults/Makefile.ag
--- a/sql/src/backends/monet5/vaults/Makefile.ag Thu Jul 01 09:09:21
2010 +0200
+++ b/sql/src/backends/monet5/vaults/Makefile.ag Thu Jul 01 14:16:21
2010 +0200
@@ -18,8 +18,8 @@
INCLUDES = ../../include ../../common ../../storage ../../server \
$(MONETDB5_INCS) $(CLIENTS_INCS) $(MONETDB_INCS) $(READLINE_INCS)
-lib_vaults = {
- DIR = libdir/MonetDB5
+lib__vaults = {
+ DIR = libdir/MonetDB5/
SOURCES = vault.mx
# LIBS = ../../server/libsqlserver ../../storage/libstore
../../storage/bat/libbatstore ../../storage/restrict/librestrictstore
../../storage/bpm/libbpmstore ../../common/libsqlcommon \
LIBS = ../../../server/libsqlserver ../../../storage/libstore
../../../storage/bat/libbatstore ../../../storage/restrict/librestrictstore
../../../storage/bpm/libbpmstore ../../../common/libsqlcommon \
diff -r 9d81c7b5a874 -r 0758a5e6d2e0 sql/src/backends/monet5/vaults/vault.mx
--- a/sql/src/backends/monet5/vaults/vault.mx Thu Jul 01 09:09:21 2010 +0200
+++ b/sql/src/backends/monet5/vaults/vault.mx Thu Jul 01 14:16:21 2010 +0200
@@ -54,6 +54,7 @@
The vault root is a subdirectory of the dbfarm/<dbname>/vault/ and contains
a subdirectory for each vault kind.
@mal
+library vault;
module vault;
command getDirectory(i:int):str
@@ -67,7 +68,6 @@
command refresh(id:int)
address VLTrefreshObject
comment "Refresh the content of the vault for a specific object";
-...@{
pattern prelude():void
address VLTprelude
comment "Initialize the vault.";
@@ -76,11 +76,13 @@
address VLTepilogue
comment "Cleanup the vault.";
+...@{
@-
@+ Implementation
@h
#ifndef _VAULT_H
#define _VAULT_H
+#include "sql_config.h"
#include "clients.h"
#include "mal.h"
#include "mal_client.h"
@@ -104,7 +106,6 @@
#endif /* _VAULT_H */
@- Module initializaton
@c
-#include "sql_config.h"
#include "vault.h"
static char vaultpath[BUFSIZ];
diff -r 9d81c7b5a874 -r 0758a5e6d2e0 sql/src/sql/createdb.mx
--- a/sql/src/sql/createdb.mx Thu Jul 01 09:09:21 2010 +0200
+++ b/sql/src/sql/createdb.mx Thu Jul 01 14:16:21 2010 +0200
@@ -44,7 +44,6 @@
@include skyserver.sql
@include clients.sql
-...@include vault.sql
@-
The remaining functionality is considered for debugging.
@sql
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
