Changeset: a5fbba42965a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5fbba42965a
Modified Files:
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sciql.c
sql/backends/monet5/sciql.h
sql/backends/monet5/sciql.mal
sql/server/rel_exp.c
Branch: sciql
Log Message:
get the sciql branch compile again
- sql/server/rel_exp.c: pass the correct (type of) operand to list_create
- remove unused and outdated sciql.* files in sql/backends/monet5
diffs (212 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
@@ -46,8 +46,7 @@
sql_optimizer.c \
sql_result.mx \
sql_readline.c \
- sql_emptyset.c \
- sciql.c
+ sql_emptyset.c
LIBS = ../../server/libsqlserver \
../../storage/libstore \
../../storage/bat/libbatstore \
@@ -97,7 +96,7 @@
headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = sql.mx sciql.mal
+ SOURCES = sql.mx
}
headers_autoload = {
@@ -106,5 +105,5 @@
SOURCES = 40_sql.mal
}
-EXTRA_DIST = 40_sql.mal sql_emptyset.h sql_gencode.h sql_optimizer.h
sql_scenario.h sql_user.h sql_readline.h sciql.mal sciql.h
+EXTRA_DIST = 40_sql.mal sql_emptyset.h sql_gencode.h sql_optimizer.h
sql_scenario.h sql_user.h sql_readline.h
EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/sciql.c b/sql/backends/monet5/sciql.c
deleted file mode 100644
--- a/sql/backends/monet5/sciql.c
+++ /dev/null
@@ -1,76 +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://www.monetdb.org/Legal/MonetDBLicense
- *
- * 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.
- */
-#include "monetdb_config.h"
-#include "sql_user.h"
-#include "sql_mvc.h"
-#include "bat5.h"
-
-str SCI1D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pci;
- throw(MAL,"sciql.newDimension",PROGRAM_NYI);
-}
-
-str SCI2D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pci;
- throw(MAL,"sciql.newDimension",PROGRAM_NYI);
-}
-
-str SCI3D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pci;
- throw(MAL,"sciql.newDimension",PROGRAM_NYI);
-}
-
-str SCI4D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pci;
- throw(MAL,"sciql.newDimension",PROGRAM_NYI);
-}
-
-str SCIdefault(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- (void) cntxt;
- (void) mb;
- (void) stk;
- (void) pci;
- throw(MAL,"sciql.setDefault",PROGRAM_NYI);
-}
diff --git a/sql/backends/monet5/sciql.h b/sql/backends/monet5/sciql.h
deleted file mode 100644
--- a/sql/backends/monet5/sciql.h
+++ /dev/null
@@ -1,31 +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://www.monetdb.org/Legal/MonetDBLicense
- *
- * 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.
- */
-
-#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_ */
-
diff --git a/sql/backends/monet5/sciql.mal b/sql/backends/monet5/sciql.mal
deleted file mode 100644
--- a/sql/backends/monet5/sciql.mal
+++ /dev/null
@@ -1,49 +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://www.monetdb.org/Legal/MonetDBLicense
-#
-# 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.
-
-module sciql;
-pattern newDimension(sch:str, tab:str, col:str, kind:int, start:any_1,
stop:any_1, step:any_1):bat[:oid,:any_1]
-address SCI1D
-comment "Define the dimension of a vector";
-
-pattern newDimension(sch:str, tab:str, col:str, kind:int,
- start1:any_1, stop1:any_1, step1:any_1,
- col2:str, start2:any_2, stop2:any_2, step2:any_2
-)(:bat[:oid,:any_1], :bat[:oid,:any_2])
-address SCI2D
-comment "Define the dimensions of a 2D space";
-
-pattern newDimension(sch:str, tab:str, col:str, kind:int,
- 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_1], :bat[:oid,:any_2], :bat[:oid,:any_3])
-address SCI3D
-comment "Define the dimensions of a 3D space";
-
-pattern newDimension(sch:str, tab:str, col:str, kind:int,
- 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,
- col4:str, start4:any_4, stop4:any_4, step4:any_4
-)(:bat[:oid,:any_1], :bat[:oid,:any_2], :bat[:oid,:any_3], :bat[:oid,:any_4])
-address SCI3D
-comment "Define the dimensions of a 4D space";
-
-pattern setDefault(b:bat[:oid,:any_1], def:any_2):bat[:oid,:any_2]
-address SCIsetDefault
-comment "Create an array instance initialized with default values);
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -390,7 +390,7 @@
exps_subtype( list *l )
{
node *n;
- list *t = list_create(l->sa);
+ list *t = list_create(l->destroy);
for (n = l->h; n; n = n->next) {
sql_exp *e = n->data;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
