MonetDB: groupby-expressions - Make code compile and fix memory ...

[Pedro Ferreira]

Changeset: ec89ad078f6e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec89ad078f6e
Modified Files:
        sql/server/sql_mvc.c
        sql/server/sql_mvc.h
Branch: groupby-expressions
Log Message:

Make code compile and fix memory leak.


diffs (43 lines):

diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -1629,7 +1629,7 @@ stack_push_groupby_expression(mvc *sql, 
 {
        sql_var* res = NULL;
        char *err = NULL;
-       sql_groupby_expression* sge = MNEW(sql_groupby_expression);
+       sql_groupby_expression *sge = MNEW(sql_groupby_expression);
 
        if(sge) {
                sge->sdef = symbol2string(sql, def, 1, &err);
@@ -1637,8 +1637,10 @@ stack_push_groupby_expression(mvc *sql, 
                        if (err) {
                                (void) sql_error(sql, 02, SQLSTATE(42000) 
"SELECT: incorrect expression '%s'", err);
                                _DELETE(err);
+                               _DELETE(sge);
                                return NULL;
                        }
+                       _DELETE(sge);
                        return NULL;
                }
                sge->token = def->token;
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -22,6 +22,7 @@
 #include "sql_keyword.h"
 #include "sql_atom.h"
 #include "sql_query.h"
+#include "sql_tokens.h"
 #include "sql_symbol.h"
 
 #define ERRSIZE 8192
@@ -68,7 +69,7 @@
 
 typedef struct sql_groupby_expression {
        char *sdef;
-       int token;
+       tokens token;
        sql_exp *exp;
 } sql_groupby_expression;
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list