Merge branch 'ashleyhx/complete-numeric-type-system' of github.com:ku…

…zudb/kuzu into ashleyhx/complete-numeric-type-system
kuzudb · Sep 7, 2023 · dd21ad2 · dd21ad2
2 parents fc8b461 + 4845cd4
commit dd21ad2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/common/types/types.cpp b/src/common/types/types.cpp
@@ -621,11 +621,12 @@ bool LogicalTypeUtils::isNumerical(const LogicalType& dataType) {
 std::vector<LogicalType> LogicalTypeUtils::getAllValidComparableLogicalTypes() {
     return std::vector<LogicalType>{LogicalType{LogicalTypeID::BOOL},
         LogicalType{LogicalTypeID::INT64}, LogicalType{LogicalTypeID::INT32},
-        LogicalType{LogicalTypeID::INT16}, LogicalType{LogicalTypeID::INT8},
-        LogicalType{LogicalTypeID::DOUBLE}, LogicalType{LogicalTypeID::FLOAT},
-        LogicalType{LogicalTypeID::DATE}, LogicalType{LogicalTypeID::TIMESTAMP},
-        LogicalType{LogicalTypeID::INTERVAL}, LogicalType{LogicalTypeID::BLOB},
-        LogicalType{LogicalTypeID::STRING}, LogicalType{LogicalTypeID::SERIAL}};
+        LogicalType{LogicalTypeID::INT16},LogicalType{LogicalTypeID::INT8},
+        LogicalType{LogicalTypeID::DOUBLE},
+        LogicalType{LogicalTypeID::FLOAT}, LogicalType{LogicalTypeID::DATE},
+        LogicalType{LogicalTypeID::TIMESTAMP}, LogicalType{LogicalTypeID::INTERVAL},
+        LogicalType{LogicalTypeID::BLOB}, LogicalType{LogicalTypeID::STRING},
+        LogicalType{LogicalTypeID::SERIAL}};
 }
 
 std::vector<LogicalTypeID> LogicalTypeUtils::getNumericalLogicalTypeIDs() {
@@ -640,12 +641,13 @@ std::vector<LogicalType> LogicalTypeUtils::getAllValidLogicTypes() {
     return std::vector<LogicalType>{LogicalType{LogicalTypeID::INTERNAL_ID},
         LogicalType{LogicalTypeID::BOOL}, LogicalType{LogicalTypeID::INT64},
         LogicalType{LogicalTypeID::INT32}, LogicalType{LogicalTypeID::INT16},
-        LogicalType{LogicalTypeID::INT8}, LogicalType{LogicalTypeID::DOUBLE},
-        LogicalType{LogicalTypeID::STRING}, LogicalType{LogicalTypeID::BLOB},
-        LogicalType{LogicalTypeID::DATE}, LogicalType{LogicalTypeID::TIMESTAMP},
-        LogicalType{LogicalTypeID::INTERVAL}, LogicalType{LogicalTypeID::VAR_LIST},
-        LogicalType{LogicalTypeID::FLOAT}, LogicalType{LogicalTypeID::SERIAL},
-        LogicalType{LogicalTypeID::NODE}, LogicalType{LogicalTypeID::REL}};
+        LogicalType{LogicalTypeID::INT8},
+        LogicalType{LogicalTypeID::DOUBLE}, LogicalType{LogicalTypeID::STRING},
+        LogicalType{LogicalTypeID::BLOB}, LogicalType{LogicalTypeID::DATE},
+        LogicalType{LogicalTypeID::TIMESTAMP}, LogicalType{LogicalTypeID::INTERVAL},
+        LogicalType{LogicalTypeID::VAR_LIST}, LogicalType{LogicalTypeID::FLOAT},
+        LogicalType{LogicalTypeID::SERIAL}, LogicalType{LogicalTypeID::NODE},
+        LogicalType{LogicalTypeID::REL}};
 }
 
 std::vector<std::string> LogicalTypeUtils::parseStructFields(const std::string& structTypeStr) {

diff --git a/src/common/types/value.cpp b/src/common/types/value.cpp
@@ -567,7 +567,7 @@ std::unique_ptr<Value> Value::deserialize(FileInfo* fileInfo, uint64_t& offset)
     case PhysicalTypeID::INT16: {
         SerDeser::deserializeValue(val->val.int16Val, fileInfo, offset);
     } break;
-    case PhysicalTypeID::INT8: {
+    case PhysicalTypeID::INT8:{
         SerDeser::deserializeValue(val->val.int8Val, fileInfo, offset);
     } break;
     case PhysicalTypeID::DOUBLE: {