Changeset: b81d368619a6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b81d368619a6
Modified Files:
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sciql.mx
sql/backends/monet5/sql_sciql.mx
Branch: sciql
Log Message:
Rename to simplier scheme
diffs (271 lines):
diff -r c55c502ef9fe -r b81d368619a6 sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag Sun Jan 16 20:48:51 2011 +0100
+++ b/sql/backends/monet5/Makefile.ag Sun Jan 16 21:00:20 2011 +0100
@@ -46,7 +46,7 @@
sql_result.mx \
sql_readline.mx \
sql_emptyset.mx \
- sql_sciql.mx \
+ sciql.mx \
sql_bpm.mx
LIBS = ../../server/libsqlserver \
../../storage/libstore \
@@ -110,7 +110,7 @@
headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = sql.mx sql_bpm.mx sql_emptyset.mx sql_sciql.mx
+ SOURCES = sql.mx sql_bpm.mx sql_emptyset.mx sciql.mx
}
headers_autoload = {
diff -r c55c502ef9fe -r b81d368619a6 sql/backends/monet5/sciql.mx
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/backends/monet5/sciql.mx Sun Jan 16 21:00:20 2011 +0100
@@ -0,0 +1,121 @@
+@/
+The contents of this file are subject to the MonetDB Public License
+Version 1.1 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+License for the specific language governing rights and limitations
+under the License.
+
+The Original Code is the MonetDB Database System.
+
+The Initial Developer of the Original Code is CWI.
+Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+Copyright August 2008-2011 MonetDB B.V.
+All Rights Reserved.
+@
+
+@f sciql
+@t SciQL runtime
+@a N.Nes, M.Kersten, J.Zhang, M.Ivanova
+@+ SciQL
+This module contains the additions for the SciQL extensions of SQL.
+This current focus is on testing the code generation.
+@mal
+module sciql;
+pattern newDimension(sch:str, tab:str, col:str, kind:int, start:any_0,
stop:any_0, step:any_0):bat[:oid,:any_0]
+address SCI1D
+comment "Define the dimension of a vector";
+
+pattern newDimension(sch:str, tab:str, col:str, kind:int,
+ start0:any_0, stop0:any_0, step0:any_0,
+ col1:str, start1:any_1, stop1:any_1, step1:any_1
+)(:bat[:oid,:any_0], :bat[:oid,:any_1])
+address SCI2D
+comment "Define the dimensions of a 2D space";
+
+pattern newDimension(sch:str, tab:str, col:str, kind:int,
+ start0:any_0, stop0:any_0, step0:any_0,
+ col1:str, start1:any_1, stop1:any_1, step1:any_1,
+ col2:str, start2:any_2, stop2:any_2, step2:any_2
+)(:bat[:oid,:any_0], :bat[:oid,:any_1], :bat[:oid,:any_2]);
+address SCI3D
+comment "Define the dimensions of a 3D space";
+
+pattern newDimension(sch:str, tab:str, col:str, kind:int,
+ start0:any_0, stop0:any_0, step0:any_0,
+ col1:str, start1:any_1, stop1:any_1, step1:any_1,
+ col2:str, start2:any_2, stop2:any_2, step2:any_2,
+ col3:str, start3:any_3, stop3:any_3, step3:any_3
+)(:bat[:oid,:any_0], :bat[:oid,:any_1], :bat[:oid,:any_2], :bat[:oid,:any_3]);
+address SCI3D
+comment "Define the dimensions of a 4D space";
+
+pattern setDefault(b:bat[:oid,:any_0], def:any_1):bat[:oid,:any_1]
+address SCIsetDefault
+comment "Create an array instance initialized with default values);
+@h
+#ifndef _SCIQL_H_
+#define _SCIQL_H_
+#include "sql.h" /* includes sql_backend.h */
+
+sql5_export str SQL1D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+sql5_export str SQL2D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+sql5_export str SQL3D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+sql5_export str SQL4D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+sql5_export str SQLdefault(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+
+#endif /* _SCIQL_H_ */
+
+@c
+#include "monetdb_config.h"
+#include "sql_user.h"
+#include "sql_mvc.h"
+#include "bat5.h"
+
+sql5_export str SQL1D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pic;
+ throw(MAL,"sciql.newDimension",PROGRAM_NYI);
+}
+
+sql5_export str SQL2D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pic;
+ throw(MAL,"sciql.newDimension",PROGRAM_NYI);
+}
+
+sql5_export str SQL3D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pic;
+ throw(MAL,"sciql.newDimension",PROGRAM_NYI);
+}
+
+sql5_export str SQL4D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pic;
+ throw(MAL,"sciql.newDimension",PROGRAM_NYI);
+}
+
+sql5_export str SQLdefault(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
+{
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pic;
+ throw(MAL,"sciql.setDefault",PROGRAM_NYI);
+}
diff -r c55c502ef9fe -r b81d368619a6 sql/backends/monet5/sql_sciql.mx
--- a/sql/backends/monet5/sql_sciql.mx Sun Jan 16 20:48:51 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-@/
-The contents of this file are subject to the MonetDB Public License
-Version 1.1 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-License for the specific language governing rights and limitations
-under the License.
-
-The Original Code is the MonetDB Database System.
-
-The Initial Developer of the Original Code is CWI.
-Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2011 MonetDB B.V.
-All Rights Reserved.
-@
-
-@f sciql
-@t SciQL runtime
-@a N.Nes, M.Kersten, J.Zhang, M.Ivanova
-@+ SciQL
-This module contains the additions for the SciQL extensions of SQL.
-This current focus is on testing the code generation.
-@m
-module sciql;
-pattern newDimension(sch:str, tab:str, col:str, kind:int, start:any_0,
stop:any_0, step:any_0):bat[:oid,:any_0]
-address SCI1D
-comment "Define the dimension of a vector";
-
-pattern newDimension(sch:str, tab:str, col:str, kind:int,
- start0:any_0, stop0:any_0, step0:any_0,
- col1:str, start1:any_1, stop1:any_1, step1:any_1
-)(:bat[:oid,:any_0], :bat[:oid,:any_1])
-address SCI2D
-comment "Define the dimensions of a 2D space";
-
-pattern newDimension(sch:str, tab:str, col:str, kind:int,
- start0:any_0, stop0:any_0, step0:any_0,
- col1:str, start1:any_1, stop1:any_1, step1:any_1,
- col2:str, start2:any_2, stop2:any_2, step2:any_2
-)(:bat[:oid,:any_0], :bat[:oid,:any_1], :bat[:oid,:any_2]);
-address SCI3D
-comment "Define the dimensions of a 3D space";
-
-pattern newDimension(sch:str, tab:str, col:str, kind:int,
- start0:any_0, stop0:any_0, step0:any_0,
- col1:str, start1:any_1, stop1:any_1, step1:any_1,
- col2:str, start2:any_2, stop2:any_2, step2:any_2,
- col3:str, start3:any_3, stop3:any_3, step3:any_3
-)(:bat[:oid,:any_0], :bat[:oid,:any_1], :bat[:oid,:any_2], :bat[:oid,:any_3]);
-address SCI3D
-comment "Define the dimensions of a 4D space";
-
-pattern setDefault(b:bat[:oid,:any_0], def:any_1):bat[:oid,:any_1]
-address SCIsetDefault
-comment "Create an array instance initialized with default values);
-@h
-#ifndef _SCIQL_H_
-#define _SCIQL_H_
-#include "sql.h" /* includes sql_backend.h */
-
-sql5_export str SQL1D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-sql5_export str SQL2D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-sql5_export str SQL3D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-sql5_export str SQL4D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-sql5_export str SQLdefault(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-
-#endif /* _SCIQL_H_ */
-
-@c
-#include "monetdb_config.h"
-#include "sql_user.h"
-#include "sql_mvc.h"
-#include "bat5.h"
-
-sql5_export str SQL1D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pic;
- throw(MAL,"sciql.newDimension",PROGRAM_NYI);
-}
-
-sql5_export str SQL2D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pic;
- throw(MAL,"sciql.newDimension",PROGRAM_NYI);
-}
-
-sql5_export str SQL3D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pic;
- throw(MAL,"sciql.newDimension",PROGRAM_NYI);
-}
-
-sql5_export str SQL4D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pic;
- throw(MAL,"sciql.newDimension",PROGRAM_NYI);
-}
-
-sql5_export str SQLdefault(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pic;
- throw(MAL,"sciql.setDefault",PROGRAM_NYI);
-}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
