Changeset: f5e314e3c039 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f5e314e3c039
Modified Files:
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sql.mx
Branch: default
Log Message:
Remove the mal stuff from sql.mx
diffs (truncated from 1422 to 300 lines):
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -96,7 +96,7 @@ lib__sql = {
headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = sql.mx sql_aggr_bte.mal sql_aggr_flt.mal sql_aggr_int.mal
sql_aggr_lng.mal sql_aggr_sht.mal sql_aggr_wrd.mal sql_cast.mal
sql_inspect.mal sql.mal sql_octopus.mal sql_rank.mal sql_rdf.mal
sql_sort.mal
+ SOURCES = sql.mx sql_aggr_bte.mal sql_aggr_flt.mal sql_aggr_int.mal
sql_aggr_lng.mal sql_aggr_sht.mal sql_aggr_wrd.mal sql_decimal.mal
sql_inspect.mal sql.mal sql_octopus.mal sql_rank.mal sql_rdf.mal
sql_sort.mal
}
headers_autoload = {
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -29,1304 +29,6 @@ All Rights Reserved.
* multi-version-catalog and support routines copied
* from the Version 4 code base.
*/
-@mal
-module batsql;
-module sql;
-
-pattern start():void
-address SQLsession
-comment "Switch to processing SQL statements";
-
-pattern start2():void
-address SQLsession2
-comment "Switch to processing precompiled sql statements";
-
-pattern init():void
-address SQLinitEnvironment
-comment "Initialize the environment for MAL";
-
-pattern shutdown(delay:bte, force:bit):str
-address SQLshutdown_wrap;
-pattern shutdown(delay:sht, force:bit):str
-address SQLshutdown_wrap;
-pattern shutdown(delay:int, force:bit):str
-address SQLshutdown_wrap;
-
-pattern shutdown(delay:bte):str
-address SQLshutdown_wrap;
-pattern shutdown(delay:sht):str
-address SQLshutdown_wrap;
-pattern shutdown(delay:int):str
-address SQLshutdown_wrap;
-
-pattern mvc():int
-address SQLmvc
-comment "get the multiversion catalog context, needed for correct statement
dependencies (ie sql.update, should be after sql.bind in concurrent execution)";
-
-pattern trans(type:int,chain:int,name:str):void
-address SQLtransaction
-comment "a transaction statement (type can be commit,release,rollback or
start)";
-
-pattern transaction{unsafe}()
-address SQLtransaction2
-comment "Start an autocommit transaction";
-
-pattern commit()
-address SQLcommit
-comment "Trigger the commit operation for a MAL block";
-
-pattern abort()
-address SQLabort
-comment "Trigger the abort operation for a MAL block";
-
-pattern catalog(type:int,sname:str,name:str,action:int):void
-address SQLcatalog
-comment "a catalog statement";
-
-pattern catalog(type:int,sname:str,name:str,funcid:int,ft:int,action:int):void
-address SQLcatalog
-comment "a catalog statement";
-
-pattern
catalog(type:int,sname:str,name:str,tname:str,time:int,o:int,event:int,oname:str,nname:str,condition:str,query:str):void
-address SQLcatalog
-comment "a catalog statement";
-
-pattern catalog(type:int,sname:str,t:ptr):void
-address SQLcatalog
-comment "a catalog statement";
-
-pattern catalog(type:int,sname:str,t:ptr,temp:int):void
-address SQLcatalog
-comment "a catalog statement";
-
-pattern catalog(type:int,sname:str,t:ptr,restart:lng):void
-address SQLcatalog
-comment "a catalog statement";
-
-pattern catalog(type:int,grantee:str,role:str):void
-address SQLcatalog
-comment "a grant/revoke role statement";
-
-pattern
catalog(type:int,user:str,passwd:str,enc:int,schema:str,fullname:str):void
-address SQLcatalog
-comment "a user catalog statement";
-
-pattern
catalog(type:int,sname:str,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void
-address SQLcatalog
-comment "a grant/revoke privileges statement";
-
-pattern catalog(type:int,iname:str,itype:int,sname:str,tname:str...):void
-address SQLcatalog
-comment "a create index catalog statement";
-
-pattern eval(cmd:str):void
-address SQLstatement
-comment "Compile and execute a single sql statement";
-
-pattern eval(cmd:str, output:bit):void
-address SQLstatement
-comment "Compile and execute a single sql statement (and optionaly send output
on the output stream)";
-
-pattern include(fname:str):void
-address SQLinclude
-comment "Compile and execute a sql statements on the file";
-
-pattern evalAlgebra(cmd:str, optimize:bit):void
-address RAstatement
-comment "Compile and execute a single 'relational algebra' statement";
-
-pattern assert(b:bit,msg:str):void
-address SQLassert
-comment "Generate an exception when b==true";
-
-pattern assert(b:int,msg:str):void
-address SQLassertInt
-comment "Generate an exception when b!=0";
-
-pattern assert(b:wrd,msg:str):void
-address SQLassertWrd
-comment "Generate an exception when b!=0";
-
-pattern assert(b:lng,msg:str):void
-address SQLassertLng
-comment "Generate an exception when b!=0";
-# @- The SQL multi-version catalog
-# This module also contains the definitions for managing an SQL database
schema in
-# version 5. It is an adaptation of the original V4.3 code base.
-# A main difference is that the global catalog is obtained from
-# the client record, rather than lookup the variable in a context stack.
-#
-# The MAL operations below are used in the SQL->MAL compiler and
-# can be (sparingly) used to inspect it from a MIL console.
-# The 'mvc_' header is removed, because all commands are already
-# prepended by the 'sql.' module name.
-# The original code is retained, because it makes it
-# easier to later re-use part of the catalog code in a separately.
-
-pattern setVariable(mvc:int, varname:str, value:any_1 ):int
-address setVariable
-comment "Set the value of a session variable";
-
-pattern getVariable(mvc:int, varname:str ):any_1
-address getVariable
-comment "Get the value of a session variable";
-
-pattern logfile{unsafe}(filename:str):void
-address mvc_logfile
-comment "Enable/disable saving the sql statement traces";
-
-pattern next_value( sname:str, sequence:str ):lng
-address mvc_next_value
-comment "return the next value of the sequence";
-
-pattern batsql.next_value( sname:bat[:oid,:str], sequence:str ) :bat[:oid,:lng]
-address mvc_bat_next_value
-comment "return the next value of the sequence";
-
-pattern get_value( sname:str, sequence:str ):lng
-address mvc_get_value
-comment "return the current value of the sequence";
-
-pattern restart{unsafe}( sname:str, sequence:str, start:lng ):lng
-address mvc_restart_seq
-comment "restart the sequence with value start";
-
-pattern bind_idxbat(mvc:int, schema:str, table:str, index:str,
access:int):bat[:oid,:any_1]
-address mvc_bind_idxbat_wrap
-comment "Bind the 'schema.table.index' BAT with access kind:
- 0 - base table
- 1 - inserts
- 2 - updates";
-
-pattern bind_idxbat(mvc:int, schema:str, table:str, index:str,
access:int)(uid:bat[:oid,:oid],uval:bat[:oid,:any_1])
-address mvc_bind_idxbat_wrap
-comment "Bind the 'schema.table.index' BAT with access kind:
- 0 - base table
- 1 - inserts
- 2 - updates";
-
-pattern bind_idxbat(mvc:int, schema:str, table:str, index:str, access:int,
part_nr:int, nr_parts:int):bat[:oid,:any_1]
-address mvc_bind_idxbat_wrap
-comment "Bind the 'schema.table.index' BAT with access kind:
- 0 - base table
- 1 - inserts
- 2 - updates";
-
-pattern bind_idxbat(mvc:int, schema:str, table:str, index:str, access:int,
part_nr:int, nr_parts:int)(uid:bat[:oid,:oid],uval:bat[:oid,:any_1])
-address mvc_bind_idxbat_wrap
-comment "Bind the 'schema.table.index' BAT with access kind:
- 0 - base table
- 1 - inserts
- 2 - updates";
-
-pattern bind(mvc:int, schema:str, table:str, column:str, access:int
):bat[:oid,:any_1]
-address mvc_bind_wrap
-comment "Bind the 'schema.table.column' BAT with access kind:
- 0 - base table
- 1 - inserts
- 2 - updates";
-
-pattern bind(mvc:int, schema:str, table:str, column:str, access:int
)(uid:bat[:oid,:oid],uval:bat[:oid,:any_1])
-address mvc_bind_wrap
-comment "Bind the 'schema.table.column' BAT with access kind:
- 0 - base table
- 1 - inserts
- 2 - updates";
-
-pattern bind(mvc:int, schema:str, table:str, column:str, access:int,
part_nr:int, nr_parts:int ):bat[:oid,:any_1]
-address mvc_bind_wrap
-comment "Bind the 'schema.table.column' BAT partition with access kind:
- 0 - base table
- 1 - inserts
- 2 - updates";
-
-pattern bind(mvc:int, schema:str, table:str, column:str, access:int,
part_nr:int, nr_parts:int )(uid:bat[:oid,:oid],uval:bat[:oid,:any_1])
-address mvc_bind_wrap
-comment "Bind the 'schema.table.column' BAT with access kind:
- 0 - base table
- 1 - inserts
- 2 - updates";
-
-command delta ( col:bat[:oid,:any_3], uid:bat[:oid,:oid],
uval:bat[:oid,:any_3], ins:bat[:oid,:any_3] )
- :bat[:oid,:any_3]
-address DELTAbat
-comment "Return column bat with delta's applied.";
-
-command projectdelta( subselect:bat[:oid,:oid], col:bat[:oid,:any_3],
uid:bat[:oid,:oid], uval:bat[:oid,:any_3], ins:bat[:oid,:any_3] )
:bat[:oid,:any_3]
-address DELTAproject
-comment "Return column bat with delta's applied.";
-
-command subdelta ( col:bat[:oid,:oid], cand:bat[:oid,:oid],
uid:bat[:oid,:oid], uval:bat[:oid,:oid], ins:bat[:oid,:oid] ) :bat[:oid,:oid]
-address DELTAsub
-comment "Return a single bat of subselected delta.";
-
-command delta ( col:bat[:oid,:any_3], uid:bat[:oid,:oid],
uval:bat[:oid,:any_3]) :bat[:oid,:any_3]
-address DELTAbat2
-comment "Return column bat with delta's applied.";
-
-command projectdelta( subselect:bat[:oid,:oid], col:bat[:oid,:any_3],
uid:bat[:oid,:oid], uval:bat[:oid,:any_3]) :bat[:oid,:any_3]
-address DELTAproject2
-comment "Return column bat with delta's applied.";
-
-command subdelta ( col:bat[:oid,:oid], cand:bat[:oid,:oid],
uid:bat[:oid,:oid], uval:bat[:oid,:oid]) :bat[:oid,:oid]
-address DELTAsub2
-comment "Return a single bat of subselected delta.";
-
-command getVersion(clientid:int):lng
-address mvc_getVersion
-comment "Return the database version identifier for a client";
-
-pattern append(mvc:int, sname:str, tname:str, cname:str, ins:any):int
-address mvc_append_wrap
-comment "Append b to the column tname.cname (possibly optimized to replace the
insert bat of tname.cname (returns sequence number for order dependence)";
-
-pattern update(mvc:int, sname:str, tname:str, cname:str, rids:any, upd:any):int
-address mvc_update_wrap
-comment "Update the values of the column tname.cname";
-
-pattern clear_table{unsafe}(sname:str, tname:str) :wrd
-address mvc_clear_table_wrap
-comment "Clear table";
-
-pattern tid( mvc:int, sname:str, tname:str):bat[:oid,:any_3]
-address SQLtid
-comment "Return the tables tid column.";
-
-pattern tid( mvc:int, sname:str, tname:str, part_nr:int, nr_parts:int
):bat[:oid,:any_3]
-address SQLtid
-comment "Return the tables tid column.";
-
-pattern delete{unsafe}(mvc:int, sname:str, tname:str, b:any):int
-address mvc_delete_wrap
-comment "delete from table";
-
-# @-
-# The Monet 5 code generator uses several SQL specific wrapper functions.
-pattern resultSet{unsafe}( nr_cols:int, sep:str, rsep:str, ssep:str, ns:str,
order:any_1 ) :int
-address mvc_result_file_wrap
-comment "Prepare a file result set";
-
-pattern resultSet{unsafe}( nr_cols:int, sep:str, rsep:str, ssep:str, ns:str,
order:bat[:oid,:any_1] ) :int
-address mvc_result_file_wrap
-comment "Prepare a file result set";
-
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
