Changeset: 68bfe7590f26 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68bfe7590f26
Added Files:
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_cat.h
sql/backends/monet5/sql_transaction.c
sql/backends/monet5/sql_transaction.h
sql/backends/monet5/sql_transaction.mal
sql/backends/monet5/sqlcatalog.mal
Modified Files:
clients/Tests/exports.stable.out
monetdb5/optimizer/opt_emptybind.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
sql/backends/monet5/40_sql.mal
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_statement.c
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128
Branch: default
Log Message:
moved the catalog/transaction mal code into its own files and namespace.
The catalog mal function has been split in its understandable parts (ie
create_table, create_function etc)
diffs (truncated from 3815 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1915,6 +1915,21 @@ str affectedRowsRef;
str aggrRef;
str alarmRef;
str algebraRef;
+str alter_add_tableRef;
+str alter_constraintRef;
+str alter_del_tableRef;
+str alter_functionRef;
+str alter_indexRef;
+str alter_roleRef;
+str alter_schemaRef;
+str alter_seqRef;
+str alter_set_tableRef;
+str alter_tableRef;
+str alter_triggerRef;
+str alter_typeRef;
+str alter_userRef;
+str alter_userRef;
+str alter_viewRef;
str andRef;
str antijoinRef;
str appendRef;
@@ -1957,7 +1972,6 @@ str bstream_read_wrapwrap(int *res, Bstr
str calcRef;
str callMAL(Client cntxt, MalBlkPtr mb, MalStkPtr *glb, ValPtr argv[], char
debug);
int callString(Client c, str s, int listing);
-str catalogRef;
str catchKernelException(Client cntxt, str ret);
void chkDeclarations(stream *out, MalBlkPtr mb);
void chkFlow(stream *out, MalBlkPtr mb);
@@ -1996,6 +2010,18 @@ str count_no_nilRef;
int cpyConstant(MalBlkPtr mb, VarPtr vr);
str createException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__,
3, 4)));
str createRef;
+str create_constraintRef;
+str create_functionRef;
+str create_indexRef;
+str create_roleRef;
+str create_schemaRef;
+str create_seqRef;
+str create_tableRef;
+str create_triggerRef;
+str create_typeRef;
+str create_userRef;
+str create_userRef;
+str create_viewRef;
str crossRef;
str dataflowRef;
str dateRef;
@@ -2017,9 +2043,22 @@ str deltaRef;
str dense_rankRef;
str depositRef;
malType destinationType(MalBlkPtr mb, InstrPtr p);
+str diffRef;
str differenceRef;
str disconnectRef;
str divRef;
+str drop_constraintRef;
+str drop_functionRef;
+str drop_indexRef;
+str drop_roleRef;
+str drop_schemaRef;
+str drop_seqRef;
+str drop_tableRef;
+str drop_triggerRef;
+str drop_typeRef;
+str drop_userRef;
+str drop_userRef;
+str drop_viewRef;
void dumpExceptionsToStream(stream *out, str msg);
str emptybindRef;
str emptybindidxRef;
@@ -2106,7 +2145,9 @@ str getTypeName(malType tpe);
lng getUserTime(void);
lng getVolume(MalStkPtr stk, InstrPtr pci, int rd);
int getprofilerlimit(void);
-str grabRef;
+str grantRef;
+str grant_functionRef;
+str grant_rolesRef;
str groupRef;
str groupbyRef;
str groupdoneRef;
@@ -2385,11 +2426,13 @@ str reconnectRef;
str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr
stk);
str refineRef;
str registerRef;
+str releaseRef;
str remapRef;
str remoteRef;
void removeInstruction(MalBlkPtr mb, InstrPtr p);
void removeInstructionBlock(MalBlkPtr mb, int pc, int cnt);
void renameVariable(MalBlkPtr mb, int i, str pattern, int newid);
+str rename_userRef;
str replaceRef;
str replicatorRef;
void resetMalBlk(MalBlkPtr mb, int stop);
@@ -2398,6 +2441,9 @@ void resizeMalBlk(MalBlkPtr mb, int maxs
int resolveType(int dsttype, int srctype);
str resultSetRef;
str reuseRef;
+str revokeRef;
+str revoke_functionRef;
+str revoke_rolesRef;
str row_numberRef;
str rpcRef;
str rsColumnRef;
@@ -2458,6 +2504,7 @@ str soundex_impl(str *res, str *Name);
str sqlRef;
int sqlblob_fromstr(char *instr, int *l, blob **val);
int sqlblob_tostr(str *tostr, int *l, const blob *p);
+str sqlcatalogRef;
str srvpoolRef;
str startProfiler(void);
str startRef;
@@ -2477,9 +2524,11 @@ str stringdiff_impl(int *res, str *s1, s
str subavgRef;
str subcountRef;
str subdeltaRef;
+str subdiffRef;
str subeval_aggrRef;
str subgroupRef;
str subgroupdoneRef;
+str subinterRef;
str submaxRef;
str submedianRef;
str subminRef;
@@ -2499,7 +2548,12 @@ timestamp *timestamp_nil;
int timestamp_tostr(str *buf, int *len, const timestamp *val);
int timestamp_tz_fromstr(const char *buf, int *len, timestamp **ret);
int timestamp_tz_tostr(str *buf, int *len, const timestamp *val, const tzone
*timezone);
-str transRef;
+str transactionRef;
+str transaction_abortRef;
+str transaction_beginRef;
+str transaction_commitRef;
+str transaction_releaseRef;
+str transaction_rollbackRef;
void trimMalVariables(MalBlkPtr mb, MalStkPtr stk);
void trimMalVariables_(MalBlkPtr mb, MalStkPtr glb);
void typeChecker(stream *out, Module scope, MalBlkPtr mb, InstrPtr p, int
silent);
diff --git a/monetdb5/optimizer/opt_emptybind.c
b/monetdb5/optimizer/opt_emptybind.c
--- a/monetdb5/optimizer/opt_emptybind.c
+++ b/monetdb5/optimizer/opt_emptybind.c
@@ -154,7 +154,7 @@ OPTemptybindImplementation(Client cntxt,
break;
}
}
- if(q && getModuleId(q) == sqlRef &&
getFunctionId(q) == catalogRef){
+ if(q && getModuleId(q) == sqlcatalogRef){
if (
strcmp(getVarConstant(mb,getArg(q,2)).val.sval, sch) == 0 ){
marked[getArg(p,0)] = 0;
if( p->retc == 2){
@@ -218,7 +218,7 @@ OPTemptybindImplementation(Client cntxt,
break;
}
}
- if(q && getModuleId(q) == sqlRef &&
getFunctionId(q) == catalogRef){
+ if(q && getModuleId(q) == sqlcatalogRef){
if (
strcmp(getVarConstant(mb,getArg(q,2)).val.sval, sch) == 0 ){
marked[getArg(p,0)] = 0;
break;
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -7,8 +7,8 @@
*/
/*
- * @f opt_prelude
- * @a M. Kersten
+ * opt_prelude
+ * M. Kersten
* These definitions are handy to have around in the optimizer
*/
#include "monetdb_config.h"
@@ -21,16 +21,31 @@ str aggrRef;
str alarmRef;
str algebraRef;
str andRef;
-str batalgebraRef;
str appendidxRef;
str appendRef;
str assertRef;
+str alter_seqRef;
+str alter_schemaRef;
+str alter_viewRef;
+str alter_tableRef;
+str alter_constraintRef;
+str alter_typeRef;
+str alter_userRef;
+str alter_roleRef;
+str alter_userRef;
+str alter_indexRef;
+str alter_functionRef;
+str alter_triggerRef;
+str alter_add_tableRef;
+str alter_del_tableRef;
+str alter_set_tableRef;
str attachRef;
str avgRef;
+str batRef;
+str batalgebraRef;
str arrayRef;
str basketRef;
str batcalcRef;
-str batRef;
str batstrRef;
str batmtimeRef;
str batmmathRef;
@@ -53,7 +68,6 @@ str emptybindidxRef;
str bpmRef;
str bstreamRef;
str calcRef;
-str catalogRef;
str clear_tableRef;
str closeRef;
str columnRef;
@@ -69,13 +83,40 @@ str export_tableRef;
str count_no_nilRef;
str crossRef;
str createRef;
+str create_seqRef;
+str create_schemaRef;
+str create_viewRef;
+str create_tableRef;
+str create_constraintRef;
+str create_typeRef;
+str create_userRef;
+str create_roleRef;
+str create_userRef;
+str create_indexRef;
+str create_functionRef;
+str create_triggerRef;
str dataflowRef;
str dblRef;
str defineRef;
str deleteRef;
str depositRef;
str differenceRef;
+str drop_seqRef;
str intersectRef;
+str drop_schemaRef;
+str drop_viewRef;
+str drop_tableRef;
+str drop_constraintRef;
+str drop_typeRef;
+str drop_userRef;
+str drop_roleRef;
+str drop_userRef;
+str drop_indexRef;
+str drop_functionRef;
+str drop_triggerRef;
+str subdiffRef;
+str diffRef;
+str subinterRef;
str mergecandRef;
str mergepackRef;
str intersectcandRef;
@@ -91,7 +132,9 @@ str firstnRef;
str getRef;
str getTraceRef;
str generatorRef;
-str grabRef;
+str grantRef;
+str grant_rolesRef;
+str grant_functionRef;
str groupRef;
str groupdoneRef;
str subgroupRef;
@@ -190,12 +233,17 @@ str raiseRef;
str reconnectRef;
str refineRef;
str registerRef;
+str releaseRef;
str remapRef;
str remoteRef;
+str rename_userRef;
str replaceRef;
str replicatorRef;
str resultSetRef;
str reuseRef;
+str revoke_rolesRef;
+str revoke_functionRef;
+str revokeRef;
str row_numberRef;
str rpcRef;
str rsColumnRef;
@@ -212,6 +260,7 @@ str subsliceRef;
str sortRef;
str sortReverseRef;
str sqlRef;
+str sqlcatalogRef;
str srvpoolRef;
str streamsRef;
str startRef;
@@ -225,7 +274,12 @@ str subavgRef;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
