fix(p3): accept CRLF for sqllogictest, fix optimizer (#463)

* fix(p3): accept CRLF for sqllogictest, fix optimizer

Signed-off-by: Alex Chi <[email protected]>

* fix comments

Signed-off-by: Alex Chi <[email protected]>

Signed-off-by: Alex Chi <[email protected]>

Author: skyzh

.gitattributes

@@ -0,0 +1 @@
+*.slt text eol=lf

src/include/catalog/column.h

@@ -34,7 +34,6 @@ class Column {
    * Non-variable-length constructor for creating a Column.
    * @param column_name name of the column
    * @param type type of the column
-   * @param expr expression used to create this column
    */
   Column(std::string column_name, TypeId type)
       : column_name_(std::move(column_name)), column_type_(type), fixed_length_(TypeSize(type)) {

src/optimizer/optimizer.cpp

@@ -27,6 +27,9 @@ auto Optimizer::EstimatedCardinality(const std::string &table_name) -> std::opti
   if (StringUtil::EndsWith(table_name, "_100k")) {
     return std::make_optional(100000);
   }
+  if (StringUtil::EndsWith(table_name, "_50k")) {
+    return std::make_optional(50000);
+  }
   if (StringUtil::EndsWith(table_name, "_10k")) {
     return std::make_optional(10000);
   }

tools/sqllogictest/parser.cpp

@@ -34,7 +34,7 @@ auto Tokenize(const std::string &str, char delimiter = ' ') -> std::vector<std::
 }
 
 auto ParseInner(const std::string &filename, const std::string &script) -> std::vector<std::unique_ptr<Record>> {
-  auto lines = StringUtil::Split(script, '\n');
+  auto lines = StringUtil::Split(StringUtil::Replace(script, "\r\n", "\n"), '\n');
   std::vector<std::unique_ptr<Record>> records;
   auto line_iter = lines.cbegin();
   while (line_iter != lines.cend()) {