Changeset: 0e8ad29683f4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0e8ad29683f4
Modified Files:
sql/server/rel_file_loader.h
sql/server/rel_select.c
Branch: odbc_loader
Log Message:
Correct some comments
diffs (42 lines):
diff --git a/sql/server/rel_file_loader.h b/sql/server/rel_file_loader.h
--- a/sql/server/rel_file_loader.h
+++ b/sql/server/rel_file_loader.h
@@ -17,8 +17,7 @@
#include "sql_mvc.h"
typedef str (*fl_add_types_fptr)(mvc *sql, sql_subfunc *f, char *filename,
list *res_exps, char *name);
-typedef void *(*fl_load_fptr)(void *be, sql_subfunc *f, char *filename,
sql_exp *topn); /* use void * as both return type and be
-
argument are unknown types at this layer */
+typedef void *(*fl_load_fptr)(void *be, sql_subfunc *f, char *filename,
sql_exp *topn); /* use void * as both return type and be argument are unknown
types at this layer */
typedef struct file_loader_t {
char *name;
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -768,7 +768,7 @@ proto_loader_add_table_column_types(mvc
if (!proto)
return "URI scheme missing";
- // check uri scheme on supported protocols (e.g. must be: 'file' or
'odbc' or 'monetdb')
+ // find uri scheme in registered protocols (e.g. is: 'file' or
'monetdb' or 'odbc')
proto_loader_t *pl = pl_find(proto);
if (!pl)
return sa_message(sql->ta, "URI protocol '%s' not supported",
proto?proto:"");
@@ -794,7 +794,6 @@ rel_proto_loader(mvc *sql, list *exps, l
if ((f = bind_func_(sql, NULL, "proto_loader", tl, F_UNION, true,
&found, false))) {
list *nexps = exps;
- // TODO: test uri scheme on supported protocols (e.g. must be:
'file' or 'odbc' or 'monetdb')
if (list_empty(tl) || f->func->vararg || (nexps =
check_arguments_and_find_largest_any_type(sql, NULL, exps, f, 1, false))) {
list *res_exps = sa_list(sql->sa);
if (list_length(exps) == 1 && f && f->func->varres &&
strlen(f->func->mod) == 0 && strlen(f->func->imp) == 0) {
@@ -3798,7 +3797,7 @@ static sql_exp *
sql_exp *e = exp_aggr(sql->sa, exps, a, distinct, no_nil,
groupby?groupby->card:CARD_ATOM, hasnil);
if (!obe && a->func->order_required && !handled_order) {
- /* TODO preper error on missing order by */
+ /* TODO proper error on missing order by */
return NULL;
}
if (obe && !a->func->order_required && !a->func->opt_order)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
