Changeset: cb661853c3b9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb661853c3b9
Modified Files:
sql/src/common/Makefile.ag
sql/src/common/sql_backend.c
sql/src/common/sql_backend.h
sql/src/common/sql_backend.mx
sql/src/common/sql_changeset.c
sql/src/common/sql_changeset.mx
sql/src/common/sql_keyword.c
sql/src/common/sql_keyword.mx
sql/src/common/sql_list.c
sql/src/common/sql_list.mx
sql/src/common/sql_mem.c
sql/src/common/sql_mem.mx
sql/src/common/sql_string.c
sql/src/common/sql_string.h
sql/src/common/sql_string.mx
sql/src/common/sql_types.c
sql/src/common/sql_types.h
sql/src/common/sql_types.mx
sql/src/server/Makefile.ag
sql/src/server/bin_optimizer.c
sql/src/server/bin_optimizer.h
sql/src/server/bin_optimizer.mx
sql/src/server/rel_bin.c
sql/src/server/rel_bin.h
sql/src/server/rel_bin.mx
sql/src/server/rel_dump.c
sql/src/server/rel_dump.h
sql/src/server/rel_dump.mx
sql/src/server/rel_exp.c
sql/src/server/rel_exp.h
sql/src/server/rel_exp.mx
sql/src/server/rel_optimizer.c
sql/src/server/rel_optimizer.h
sql/src/server/rel_optimizer.mx
sql/src/server/rel_prop.c
sql/src/server/rel_prop.h
sql/src/server/rel_prop.mx
sql/src/server/rel_schema.c
sql/src/server/rel_schema.h
sql/src/server/rel_schema.mx
sql/src/server/rel_select.c
sql/src/server/rel_select.h
sql/src/server/rel_select.mx
sql/src/server/rel_semantic.c
sql/src/server/rel_semantic.h
sql/src/server/rel_semantic.mx
sql/src/server/rel_sequence.c
sql/src/server/rel_sequence.h
sql/src/server/rel_sequence.mx
sql/src/server/rel_subquery.c
sql/src/server/rel_subquery.h
sql/src/server/rel_subquery.mx
sql/src/server/rel_trans.c
sql/src/server/rel_trans.h
sql/src/server/rel_trans.mx
sql/src/server/rel_updates.c
sql/src/server/rel_updates.h
sql/src/server/rel_updates.mx
sql/src/server/rel_xml.c
sql/src/server/rel_xml.h
sql/src/server/rel_xml.mx
sql/src/server/sql_atom.c
sql/src/server/sql_atom.h
sql/src/server/sql_atom.mx
sql/src/server/sql_datetime.c
sql/src/server/sql_datetime.h
sql/src/server/sql_datetime.mx
sql/src/server/sql_decimal.c
sql/src/server/sql_decimal.h
sql/src/server/sql_decimal.mx
sql/src/server/sql_env.c
sql/src/server/sql_env.h
sql/src/server/sql_env.mx
sql/src/server/sql_mvc.c
sql/src/server/sql_mvc.h
sql/src/server/sql_mvc.mx
sql/src/server/sql_parser.h
sql/src/server/sql_parser.mx
sql/src/server/sql_parser.y
sql/src/server/sql_privileges.c
sql/src/server/sql_privileges.h
sql/src/server/sql_privileges.mx
sql/src/server/sql_psm.c
sql/src/server/sql_psm.h
sql/src/server/sql_psm.mx
sql/src/server/sql_qc.c
sql/src/server/sql_qc.h
sql/src/server/sql_qc.mx
sql/src/server/sql_rel2bin.c
sql/src/server/sql_rel2bin.h
sql/src/server/sql_rel2bin.mx
sql/src/server/sql_scan.c
sql/src/server/sql_scan.h
sql/src/server/sql_scan.mx
sql/src/server/sql_schema.c
sql/src/server/sql_schema.h
sql/src/server/sql_schema.mx
sql/src/server/sql_semantic.c
sql/src/server/sql_semantic.h
sql/src/server/sql_semantic.mx
sql/src/server/sql_statement.c
sql/src/server/sql_statement.h
sql/src/server/sql_statement.mx
sql/src/server/sql_symbol.c
sql/src/server/sql_symbol.h
sql/src/server/sql_symbol.mx
sql/src/storage/Makefile.ag
sql/src/storage/bat/Makefile.ag
sql/src/storage/bat/bat_logger.c
sql/src/storage/bat/bat_logger.h
sql/src/storage/bat/bat_logger.mx
sql/src/storage/bat/bat_storage.c
sql/src/storage/bat/bat_storage.h
sql/src/storage/bat/bat_storage.mx
sql/src/storage/bat/bat_table.c
sql/src/storage/bat/bat_table.h
sql/src/storage/bat/bat_table.mx
sql/src/storage/bat/bat_utils.c
sql/src/storage/bat/bat_utils.h
sql/src/storage/bat/bat_utils.mx
sql/src/storage/bat/res_table.c
sql/src/storage/bat/res_table.h
sql/src/storage/bat/res_table.mx
sql/src/storage/bpm/Makefile.ag
sql/src/storage/bpm/bpm_distribution.c
sql/src/storage/bpm/bpm_distribution.h
sql/src/storage/bpm/bpm_distribution.mx
sql/src/storage/bpm/bpm_logger.c
sql/src/storage/bpm/bpm_logger.h
sql/src/storage/bpm/bpm_logger.mx
sql/src/storage/bpm/bpm_storage.c
sql/src/storage/bpm/bpm_storage.h
sql/src/storage/bpm/bpm_storage.mx
sql/src/storage/bpm/bpm_table.c
sql/src/storage/bpm/bpm_table.h
sql/src/storage/bpm/bpm_table.mx
sql/src/storage/m4/Makefile.ag
sql/src/storage/m4/bpm.c
sql/src/storage/m4/bpm.h
sql/src/storage/m4/bpm.mx
sql/src/storage/restrict/Makefile.ag
sql/src/storage/restrict/restrict_logger.c
sql/src/storage/restrict/restrict_logger.h
sql/src/storage/restrict/restrict_logger.mx
sql/src/storage/restrict/restrict_storage.c
sql/src/storage/restrict/restrict_storage.h
sql/src/storage/restrict/restrict_storage.mx
sql/src/storage/restrict/restrict_table.c
sql/src/storage/restrict/restrict_table.h
sql/src/storage/restrict/restrict_table.mx
sql/src/storage/sql_catalog.c
sql/src/storage/sql_catalog.mx
sql/src/storage/store.c
sql/src/storage/store.mx
sql/src/storage/store_connections.c
sql/src/storage/store_connections.h
sql/src/storage/store_connections.mx
sql/src/storage/store_dependency.c
sql/src/storage/store_dependency.h
sql/src/storage/store_dependency.mx
sql/src/storage/store_sequence.c
sql/src/storage/store_sequence.h
sql/src/storage/store_sequence.mx
Branch: default
Log Message:
Converted (most) .mx files in SQL to .c/.h/.y files.
The only files not converted are those in sql/src/backends/monet5 and
sql/src/sql.
diffs (truncated from 106100 to 300 lines):
diff -r 5955d290be91 -r cb661853c3b9 sql/src/common/Makefile.ag
--- a/sql/src/common/Makefile.ag Thu Sep 30 15:08:10 2010 +0200
+++ b/sql/src/common/Makefile.ag Thu Sep 30 17:58:08 2010 +0200
@@ -23,6 +23,6 @@
NOINST
DIR = libdir
SOURCES = \
- sql_mem.mx sql_list.mx sql_backend.mx \
- sql_keyword.mx sql_changeset.mx sql_types.mx sql_string.mx
+ sql_mem.c sql_list.c sql_backend.c \
+ sql_keyword.c sql_changeset.c sql_types.c sql_string.c
}
diff -r 5955d290be91 -r cb661853c3b9 sql/src/common/sql_backend.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/common/sql_backend.c Thu Sep 30 17:58:08 2010 +0200
@@ -0,0 +1,124 @@
+/*
+ * 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-2010 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
+/*
+ * The back end structure collects the information needed to support
+ * compilation and execution of the SQL code against a back-end engine.
+ * Note that any back-end can be called upon by the front-end
+ * to handle specific tasks, such as catalog management (sql_mvc)
+ * and query execution (sql_qc). For this purpose, the front-end needs
+ * access to operations defined in the back-end, in particular for
+ * freeing the stack and code segment.
+ *
+ * The front-end should not rely on knowledge how the back end handles
+ * the actual query processing. Using the sample back end Monet5
+ * are used to find the common ground here. The structure currently is a
+ * simple functional wrapper. It assumes that a single back-end is used
+ * for the duration of a session.
+ */
+
+
+#include "sql_config.h"
+#include "sql_backend.h"
+
+backend_functions be_funcs;
+
+void
+backend_freestack(int clientid, backend_stack stk)
+{
+ if (be_funcs.fstack != NULL)
+ be_funcs.fstack(clientid, stk);
+}
+
+void
+backend_freecode(int clientid, backend_code code, backend_stack stk, int nr,
char *name)
+{
+ if (be_funcs.fcode != NULL)
+ be_funcs.fcode(clientid, code, stk, nr, name);
+}
+
+char *
+backend_create_user(ptr mvc, char *user, char *passwd, char enc, char
*fullname, sqlid defschemid, sqlid grantor)
+{
+ if (be_funcs.fcuser != NULL)
+ return(be_funcs.fcuser(mvc, user, passwd, enc, fullname,
defschemid, grantor));
+ return(NULL);
+}
+
+int
+backend_drop_user(ptr mvc, char *user)
+{
+ if (be_funcs.fduser != NULL)
+ return(be_funcs.fduser(mvc,user));
+ return FALSE;
+}
+
+int
+backend_find_user(ptr m, char *user)
+{
+ if (be_funcs.ffuser != NULL)
+ return(be_funcs.ffuser(m, user));
+ return(0);
+}
+
+void
+backend_create_privileges(ptr mvc, sql_schema *s)
+{
+ if (be_funcs.fcrpriv != NULL)
+ be_funcs.fcrpriv(mvc, s);
+}
+
+int
+backend_schema_has_user(ptr mvc, sql_schema *s)
+{
+ if (be_funcs.fshuser != NULL)
+ return(be_funcs.fshuser(mvc, s));
+ return(FALSE);
+}
+
+int
+backend_alter_user(ptr mvc, str user, str passwd, char enc,
+ sqlid schema_id, str oldpasswd)
+{
+ if (be_funcs.fauser != NULL)
+ return(be_funcs.fauser(mvc, user, passwd, enc, schema_id,
oldpasswd));
+ return(FALSE);
+}
+
+int
+backend_rename_user(ptr mvc, str olduser, str newuser)
+{
+ if (be_funcs.fruser != NULL)
+ return(be_funcs.fruser(mvc, olduser, newuser));
+ return(FALSE);
+}
+
+void*
+backend_schema_user_dependencies(ptr trans, int schema_id)
+{
+ if (be_funcs.fschuserdep != NULL)
+ return(be_funcs.fschuserdep(trans, schema_id));
+ return NULL;
+}
+void
+backend_create_function(ptr trans, str name, sql_rel *rel, sql_table *t)
+{
+ if (be_funcs.fcreate_function != NULL)
+ be_funcs.fcreate_function(trans, name, rel, t);
+}
diff -r 5955d290be91 -r cb661853c3b9 sql/src/common/sql_backend.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/common/sql_backend.h Thu Sep 30 17:58:08 2010 +0200
@@ -0,0 +1,71 @@
+/*
+ * 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-2010 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
+#ifndef _SQL_BACKEND_H_
+#define _SQL_BACKEND_H_
+
+#include "sql_mem.h"
+#include "sql_catalog.h"
+#include "sql_relation.h"
+#include "sql_types.h"
+
+typedef void (*freestack_fptr) (int clientid, backend_stack stk);
+typedef void (*freecode_fptr) (int clientid, backend_code code, backend_stack
stk, int nr, char *name);
+
+typedef char *(*create_user_fptr) (ptr mvc, char *user, char *passwd, char
enc, char *fullname, sqlid schema_id, sqlid grantor_id);
+typedef int (*drop_user_fptr) (ptr mvc, char *user);
+typedef int (*find_user_fptr) (ptr mvc, char *user);
+typedef void (*create_privileges_fptr) (ptr mvc, sql_schema *s);
+typedef int (*schema_has_user_fptr) (ptr mvc, sql_schema *s);
+typedef int (*alter_user_fptr) (ptr mvc, str user, str passwd, char enc,
sqlid schema_id, str oldpasswd);
+typedef int (*rename_user_fptr) (ptr mvc, str olduser, str newuser);
+typedef void* (*schema_user_dependencies) (ptr mvc, int schema_id);
+typedef void (*create_function) (ptr mvc, str name, sql_rel *rel, sql_table
*t);
+
+/* backing struct for this interface */
+typedef struct _backend_functions {
+ freestack_fptr fstack;
+ freecode_fptr fcode;
+ create_user_fptr fcuser;
+ drop_user_fptr fduser;
+ find_user_fptr ffuser;
+ create_privileges_fptr fcrpriv;
+ schema_has_user_fptr fshuser;
+ alter_user_fptr fauser;
+ rename_user_fptr fruser;
+ schema_user_dependencies fschuserdep;
+ create_function fcreate_function;
+} backend_functions;
+
+extern void backend_freestack(int clientid, backend_stack stk);
+extern void backend_freecode(int clientid, backend_code code, backend_stack
stk, int nr, char *name);
+
+extern char *backend_create_user(ptr mvc, char *user, char *passwd, char enc,
char *fullname, sqlid defschemid, sqlid grantor);
+extern int backend_drop_user(ptr mvc, char *user);
+extern int backend_find_user(ptr mp, char *user);
+extern void backend_create_privileges(ptr mvc, sql_schema *s);
+extern int backend_schema_has_user(ptr mvc, sql_schema *s);
+extern int backend_alter_user(ptr mvc, str user, str passwd, char enc,
sqlid schema_id, str oldpasswd);
+extern int backend_rename_user(ptr mvc, str olduser, str newuser);
+extern void* backend_schema_user_dependencies(ptr trans, int schema_id);
+extern void backend_create_function(ptr trans, str name, sql_rel *rel,
sql_table *t);
+
+extern backend_functions be_funcs;
+
+#endif /* _SQL_BACKEND_H_ */
diff -r 5955d290be91 -r cb661853c3b9 sql/src/common/sql_backend.mx
--- a/sql/src/common/sql_backend.mx Thu Sep 30 15:08:10 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +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-2010 MonetDB B.V.
-All Rights Reserved.
-@
-
-...@f sql_backend
-...@a N.J. Nes
-...@*
-The back end structure collects the information needed to support
-compilation and execution of the SQL code against a back-end engine.
-Note that any back-end can be called upon by the front-end
-to handle specific tasks, such as catalog management (sql_mvc)
-and query execution (sql_qc). For this purpose, the front-end needs
-access to operations defined in the back-end, in particular for
-freeing the stack and code segment.
-
-The front-end should not rely on knowledge how the back end handles
-the actual query processing. Using the sample back end Monet5
-are used to find the common ground here. The structure currently is a
-simple functional wrapper. It assumes that a single back-end is used
-for the duration of a session.
-...@{
-...@h
-#ifndef _SQL_BACKEND_H_
-#define _SQL_BACKEND_H_
-
-#include "sql_mem.h"
-#include "sql_catalog.h"
-#include "sql_relation.h"
-#include "sql_types.h"
-
-typedef void (*freestack_fptr) (int clientid, backend_stack stk);
-typedef void (*freecode_fptr) (int clientid, backend_code code, backend_stack
stk, int nr, char *name);
-
-typedef char *(*create_user_fptr) (ptr mvc, char *user, char *passwd, char
enc, char *fullname, sqlid schema_id, sqlid grantor_id);
-typedef int (*drop_user_fptr) (ptr mvc, char *user);
-typedef int (*find_user_fptr) (ptr mvc, char *user);
-typedef void (*create_privileges_fptr) (ptr mvc, sql_schema *s);
-typedef int (*schema_has_user_fptr) (ptr mvc, sql_schema *s);
-typedef int (*alter_user_fptr) (ptr mvc, str user, str passwd, char enc,
sqlid schema_id, str oldpasswd);
-typedef int (*rename_user_fptr) (ptr mvc, str olduser, str newuser);
-typedef void* (*schema_user_dependencies) (ptr mvc, int schema_id);
-typedef void (*create_function) (ptr mvc, str name, sql_rel *rel, sql_table
*t);
-
-/* backing struct for this interface */
-typedef struct _backend_functions {
- freestack_fptr fstack;
- freecode_fptr fcode;
- create_user_fptr fcuser;
- drop_user_fptr fduser;
- find_user_fptr ffuser;
- create_privileges_fptr fcrpriv;
- schema_has_user_fptr fshuser;
- alter_user_fptr fauser;
- rename_user_fptr fruser;
- schema_user_dependencies fschuserdep;
- create_function fcreate_function;
-} backend_functions;
-
-extern void backend_freestack(int clientid, backend_stack stk);
-extern void backend_freecode(int clientid, backend_code code, backend_stack
stk, int nr, char *name);
-
-extern char *backend_create_user(ptr mvc, char *user, char *passwd, char enc,
char *fullname, sqlid defschemid, sqlid grantor);
-extern int backend_drop_user(ptr mvc, char *user);
-extern int backend_find_user(ptr mp, char *user);
-extern void backend_create_privileges(ptr mvc, sql_schema *s);
-extern int backend_schema_has_user(ptr mvc, sql_schema *s);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
