Changeset: 3c044779ba44 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3c044779ba44
Modified Files:
sql/backends/monet5/vaults/gadget/gadget.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/vault.c
sql/backends/monet5/vaults/vault.mal
Branch: data-vaults
Log Message:
Load the correct args, use pattern instead of command and make sure you are
using the correct table name.
diffs (97 lines):
diff --git a/sql/backends/monet5/vaults/gadget/gadget.c
b/sql/backends/monet5/vaults/gadget/gadget.c
--- a/sql/backends/monet5/vaults/gadget/gadget.c
+++ b/sql/backends/monet5/vaults/gadget/gadget.c
@@ -1967,11 +1967,7 @@ gadgetAnalyzeTable(Client cntxt, MalBlkP
int status, *res;
str tname = NULL;
- if (pci->argc == 5) {
- status = *getArgReference_int(stk, pci, 3);
- tname = *getArgReference_str(stk, pci, 4);
- res = getArgReference_int(stk, pci, 1);
- } else if (pci->argc == 4) {
+ if (pci->argc == 4) {
status = *getArgReference_int(stk, pci, 2);
tname = *getArgReference_str(stk, pci, 3);
res = getArgReference_int(stk, pci, 0);
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -1963,11 +1963,7 @@ LIDARAnalyzeTable(Client cntxt, MalBlkPt
int status, *res;
str tname = NULL;
- if (pci->argc == 5) {
- status = *getArgReference_int(stk, pci, 3);
- tname = *getArgReference_str(stk, pci, 4);
- res = getArgReference_int(stk, pci, 1);
- } else if (pci->argc == 4) {
+ if (pci->argc == 4) {
status = *getArgReference_int(stk, pci, 2);
tname = *getArgReference_str(stk, pci, 3);
res = getArgReference_int(stk, pci, 0);
diff --git a/sql/backends/monet5/vaults/vault.c
b/sql/backends/monet5/vaults/vault.c
--- a/sql/backends/monet5/vaults/vault.c
+++ b/sql/backends/monet5/vaults/vault.c
@@ -290,6 +290,11 @@ VLTcheckTable(Client cntxt, MalBlkPtr mb
int reader_id = 0, *res = NULL;
str tname = NULL;
+ if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != MAL_SUCCEED)
+ return msg;
+ if ((msg = checkSQLContext(cntxt)) != MAL_SUCCEED)
+ return msg;
+
if (pci->argc == 4) {
tname = *getArgReference_str(stk, pci, 3);
printf("Table name%s\n", tname);
@@ -303,16 +308,13 @@ VLTcheckTable(Client cntxt, MalBlkPtr mb
return msg;
}
- printf("I am here\n");
if ((msg = getSQLContext(cntxt, mb, &m, NULL)) != MAL_SUCCEED)
return msg;
- printf("I am here\n");
if ((msg = checkSQLContext(cntxt)) != MAL_SUCCEED)
return msg;
- printf("I am here\n");
sch = mvc_bind_schema(m, "sys");
- vaults_tbl = mvc_bind_table(m, sch, "vaults_journal");
+ vaults_tbl = mvc_bind_table(m, sch, "vault_journal");
if (vaults_tbl == NULL) {
msg = createException(MAL, "vaults.check", "VAULTS catalog is
missing.\n");
return msg;
@@ -364,8 +366,8 @@ VLTanalyzeTable(Client cntxt, MalBlkPtr
sql_column *col;
oid rid = oid_nil;
int reader_id = *getArgReference_int(stk, pci, 1);
- int status = *getArgReference_int(stk, pci, 3);
- str tname = *getArgReference_str(stk, pci, 4);
+ int status = *getArgReference_int(stk, pci, 2);
+ str tname = *getArgReference_str(stk, pci, 3);
int *res = getArgReference_int(stk, pci, 0);
if (status != VAULT_TABLE_ANALYZE) {
@@ -379,7 +381,7 @@ VLTanalyzeTable(Client cntxt, MalBlkPtr
return msg;
sch = mvc_bind_schema(m, "sys");
- vaults_tbl = mvc_bind_table(m, sch, "vaults_journal");
+ vaults_tbl = mvc_bind_table(m, sch, "vault_journal");
if (vaults_tbl == NULL) {
msg = createException(MAL, "vaults.analyze", "VAULTS catalog is
missing.\n");
return msg;
diff --git a/sql/backends/monet5/vaults/vault.mal
b/sql/backends/monet5/vaults/vault.mal
--- a/sql/backends/monet5/vaults/vault.mal
+++ b/sql/backends/monet5/vaults/vault.mal
@@ -34,7 +34,7 @@ command epiloque():void
address VLTepilogue
comment "Cleanup the vault.";
-command checktable(mvc:int, tablename :str) (readerID:int, status:int)
+pattern checktable(mvc:int, tablename :str) (readerID:int, status:int)
address VLTcheckTable
comment "Check if table was loaded";
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
