Enable Queries on Imported/Exported Tables (#225)

This PR enables filters on import/export of tables according to the Postgres SQL interface. The export filter will also be implemented in Hyrise.

Author: dey4ss

.gitignore

@@ -48,5 +48,6 @@ cmake-build-debug/
 
 # macOS compilation dirs
 *.dSYM
-
-.vscode/*
+.DS_STORE
+
+.vscode/*

src/SQLParserResult.cpp

@@ -4,9 +4,9 @@
 
 namespace hsql {
 
-SQLParserResult::SQLParserResult() : isValid_(false), errorMsg_(nullptr){};
+SQLParserResult::SQLParserResult() : isValid_(false), errorMsg_(nullptr) {}
 
-SQLParserResult::SQLParserResult(SQLStatement* stmt) : isValid_(false), errorMsg_(nullptr) { addStatement(stmt); };
+SQLParserResult::SQLParserResult(SQLStatement* stmt) : isValid_(false), errorMsg_(nullptr) { addStatement(stmt); }
 
 // Move constructor.
 SQLParserResult::SQLParserResult(SQLParserResult&& moved) { *this = std::forward<SQLParserResult>(moved); }

src/parser/bison_parser.cpp

@@ -36,8 +36,7 @@
 // Specify code that is included in the generated .h and .c files
 // clang-format off
 %code requires {
-  // clang-format on
-  // %code requires block
+// %code requires block
 
 #include "../SQLParserResult.h"
 #include "../sql/statements.h"
@@ -64,7 +63,6 @@
 // %defines "bison_parser.h"
 
 // Tell bison to create a reentrant parser
-// clang-format off
 %define api.pure full
 
 // Prefix the parser
@@ -164,9 +162,12 @@
      *********************************/
     // clang-format off
     %destructor { } <fval> <ival> <bval> <join_type> <order_type> <datetime_field> <column_type_t> <column_constraint_t> <import_type_t> <column_constraint_set> <lock_mode_t> <lock_wait_policy_t>
-    %destructor { free( ($$.name) ); free( ($$.schema) ); } <table_name>
     %destructor {
-      if (($$) != nullptr) {
+      free( ($$.name) );
+      free( ($$.schema) );
+    } <table_name>
+    %destructor {
+      if ($$) {
         for (auto ptr : *($$)) {
           free(ptr);
         }
@@ -175,7 +176,7 @@
     } <str_vec>
     %destructor { free( ($$) ); } <sval>
     %destructor {
-      if (($$) != nullptr) {
+      if ($$) {
         for (auto ptr : *($$)) {
           delete ptr;
         }
@@ -317,7 +318,7 @@ input : statement_list opt_semicolon {
 
   unsigned param_id = 0;
   for (void* param : yyloc.param_list) {
-    if (param != nullptr) {
+    if (param) {
       Expr* expr = (Expr*)param;
       expr->ival = param_id;
       result->addParameter(expr);
@@ -433,11 +434,12 @@ import_statement : IMPORT FROM file_type FILE file_path INTO table_name {
   $$->schema = $7.schema;
   $$->tableName = $7.name;
 }
-| COPY table_name FROM file_path opt_file_type {
+| COPY table_name FROM file_path opt_file_type opt_where {
   $$ = new ImportStatement($5);
   $$->filePath = $4;
   $$->schema = $2.schema;
   $$->tableName = $2.name;
+  $$->whereClause = $6;
 };
 
 file_type : IDENTIFIER {
@@ -472,6 +474,11 @@ export_statement : COPY table_name TO file_path opt_file_type {
   $$->filePath = $4;
   $$->schema = $2.schema;
   $$->tableName = $2.name;
+}
+| COPY select_with_paren TO file_path opt_file_type {
+  $$ = new ExportStatement($5);
+  $$->filePath = $4;
+  $$->select = $2;
 };
 
 /******************************
@@ -778,12 +785,12 @@ select_no_paren : select_clause opt_order opt_limit opt_locking_clause {
   $$->order = $2;
 
   // Limit could have been set by TOP.
-  if ($3 != nullptr) {
+  if ($3) {
     delete $$->limit;
     $$->limit = $3;
   }
 
-  if ($4 != nullptr) {
+  if ($4) {
     $$->lockings = $4;
   }
 }
@@ -1233,11 +1240,19 @@ join_clause : table_ref_atomic NATURAL JOIN nonjoin_table_ref_atomic {
   $$->join->left = $1;
   $$->join->right = $4;
   auto left_col = Expr::makeColumnRef(strdup($7->name));
-  if ($7->alias != nullptr) left_col->alias = strdup($7->alias);
-  if ($1->getName() != nullptr) left_col->table = strdup($1->getName());
+  if ($7->alias) {
+    left_col->alias = strdup($7->alias);
+  }
+  if ($1->getName()) {
+    left_col->table = strdup($1->getName());
+  }
   auto right_col = Expr::makeColumnRef(strdup($7->name));
-  if ($7->alias != nullptr) right_col->alias = strdup($7->alias);
-  if ($4->getName() != nullptr) right_col->table = strdup($4->getName());
+  if ($7->alias) {
+    right_col->alias = strdup($7->alias);
+  }
+  if ($4->getName()) {
+    right_col->table = strdup($4->getName());
+  }
   $$->join->condition = Expr::makeOpBinary(left_col, kOpEquals, right_col);
   delete $7;
 };

src/parser/bison_parser.h

@@ -1,5 +1,5 @@
-#include "SelectStatement.h"
 #include "CreateStatement.h"
+#include "SelectStatement.h"
 
 namespace hsql {
 
@@ -16,7 +16,7 @@ CreateStatement::CreateStatement(CreateType type)
       columns(nullptr),
       tableConstraints(nullptr),
       viewColumns(nullptr),
-      select(nullptr){};
+      select(nullptr) {}
 
 CreateStatement::~CreateStatement() {
   free(filePath);
@@ -25,28 +25,28 @@ CreateStatement::~CreateStatement() {
   free(indexName);
   delete select;
 
-  if (columns != nullptr) {
+  if (columns) {
     for (ColumnDefinition* def : *columns) {
       delete def;
     }
     delete columns;
   }
 
-  if (tableConstraints != nullptr) {
+  if (tableConstraints) {
     for (TableConstraint* def : *tableConstraints) {
       delete def;
     }
     delete tableConstraints;
   }
 
-  if (indexColumns != nullptr) {
+  if (indexColumns) {
     for (char* column : *indexColumns) {
       free(column);
     }
     delete indexColumns;
   }
 
-  if (viewColumns != nullptr) {
+  if (viewColumns) {
     for (char* column : *viewColumns) {
       free(column);
     }

src/parser/bison_parser.y

@@ -3,6 +3,7 @@
 
 #include "ImportStatement.h"
 #include "SQLStatement.h"
+#include "SelectStatement.h"
 
 namespace hsql {
 // Represents SQL Export statements.
@@ -15,6 +16,7 @@ struct ExportStatement : SQLStatement {
   char* filePath;
   char* schema;
   char* tableName;
+  SelectStatement* select;
 };
 
 }  // namespace hsql

src/sql/CreateStatement.cpp

@@ -21,7 +21,7 @@ Expr::Expr(ExprType type)
       columnType(DataType::UNKNOWN, 0),
       isBoolLiteral(false),
       opType(kOpNone),
-      distinct(false){};
+      distinct(false) {}
 
 Expr::~Expr() {
   delete expr;
@@ -31,7 +31,7 @@ Expr::~Expr() {
   free(table);
   free(alias);
 
-  if (exprList != nullptr) {
+  if (exprList) {
     for (Expr* e : *exprList) {
       delete e;
     }
@@ -255,7 +255,7 @@ bool Expr::hasAlias() const { return alias != nullptr; }
 bool Expr::hasTable() const { return table != nullptr; }
 
 const char* Expr::getName() const {
-  if (alias != nullptr)
+  if (alias)
     return alias;
   else
     return name;

src/sql/ExportStatement.h

@@ -20,6 +20,7 @@ struct ImportStatement : SQLStatement {
   char* filePath;
   char* schema;
   char* tableName;
+  Expr* whereClause;
 };
 
 }  // namespace hsql

src/sql/Expr.cpp

@@ -4,10 +4,10 @@
 namespace hsql {
 
 // SQLStatement
-SQLStatement::SQLStatement(StatementType type) : hints(nullptr), type_(type){};
+SQLStatement::SQLStatement(StatementType type) : hints(nullptr), type_(type) {}
 
 SQLStatement::~SQLStatement() {
-  if (hints != nullptr) {
+  if (hints) {
     for (Expr* hint : *hints) {
       delete hint;
     }
@@ -21,4 +21,4 @@ bool SQLStatement::isType(StatementType type) const { return (type_ == type); }
 
 bool SQLStatement::is(StatementType type) const { return isType(type); }
 
-}  // namespace hsql
+}  // namespace hsql