Changeset: b3f43dc94021 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3f43dc94021
Modified Files:
sql/common/sql_keyword.c
sql/server/sql_scan.c
Branch: Mar2018
Log Message:
No duplicate keywords.
diffs (28 lines):
diff --git a/sql/common/sql_keyword.c b/sql/common/sql_keyword.c
--- a/sql/common/sql_keyword.c
+++ b/sql/common/sql_keyword.c
@@ -41,6 +41,12 @@ keywords_insert(char *k, int token)
if(kw) {
int len = 0;
int bucket = keyword_key(k = toLower(k), &len) & HASH_MASK;
+#ifndef NDEBUG
+ /* no duplicate keywords */
+ keyword *kw2;
+ for (kw2 = keywords[bucket]; kw2; kw2 = kw2->next)
+ assert(strcmp(kw2->keyword, k) != 0);
+#endif
kw->keyword = k;
kw->len = len;
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
@@ -107,8 +107,6 @@ scanner_init_keywords(void)
failed += keywords_insert("PROD", AGGR);
failed += keywords_insert("COUNT", AGGR);
- failed += keywords_insert("LAG", AGGR);
- failed += keywords_insert("LEAD", AGGR);
failed += keywords_insert("LAG", AGGR2);
failed += keywords_insert("LEAD", AGGR2);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
