add null table for smallint varbinary and varchar

src/codegen/proxy/date_functions_proxy.cpp

@@ -0,0 +1,24 @@
+//===----------------------------------------------------------------------===//
+//
+//                         Peloton
+//
+// date_functions_proxy.cpp
+//
+// Identification: src/codegen/proxy/date_functions_proxy.cpp
+//
+// Copyright (c) 2015-2017, Carnegie Mellon University Database Group
+//
+//===----------------------------------------------------------------------===//
+
+#include "codegen/proxy/date_functions_proxy.h"
+
+#include "codegen/proxy/type_builder.h"
+#include "function/date_functions.h"
+
+namespace peloton {
+namespace codegen {
+
+DEFINE_METHOD(peloton::function, DateFunctions, Now);
+
+}  // namespace codegen
+}  // namespace peloton

src/codegen/type/smallint_type.cpp

@@ -468,14 +468,18 @@ static std::vector<TypeSystem::BinaryOpInfo> kBinaryOperatorTable = {
 // Nary operations
 static std::vector<TypeSystem::NaryOpInfo> kNaryOperatorTable = {};
 
+// NoArg operators
+static std::vector<TypeSystem::NoArgOpInfo> kNoArgOperatorTable = {};
+
 }  // anonymous namespace
 
 // Initialize the SMALLINT SQL type with the configured type system
 SmallInt::SmallInt()
     : SqlType(peloton::type::TypeId::SMALLINT),
       type_system_(kImplicitCastingTable, kExplicitCastingTable,
-                   kComparisonTable, kUnaryOperatorTable, kBinaryOperatorTable,
-                   kNaryOperatorTable) {}
+                   kComparisonTable, kUnaryOperatorTable,
+                   kBinaryOperatorTable, kNaryOperatorTable, 
+                   kNoArgOperatorTable) {}
 
 Value SmallInt::GetMinValue(CodeGen &codegen) const {
   auto *raw_val = codegen.Const16(peloton::type::PELOTON_INT16_MIN);

src/codegen/type/timestamp_type.cpp

@@ -13,6 +13,7 @@
 #include "codegen/type/timestamp_type.h"
 
 #include "codegen/proxy/values_runtime_proxy.h"
+#include "codegen/proxy/date_functions_proxy.h"
 #include "codegen/type/boolean_type.h"
 #include "codegen/type/date_type.h"
 #include "codegen/type/integer_type.h"
@@ -113,11 +114,12 @@ struct CompareTimestamp : public TypeSystem::SimpleComparisonHandleNull {
 
 struct Now : public TypeSystem::NoArgOperator {
   Type ResultType(UNUSED_ATTRIBUTE const Type &val_type) const override {
-    return TimeStamp::Instance();
+    return Timestamp::Instance();
   }
 
   Value DoWork(CodeGen &codegen) const override {
-    llvm::Value *raw_ret = codegen.Call(StringFunctionsProxy::Now);
+    std::vector<llvm::Value *> dummy;
+    llvm::Value *raw_ret = codegen.Call(DateFunctionsProxy::Now, dummy);
     return Value{Timestamp::Instance(), raw_ret};
   }
 };
@@ -146,16 +148,17 @@ static std::vector<TypeSystem::NaryOpInfo> kNaryOperatorTable = {};
 static Now kNow;
 static std::vector<TypeSystem::NoArgOpInfo> kNoArgOperatorTable = {
   {OperatorId::Now, kNow}
-}
+};
 
 }  // anonymous namespace
 
 // Initialize the TIMESTAMP SQL type with the configured type system
 Timestamp::Timestamp()
     : SqlType(peloton::type::TypeId::TIMESTAMP),
       type_system_(kImplicitCastingTable, kExplicitCastingTable,
-                   kComparisonTable, kUnaryOperatorTable, kBinaryOperatorTable,
-                   kNaryOperatorTable) {}
+                   kComparisonTable, kUnaryOperatorTable,
+                   kBinaryOperatorTable, kNaryOperatorTable,
+                   kNoArgOperatorTable) {}
 
 Value Timestamp::GetMinValue(CodeGen &codegen) const {
   auto *raw_val = codegen.Const64(peloton::type::PELOTON_TIMESTAMP_MIN);

src/codegen/type/varbinary_type.cpp

@@ -141,6 +141,9 @@ static std::vector<TypeSystem::BinaryOpInfo> kBinaryOperatorTable = {};
 // Nary operations
 static std::vector<TypeSystem::NaryOpInfo> kNaryOperatorTable = {};
 
+// NoArg operators
+static std::vector<TypeSystem::NoArgOpInfo> kNoArgOperatorTable = {};
+
 }  // anonymous namespace
 
 //===----------------------------------------------------------------------===//
@@ -151,8 +154,9 @@ static std::vector<TypeSystem::NaryOpInfo> kNaryOperatorTable = {};
 Varbinary::Varbinary()
     : SqlType(peloton::type::TypeId::VARBINARY),
       type_system_(kImplicitCastingTable, kExplicitCastingTable,
-                   kComparisonTable, kUnaryOperatorTable, kBinaryOperatorTable,
-                   kNaryOperatorTable) {}
+                   kComparisonTable, kUnaryOperatorTable,
+                   kBinaryOperatorTable, kNaryOperatorTable, 
+                   kNoArgOperatorTable) {}
 
 Value Varbinary::GetMinValue(UNUSED_ATTRIBUTE CodeGen &codegen) const {
   throw Exception{"The VARBINARY type does not have a minimum value ..."};

src/codegen/type/varchar_type.cpp

@@ -16,6 +16,7 @@
 #include "codegen/proxy/string_functions_proxy.h"
 #include "codegen/proxy/timestamp_functions_proxy.h"
 #include "codegen/proxy/values_runtime_proxy.h"
+#include "codegen/proxy/date_functions_proxy.h"
 #include "codegen/type/boolean_type.h"
 #include "codegen/type/integer_type.h"
 #include "codegen/type/timestamp_type.h"
@@ -375,9 +376,10 @@ static Substr kSubstr;
 static std::vector<TypeSystem::NaryOpInfo> kNaryOperatorTable = {
     {OperatorId::Substr, kSubstr}};
 
-}  // anonymous namespace
+// NoArg operators
+static std::vector<TypeSystem::NoArgOpInfo> kNoArgOperatorTable = {};
 
-static std::vector<TypeSystem::NoArgOpInfo> kOfknasdlkf = {};
+}  // anonymous namespace
 
 //===----------------------------------------------------------------------===//
 // TINYINT TYPE CONFIGURATION
@@ -388,7 +390,7 @@ Varchar::Varchar()
     : SqlType(peloton::type::TypeId::VARCHAR),
       type_system_(kImplicitCastingTable, kExplicitCastingTable,
                    kComparisonTable, kUnaryOperatorTable, kBinaryOperatorTable,
-                   kNaryOperatorTable) {}
+                   kNaryOperatorTable, kNoArgOperatorTable) {}
 
 Value Varchar::GetMinValue(UNUSED_ATTRIBUTE CodeGen &codegen) const {
   throw Exception{"The VARCHAR type does not have a minimum value ..."};

src/function/date_functions.cpp

@@ -16,6 +16,7 @@
 #include <date/iso_week.h>
 #include <inttypes.h>
 #include <time.h>
+#include <sys/time.h>
 
 #include "common/logger.h"
 #include "type/types.h"
@@ -150,12 +151,12 @@ type::Value DateFunctions::Extract(const std::vector<type::Value> &args) {
 // Postgres is returning the time when the transaction begins
 // We are here intead generating a new time when this function
 // is called
-int64_t StringFunctions::Now() {
+int64_t DateFunctions::Now() {
   // TODO there might be some cross platform casting problem
   // by Tianyi
-  time_t now;
-  time(&now);
-  return now;
+  struct timeval tv;
+  gettimeofday(&tv, NULL);
+  return tv.tv_usec + tv.tv_sec * (uint64_t)1000000;
 }
 
 type::Value DateFunctions::_Now(const UNUSED_ATTRIBUTE std::vector<type::Value> &args) {

src/include/codegen/proxy/date_functions_proxy.h

@@ -0,0 +1,26 @@
+//===----------------------------------------------------------------------===//
+//
+//                         Peloton
+//
+// date_functions_proxy.h
+//
+// Identification: src/include/codegen/proxy/date_functions_proxy.h
+//
+// Copyright (c) 2015-2017, Carnegie Mellon University Database Group
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include "codegen/proxy/proxy.h"
+
+namespace peloton {
+namespace codegen {
+
+PROXY(DateFunctions) {
+  // Proxy everything in function::StringFunctions
+  DECLARE_METHOD(Now);
+};
+
+}  // namespace codegen
+}  // namespace peloton

src/include/codegen/type/type_system.h

@@ -437,9 +437,6 @@ class TypeSystem {
   // The comparison table
   const std::vector<ComparisonInfo> &comparison_table_;
 
-  // The table of builti no-arg operators
-  const std::vector<NoArgOpInfo> &no_arg_op_table_;
-
   // The table of builtin unary operators
   const std::vector<UnaryOpInfo> &unary_op_table_;
 
@@ -449,6 +446,9 @@ class TypeSystem {
   // The table of builtin nary operators
   const std::vector<NaryOpInfo> &nary_op_table_;
 
+  // The table of builti no-arg operators
+  const std::vector<NoArgOpInfo> &no_arg_op_table_;
+
  private:
   DISALLOW_COPY_AND_MOVE(TypeSystem);
 };