Changeset: 14734092bea8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14734092bea8
Modified Files:
sql/server/rel_semantic.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/bat/bat_storage.c
Branch: arrays
Log Message:
fixed bug,update twod set v=2 where x=1; works now
diffs (110 lines):
diff --git a/sql/server/rel_semantic.c b/sql/server/rel_semantic.c
--- a/sql/server/rel_semantic.c
+++ b/sql/server/rel_semantic.c
@@ -162,11 +162,11 @@ rel_semantic(mvc *sql, symbol *s)
case SQL_DROP_SCHEMA:
case SQL_CREATE_TABLE:
- /*SciQL*/case SQL_CREATE_ARRAY:
+ case SQL_CREATE_ARRAY:
case SQL_CREATE_VIEW:
case SQL_DROP_TABLE:
case SQL_DROP_VIEW:
- /*SciQL*/case SQL_DROP_ARRAY:
+ case SQL_DROP_ARRAY:
case SQL_ALTER_TABLE:
case SQL_GRANT:
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -108,7 +108,7 @@ int yydebug=1;
copyfrom_stmt
table_def
view_def
-/*SciQL*/ array_def
+ array_def
query_expression
with_query_expression
role_def
@@ -161,7 +161,7 @@ int yydebug=1;
revoke
operation
table_content_source
-/*SciQL*/array_content_source
+ array_content_source
table_element
add_table_element
alter_table_element
@@ -259,8 +259,8 @@ int yydebug=1;
XML_value_expression
XML_primary
opt_comma_string_value_expression
-/*SciQL*/ dimension
-/*SciQL*/ range_term
+ dimension
+ range_term
%type <type>
data_type
@@ -337,7 +337,7 @@ int yydebug=1;
table_exp
table_ref_commalist
table_element_list
-/*SciQL*/ range_exp
+ range_exp
as_subquery_clause
column_exp_commalist
column_option_list
@@ -571,7 +571,7 @@ SQLCODE SQLERROR UNDER WHENEVER
%token X_BODY
-/* SciQL tokens */
+/* arrays tokens */
%token ARRAY DIMENSION
%%
@@ -5716,7 +5716,7 @@ char *token2string(int token)
SQL(CHARSET);
SQL(SCHEMA);
SQL(TABLE);
- /*SciQL*/SQL(ARRAY);
+ SQL(ARRAY);
SQL(TYPE);
SQL(CASE);
SQL(CAST);
@@ -5816,8 +5816,8 @@ char *token2string(int token)
SQL(XMLTEXT);
SQL(XMLVALIDATE);
SQL(XMLNAMESPACES);
- /*SciQL*/SQL(DIMENSION);
- /*SciQL*/SQL(RANGE);
+ SQL(DIMENSION);
+ SQL(RANGE);
}
return "unknown"; /* just needed for broken compilers ! */
}
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -367,7 +367,6 @@ scanner_init_keywords(void)
keywords_insert("URI", URI);
keywords_insert("XMLAGG", XMLAGG);
- /*SciQL*/
keywords_insert("ARRAY", ARRAY);
keywords_insert("DIMENSION", DIMENSION);
}
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -552,7 +552,7 @@ update_col(sql_trans *tr, sql_column *c,
updatedOids = (oid*)Tloc(b, BUNfirst(b));
if(updatedOids)
- neededCells = updatedOids[BATcount(b)-1]; //we
do not need to create more than the maximum updated oid
+ neededCells = updatedOids[BATcount(b)-1]+1;
//we do not need to create more than the maximum updated oid
else {
neededCells = b->tseqbase;
neededCells+=BATcount(b);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
