ast can be freed after queryplanning; parse and use CHAR(x)

Author: toppyy

src/executor/statements/createTable.c

@@ -1,47 +1,25 @@
 #include "../../include/executor/executor.h"
 
-Datatype mapParsedDatatypeToEnumDatatype(char* parsed) {
 
 
-    if (strcmp(parsed, "CHAR") == 0) return DTYPE_STR;
-    if (strcmp(parsed, "INT") == 0)  return DTYPE_LONG;
-    if (strcmp(parsed, "LONG") == 0) return DTYPE_LONG;
+TDB constructTDB(CreateInfo info) {
 
 
-    printf("Don't know how map nodetype %s to datatype\n", parsed);
-    exit(1);
-}
-
-
-TDB constructTDB(Node* node) {
-    checkPtrNotNull(node, "NULL-ptr to constructTDB\n");
-    if (node->type != COLUMNLIST) {
-        printf("Cannot create a TDB without a COLUMNLIST\n");
-        exit(1);
-    }
-
     struct TDB tbl;
-    Node* ptr_col = node->child;
 
-    size_t colIdx = 0;
-    while (ptr_col != NULL) {
-        checkPtrNotNull(ptr_col->child, "TDB needs datatype of column (NULL-ptr)\n");
-        Datatype dtype = mapParsedDatatypeToEnumDatatype(ptr_col->child->content);
+    for (size_t colIdx = 0; colIdx < info.colCount; colIdx++) {
 
-        strcpy(tbl.colNames[colIdx], ptr_col->content);
-        tbl.datatypes[colIdx] = dtype;
+        strcpy(tbl.colNames[colIdx], info.columns[colIdx].name);
+        tbl.datatypes[colIdx] = info.columns[colIdx].type;
         tbl.lengths[colIdx] = sizeof(long);
-        if (dtype == DTYPE_STR) {
-            checkPtrNotNull(ptr_col->child->child, "STRING needs length\n");
-            tbl.lengths[colIdx] = atoi(ptr_col->child->child->content);
+
+        if (tbl.datatypes[colIdx] == DTYPE_STR) {
+            tbl.lengths[colIdx] = info.columns[colIdx].size;
         }
 
-        ptr_col = ptr_col->next;
-        colIdx++;
     }
 
-    
-    tbl.colCount = colIdx;
+    tbl.colCount = info.colCount;
     tbl.records = 0;
 
     return tbl;
@@ -53,7 +31,7 @@ void executeCreateTable(Operator* op) {
     checkPtrNotNull(op, "Execute-error: nulltpr passed to executeCreateTable\n");
 
 
-    struct TDB tbl = constructTDB(op->info.create.columnList);
+    struct TDB tbl = constructTDB(op->info.create);
     strcpy(tbl.alias, op->info.create.objectName);
 
     char filepath[CHARMAXSIZE];

src/include/planner/planner.h

@@ -48,6 +48,7 @@ typedef struct {
     char resultSetAlias[CHARMAXSIZE];
     Datatype type;
     size_t identifier;
+    size_t size;
 } ColumnMetadata;
 
 
@@ -123,7 +124,8 @@ typedef struct {
 
 
 typedef struct {
-    Node* columnList;
+    ColumnMetadata columns[ARRAYMAXSIZE];
+    size_t colCount;
     char objectName[CHARMAXSIZE];
 } CreateInfo;
 
@@ -152,6 +154,7 @@ typedef struct Operator {
 
 void freeQueryplan(Operator *node);
 void copyResultDescription(Operator* opFrom, Operator* opTo, size_t offset);
+Datatype mapParsedDatatypeToEnumDatatype(char* parsed);
 void checkPtrNotNull(void* node, char* msg);
 void catalogFile(const char* path, TableMetadata* p_tablemetadata, char delimiter);
 int findColIdxInResDesc(ResultSet* resultDesc, char* name, char* tblref);

src/parser/parser.c

@@ -390,8 +390,10 @@ void getDatatype() {
     ident(DATATYPE);
     skipWhite();
     if (isChar) {
+        expectChar('(');
         nextToChild = true;
         number();
+        expectChar(')');
     }
 }
 

src/planner/planner.c

@@ -24,6 +24,18 @@ void freeQueryplan(Operator *node) {
     free(node);
 }
 
+
+Datatype mapParsedDatatypeToEnumDatatype(char* parsed) {
+
+    if (strcmp(parsed, "CHAR") == 0) return DTYPE_STR;
+    if (strcmp(parsed, "INT") == 0)  return DTYPE_LONG;
+    if (strcmp(parsed, "LONG") == 0) return DTYPE_LONG;
+
+    printf("Don't know how map nodetype %s to datatype\n", parsed);
+    exit(1);
+}
+
+
 void checkPtrNotNull(void* node, char* msg) {
     if (node == NULL) {
         printf("%s\n", msg);
@@ -129,7 +141,45 @@ Operator* buildCreateTable(Node* node) {
     */
 
     strcpy(op->info.create.objectName, node->next->next->content);
-    op->info.create.columnList = node->next->next->next;
+
+    
+
+    Node* ptr = node->next->next->next;
+
+    if (ptr->type != COLUMNLIST) {
+        printf("Expected a COLUMNLIST planning CREATE TABLE\n");
+    }
+
+    // Move to first column
+    ptr = ptr->child;
+
+    size_t colIndex = 0;
+
+    while (ptr != NULL) {
+
+        if (ptr->type != IDENT_COL) {
+            printf("Expected a IDENT_COL when planning CREATE TABLE\n");
+        }
+        
+        strcpy(op->info.create.columns[colIndex].name, ptr->content);
+
+        Datatype type = mapParsedDatatypeToEnumDatatype(ptr->child->content);
+        op->info.create.columns[colIndex].type = type;
+
+        // For CHAR(), get the length 
+        if (type == DTYPE_STR) {
+            if (ptr->child->child->type != NUMBER) {
+                printf("Expected a NUMBER when parsing CHAR-definition in CREATE TABLE\n");
+            }
+            op->info.create.columns[colIndex].size = atol(ptr->child->child->content);
+        }
+
+        colIndex++;
+
+        ptr = ptr->next;
+    }
+
+    op->info.create.colCount = colIndex;
 
     return op;
 }
@@ -225,5 +275,9 @@ Operator* planQuery(char* sqlStmt) {
     Node* ast = createParsetree();
     parse(sqlStmt, ast);
 
-    return planQueryAst((ast)->next);
+    Operator* queryplan = planQueryAst((ast)->next);
+
+    freeTree(ast);
+
+    return queryplan;
 }