Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
acquamarin committed Nov 21, 2022
1 parent 754bb51 commit 97b9b8f
Show file tree
Hide file tree
Showing 102 changed files with 106 additions and 4,059 deletions.
2 changes: 1 addition & 1 deletion dataset/copy-csv-empty-lists-test/vPerson.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@
1027
1028
1029
1030,unstrINT64Prop1:INT64:12345
1030
1031
1032
1033
Expand Down
8 changes: 0 additions & 8 deletions dataset/copy-csv-node-property-test/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,3 @@ vPerson.csv
# length x count pairs: 10x100, 4x10, 90x100, 40x100, 2x10, 780x80, 9x100,
# 2000x10, 13x100, 6x100, 83x100, 23x90, 41x100.
# Every 100th node's string properties are NULL (so v0, v100, v200, ..., v900)
# Except for 3 nodes, each node also contains 4 unstructured properties: (1) STRING: (strPropKey1, strPropVal1);
# (2) INT64: (int64PropKey1, 1); (3) DOUBLE: (doublePropKey1, 1.0); and (4) BOOLEAN: (boolPropKey1, True).
# Exceptions are nodes with offsets 300, 400, and 500. These contain: 300x4, 400x4, and 500x4 unstructured properties:
# e.g., for node 300: (1) (strPropKey0, strPropVal0), ..., (strPropKey299, strPropVal299); (2) (int64PropKey0, 0), ...
# (int64PropKey0, 299); (3) (doublePropKey0, 0.0), ..., (doublePropKey299, 299.0); (4) (boolPropKey1, False), ...,
# (boolPropKey1, False) (note that the exception vertices are False this time and the key indices start from 0 not 1).
# At least 1 unstructured property of the following nodes spans 2 pages: 77, 154, 231, 300, 310, 387, 400, 465, 500,
# 589, 666, 743, 821, 898, 975.
6 changes: 3 additions & 3 deletions dataset/copy-csv-special-char-test/vOrganisation.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1,ABFsUni,325,3.7,-2,10 years 5 months 13 hours 24 us,3 years 5 days,unstrNumericProp:DOUBLE:-12.5,unstrIntervalProp1:INTERVAL:23 hours 48 days,unstrIntervalProp2:INTERVAL:23 hours 48 days
4,=CsW,ork=,934,4.1,-100,2 years 4 days 10 hours,26 years 52 days 48 hours,unstrIntervalProp1:INTERVAL:26 years 52 days 48 hours,unstrIntervalProp2:INTERVAL:32 years 123 days 48 hours
6,=DEsW##ork=,824,4.1,7,2 years 4 hours 22 us 34 minutes,82 hours 100 milliseconds,unstrNumericProp:DOUBLE:-3.1
1,ABFsUni,325,3.7,-2,10 years 5 months 13 hours 24 us,3 years 5 days
4,=CsW,ork=,934,4.1,-100,2 years 4 days 10 hours,26 years 52 days 48 hours
6,=DEsW##ork=,824,4.1,7,2 years 4 hours 22 us 34 minutes,82 hours 100 milliseconds
6 changes: 3 additions & 3 deletions dataset/copy-csv-special-char-test/vPerson.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
0|-this is |the first line-|2020-02-18|strPropKey1:STRING:strPropVal1
0|-this is |the first line-|2020-02-18
1|-the " should be ignored-|2003-01-02
2|-the #- should be escaped-|2017-09-12|doublePropKey1:DOUBLE:1.0|boolPropKey1:BOOLEAN:True
3|-this #-is ##a #mixed test-|2000-12-11|unstrProp1:INT64:4
2|-the #- should be escaped-|2017-09-12
3|-this #-is ##a #mixed test-|2000-12-11
4|-only one ## should be recognized-|2013-05-01
5|this is a ##plain## #string|2013-05-01
6|this is another ##plain## #string with \|2013-05-01
6 changes: 0 additions & 6 deletions dataset/non-empty-disk-array-db/readme.txt

This file was deleted.

6 changes: 3 additions & 3 deletions dataset/tinysnb/vOrganisation.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1,ABFsUni,325,3.7,-2,10 years 5 months 13 hours 24 us,3 years 5 days,1,unstrNumericProp:DOUBLE:-12.5,unstrIntervalProp1:INTERVAL:23 hours 48 days,unstrIntervalProp2:INTERVAL:23 hours 48 days,unstrStr:STRING: pERfECt
4,CsWork,934,4.1,-100,2 years 4 days 10 hours,26 years 52 days 48 hours,0.78,unstrIntervalProp1:INTERVAL:26 years 52 days 48 hours,unstrIntervalProp2:INTERVAL:32 years 123 days 48 hours,unstrInt64Prop:INT64:-4,unstrStr:STRING: EXcELLENT organisation
6,DEsWork,824,4.1,7,2 years 4 hours 22 us 34 minutes,82 hours 100 milliseconds,0.52,unstrNumericProp:DOUBLE:3.3,unstrInt64Prop:INT64:10,unstrStringProp:STRING:1900-01-01,unstrStr:STRING:GoOd organisation ! ,unstrStringProp1:STRING:1955-11-23 15:22:31
1,ABFsUni,325,3.7,-2,10 years 5 months 13 hours 24 us,3 years 5 days,1
4,CsWork,934,4.1,-100,2 years 4 days 10 hours,26 years 52 days 48 hours,0.78
6,DEsWork,824,4.1,7,2 years 4 hours 22 us 34 minutes,82 hours 100 milliseconds,0.52
16 changes: 8 additions & 8 deletions dataset/tinysnb/vPerson.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
id,fname,Gender,ISStudent,isWorker,age,eyeSight,birthdate,registerTime,lastJobDuration,workedHours,usedNames,courseScoresPerTerm
0,Alice,1,true,false,35,5.0,1900-01-01,2011-08-20 11:25:30Z+00:00,3 years 2 days 13 hours 2 minutes,[10,5],["Aida"],[[10,8],[6,7,8]],unstrDateProp1:DATE:1900-01-01,unstrDateProp2:DATE:1920-01-01,unstrTimeProp1:DATE:1900-01-01,label1:STRING:good,label2:STRING:excellent,unstrDateProp:DATE:1952-07-15,unstrInt64Prop:INT64:451244124
2,Bob,2,true,false,30,5.1,1900-01-01,2008-11-03 13:25:30.000526-02:00,10 years 5 months 13 hours 24 us,[12,8],[Bobby],[[8,9],[9,10]],unstrDateProp1:DATE:1950-01-01,unstrNumericProp:INT64:47,unstrNumericProp2:INT64:20,unstrDateProp2:DATE:1970-01-01,label2:STRING:excellent,unstrIntervalProp:INTERVAL:5 years 700 days 5000 hours
3,Carol,1,false,true,45,5.0,1940-06-22,1911-08-20 02:32:21,48 hours 24 minutes 11 seconds,[4,5],[Carmen,Fred],[[8,10]],unstrNumericProp:INT64:52,unstrDateProp1:DATE:1950-01-01,unstrDateProp2:DATE:1950-01-01,unstrTimeProp1:TIMESTAMP:2008-11-03 13:25:30.000526,unstrInt64Prop:INT64:4541124,unstrBoolProp1:BOOLEAN:False
5,Dan,2,false,true,20,4.8,1950-7-23,2031-11-30 12:25:30Z,10 years 5 months 13 hours 24 us,[1,9],[Wolfeschlegelstein,Daniel],[[7,4],[8,8],[9]],unstrTimestampProp1:TIMESTAMP:2031-11-30 12:25:30,label1:STRING:good,label2:STRING:excellent,label3:STRING:fabulous,unstrDateProp:DATE:2019-02-12,unstrInt64Prop2:INT64:20,unstrBoolProp1:BOOLEAN:False
7,Elizabeth,1,false,true,20,4.7,1980-10-26,1976-12-23 11:21:42,48 hours 24 minutes 11 seconds,[2],[Ein],[[6],[7],[8]],unstrNumericProp:DOUBLE:68,unstrTimestampProp1:TIMESTAMP:1946-08-25 19:07:22,unstrTimestampProp2:TIMESTAMP:2008-11-03 13:25:30.000526,unstrBoolProp1:BOOLEAN:True,datePart:STRING:YEAR
8,Farooq,2,true,false,25,4.5,1980-10-26,1972-07-31 13:22:30.678559,18 minutes 24 milliseconds,[3,4,5,6,7],[Fesdwe],[[8]],unstrTimeProp1:DATE:1982-05-04,label1:STRING:excellent,label2:STRING:excellent,unstrIntervalProp:INTERVAL:300 days 50 hours 1000 microsecond 40 minutes,unstrInt64Prop2:INT64:43
9,Greg,2,false,false,40,4.9,1980-10-26,1976-12-23 11:21:42Z+06:40,10 years 5 months 13 hours 24 us,[1],[Grad],[[10]],unstrTimestampProp1:TIMESTAMP:1962-05-22 13:11:22.562,unstrTimestampProp2:TIMESTAMP:1976-12-23 11:21:42,label1:STRING:good,unstrDateProp:DATE:2020-02-29,unstrInt64Prop:INT64:4412124,datePart:STRING:MONTH
10,Hubert Blaine Wolfeschlegelsteinhausenbergerdorff,2,false,true,83,4.9,1990-11-27,2023-02-21 13:25:30,3 years 2 days 13 hours 2 minutes,[10,11,12,3,4,5,6,7],[Ad,De,Hi,Kye,Orlan],[[7],[10],[6,7]],unstrTimestampProp1:TIMESTAMP:2023-02-21 13:25:30,unstrTimeProp1:TIMESTAMP:1982-05-04 01:02:07,label2:STRING:good,unstrBoolProp1:BOOLEAN:True
0,Alice,1,true,false,35,5.0,1900-01-01,2011-08-20 11:25:30Z+00:00,3 years 2 days 13 hours 2 minutes,[10,5],["Aida"],[[10,8],[6,7,8]]
2,Bob,2,true,false,30,5.1,1900-01-01,2008-11-03 13:25:30.000526-02:00,10 years 5 months 13 hours 24 us,[12,8],[Bobby],[[8,9],[9,10]]
3,Carol,1,false,true,45,5.0,1940-06-22,1911-08-20 02:32:21,48 hours 24 minutes 11 seconds,[4,5],[Carmen,Fred],[[8,10]]
5,Dan,2,false,true,20,4.8,1950-7-23,2031-11-30 12:25:30Z,10 years 5 months 13 hours 24 us,[1,9],[Wolfeschlegelstein,Daniel],[[7,4],[8,8],[9]]
7,Elizabeth,1,false,true,20,4.7,1980-10-26,1976-12-23 11:21:42,48 hours 24 minutes 11 seconds,[2],[Ein],[[6],[7],[8]]
8,Farooq,2,true,false,25,4.5,1980-10-26,1972-07-31 13:22:30.678559,18 minutes 24 milliseconds,[3,4,5,6,7],[Fesdwe],[[8]]
9,Greg,2,false,false,40,4.9,1980-10-26,1976-12-23 11:21:42Z+06:40,10 years 5 months 13 hours 24 us,[1],[Grad],[[10]]
10,Hubert Blaine Wolfeschlegelsteinhausenbergerdorff,2,false,true,83,4.9,1990-11-27,2023-02-21 13:25:30,3 years 2 days 13 hours 2 minutes,[10,11,12,3,4,5,6,7],[Ad,De,Hi,Kye,Orlan],[[7],[10],[6,7]]
13 changes: 0 additions & 13 deletions src/binder/expression_binder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,6 @@ shared_ptr<Expression> ExpressionBinder::implicitCast(
case TIMESTAMP: {
return implicitCastToTimestamp(expression);
}
case UNSTRUCTURED: {
return implicitCastToUnstructured(expression);
}
default:
throw BinderException("Expression " + expression->getRawName() + " has data type " +
Types::dataTypeToString(expression->dataType) + " but expect " +
Expand Down Expand Up @@ -455,16 +452,6 @@ shared_ptr<Expression> ExpressionBinder::implicitCastToTimestamp(
move(execFunc), nullptr /* selectFunc */, uniqueExpressionName);
}

shared_ptr<Expression> ExpressionBinder::implicitCastToUnstructured(
const shared_ptr<Expression>& expression) {
auto children = expression_vector{expression};
auto execFunc = VectorCastOperations::bindImplicitCastToUnstructured(children);
auto uniqueExpressionName =
ScalarFunctionExpression::getUniqueName(IMPLICIT_CAST_TO_UNSTRUCTURED_FUNC_NAME, children);
return make_shared<ScalarFunctionExpression>(FUNCTION, DataType(UNSTRUCTURED), move(children),
move(execFunc), nullptr /* selectFunc */, uniqueExpressionName);
}

void ExpressionBinder::validateExpectedDataType(
const Expression& expression, const unordered_set<DataTypeID>& targets) {
auto dataType = expression.dataType;
Expand Down
2 changes: 0 additions & 2 deletions src/binder/include/expression_binder.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ class ExpressionBinder {
const shared_ptr<Expression>& expression, DataType targetType);
static shared_ptr<Expression> implicitCastToBool(const shared_ptr<Expression>& expression);
static shared_ptr<Expression> implicitCastToInt64(const shared_ptr<Expression>& expression);
static shared_ptr<Expression> implicitCastToUnstructured(
const shared_ptr<Expression>& expression);
static shared_ptr<Expression> implicitCastToString(const shared_ptr<Expression>& expression);
static shared_ptr<Expression> implicitCastToTimestamp(const shared_ptr<Expression>& expression);

Expand Down
16 changes: 3 additions & 13 deletions src/catalog/catalog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ uint64_t SerDeser::serializeValue<NodeTableSchema>(
offset = SerDeser::serializeValue<table_id_t>(value.tableID, fileInfo, offset);
offset = SerDeser::serializeValue<uint64_t>(value.primaryKeyPropertyIdx, fileInfo, offset);
offset = SerDeser::serializeVector<Property>(value.structuredProperties, fileInfo, offset);
offset = SerDeser::serializeVector<Property>(value.unstructuredProperties, fileInfo, offset);
offset = SerDeser::serializeUnorderedSet<table_id_t>(value.fwdRelTableIDSet, fileInfo, offset);
return SerDeser::serializeUnorderedSet<table_id_t>(value.bwdRelTableIDSet, fileInfo, offset);
}
Expand All @@ -143,7 +142,6 @@ uint64_t SerDeser::deserializeValue<NodeTableSchema>(
offset = SerDeser::deserializeValue<table_id_t>(value.tableID, fileInfo, offset);
offset = SerDeser::deserializeValue<uint64_t>(value.primaryKeyPropertyIdx, fileInfo, offset);
offset = SerDeser::deserializeVector<Property>(value.structuredProperties, fileInfo, offset);
offset = SerDeser::deserializeVector<Property>(value.unstructuredProperties, fileInfo, offset);
offset =
SerDeser::deserializeUnorderedSet<table_id_t>(value.fwdRelTableIDSet, fileInfo, offset);
return SerDeser::deserializeUnorderedSet<table_id_t>(value.bwdRelTableIDSet, fileInfo, offset);
Expand Down Expand Up @@ -248,7 +246,7 @@ bool CatalogContent::containNodeProperty(table_id_t tableID, const string& prope
return true;
}
}
return nodeTableSchemas.at(tableID)->unstrPropertiesNameToIdMap.contains(propertyName);
return false;
}

bool CatalogContent::containRelProperty(table_id_t tableID, const string& propertyName) const {
Expand All @@ -267,8 +265,7 @@ const Property& CatalogContent::getNodeProperty(
return property;
}
}
auto unstrPropertyIdx = getUnstrPropertiesNameToIdMap(tableID).at(propertyName);
return getUnstructuredNodeProperties(tableID)[unstrPropertyIdx];
assert(false);
}

const Property& CatalogContent::getRelProperty(
Expand Down Expand Up @@ -339,16 +336,9 @@ void CatalogContent::readFromFile(const string& directory, DBFileType dbFileType
offset = SerDeser::deserializeValue<RelTableSchema>(
*relTableSchemas[tableID], fileInfo.get(), offset);
}
// construct the tableNameToIdMap and table's unstrPropertiesNameToIdMap
// Construct the tableNameToIdMap.
for (auto& nodeTableSchema : nodeTableSchemas) {
nodeTableNameToIDMap[nodeTableSchema.second->tableName] = nodeTableSchema.second->tableID;
for (auto i = 0u; i < nodeTableSchema.second->unstructuredProperties.size(); i++) {
auto& property = nodeTableSchema.second->unstructuredProperties[i];
if (property.dataType.typeID == UNSTRUCTURED) {
nodeTableSchema.second->unstrPropertiesNameToIdMap[property.name] =
property.propertyID;
}
}
}
for (auto& relTableSchema : relTableSchemas) {
relTableNameToIDMap[relTableSchema.second->tableName] = relTableSchema.second->tableID;
Expand Down
19 changes: 0 additions & 19 deletions src/catalog/catalog_structs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,6 @@ string getRelMultiplicityAsString(RelMultiplicity relMultiplicity) {
}
}

void NodeTableSchema::addUnstructuredProperties(vector<string>& unstructuredPropertyNames) {
// TODO(Semih): Uncomment when enabling ad-hoc properties
assert(unstructuredProperties.empty());
for (auto& unstrPropertyName : unstructuredPropertyNames) {
auto unstrPropertyId = unstructuredProperties.size();
unstrPropertiesNameToIdMap[unstrPropertyName] = unstrPropertyId;
Property property = Property::constructUnstructuredNodeProperty(
unstrPropertyName, unstrPropertyId, tableID);
unstructuredProperties.emplace_back(property);
}
}

vector<Property> NodeTableSchema::getAllNodeProperties() const {
auto allProperties = structuredProperties;
allProperties.insert(
allProperties.end(), unstructuredProperties.begin(), unstructuredProperties.end());
return allProperties;
}

unordered_set<table_id_t> RelTableSchema::getAllNodeTableIDs() const {
unordered_set<table_id_t> allNodeTableIDs;
for (auto& [srcTableID, dstTableID] : srcDstTableIDs) {
Expand Down
16 changes: 0 additions & 16 deletions src/catalog/include/catalog.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,9 @@ class CatalogContent {
const Property& getNodePrimaryKeyProperty(table_id_t tableID) const;

vector<Property> getAllNodeProperties(table_id_t tableID) const;
inline const vector<Property>& getUnstructuredNodeProperties(table_id_t tableID) const {
return nodeTableSchemas.at(tableID)->unstructuredProperties;
}
inline const vector<Property>& getRelProperties(table_id_t tableID) const {
return relTableSchemas.at(tableID)->properties;
}
inline const unordered_map<string, uint64_t>& getUnstrPropertiesNameToIdMap(
table_id_t tableID) const {
return nodeTableSchemas.at(tableID)->unstrPropertiesNameToIdMap;
}
inline unordered_map<table_id_t, unique_ptr<NodeTableSchema>>& getNodeTableSchemas() {
return nodeTableSchemas;
}
Expand Down Expand Up @@ -191,15 +184,6 @@ class Catalog {
vector<PropertyNameDataType> structuredPropertyDefinitions,
vector<pair<table_id_t, table_id_t>> srcDstTableIDs);

inline void setUnstructuredPropertiesOfNodeTableSchema(
vector<string>& unstructuredProperties, table_id_t tableID) {
// TODO(Semih): Uncomment when enabling ad-hoc properties
assert(unstructuredProperties.empty());
initCatalogContentForWriteTrxIfNecessary();
catalogContentForWriteTrx->getNodeTableSchema(tableID)->addUnstructuredProperties(
unstructuredProperties);
}

inline void removeTableSchema(TableSchema* tableSchema) {
initCatalogContentForWriteTrxIfNecessary();
catalogContentForWriteTrx->removeTableSchema(tableSchema);
Expand Down
16 changes: 3 additions & 13 deletions src/catalog/include/catalog_structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ enum RelMultiplicity : uint8_t { MANY_MANY, MANY_ONE, ONE_MANY, ONE_ONE };
RelMultiplicity getRelMultiplicityFromString(const string& relMultiplicityString);
string getRelMultiplicityAsString(RelMultiplicity relMultiplicity);

// A PropertyNameDataType consists of its name, id, and dataType. If the property is unstructured,
// then the dataType's typeID is UNSTRUCTURED, otherwise it is one of those supported by the system.
// A PropertyNameDataType consists of its name, id, and dataType.
struct PropertyNameDataType {
// This constructor is needed for ser/deser functions
PropertyNameDataType(){};
Expand All @@ -41,11 +40,6 @@ struct Property : PropertyNameDataType {
// This constructor is needed for ser/deser functions
Property() {}

static Property constructUnstructuredNodeProperty(
string name, uint32_t propertyID, table_id_t tableID) {
return Property(move(name), DataType(UNSTRUCTURED), propertyID, tableID);
}

static Property constructStructuredNodeProperty(
const PropertyNameDataType& nameDataType, uint32_t propertyID, table_id_t tableID) {
return Property(nameDataType.name, nameDataType.dataType, propertyID, tableID);
Expand Down Expand Up @@ -84,26 +78,22 @@ struct NodeTableSchema : TableSchema {
move(structuredProperties)} {}

inline uint64_t getNumStructuredProperties() const { return structuredProperties.size(); }
void addUnstructuredProperties(vector<string>& unstructuredPropertyNames);

inline void addFwdRelTableID(table_id_t tableID) { fwdRelTableIDSet.insert(tableID); }
inline void addBwdRelTableID(table_id_t tableID) { bwdRelTableIDSet.insert(tableID); }

inline Property getPrimaryKey() const { return structuredProperties[primaryKeyPropertyIdx]; }

vector<Property> getAllNodeProperties() const;
inline vector<Property> getAllNodeProperties() const { return structuredProperties; }

// TODO(Semih): When we support updating the schemas, we need to update this or, we need
// a more robust mechanism to keep track of which property is the primary key (e.g., store this
// information with the property). This is an idx, not an ID, so as the columns/properties of
// the table change, the idx can change.
uint64_t primaryKeyPropertyIdx;
vector<Property> structuredProperties, unstructuredProperties;
vector<Property> structuredProperties;
unordered_set<table_id_t> fwdRelTableIDSet; // srcNode->rel
unordered_set<table_id_t> bwdRelTableIDSet; // dstNode->rel
// This map is maintained as a cache for unstructured properties. It is not serialized to the
// catalog file, but is re-constructed when reading from the catalog file.
unordered_map<string, uint64_t> unstrPropertiesNameToIdMap;
};

struct RelTableSchema : TableSchema {
Expand Down
7 changes: 0 additions & 7 deletions src/common/include/configs.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ struct StorageConfig {
static constexpr char CATALOG_FILE_NAME[] = "catalog.bin";
static constexpr char CATALOG_FILE_NAME_FOR_WAL[] = "catalog.bin.wal";
constexpr static double ARRAY_RESIZING_FACTOR = 1.2;

constexpr static uint8_t UNSTR_PROP_KEY_IDX_LEN = 4;
constexpr static uint8_t UNSTR_PROP_DATATYPE_LEN = 1;
constexpr static uint8_t UNSTR_PROP_HEADER_LEN =
UNSTR_PROP_KEY_IDX_LEN + UNSTR_PROP_DATATYPE_LEN;
};

struct ListsMetadataConfig {
Expand All @@ -92,8 +87,6 @@ struct CopyCSVConfig {
// Size (in bytes) of the chunks to be read in InMemNode/RelCSVCopier
static constexpr uint64_t CSV_READING_BLOCK_SIZE = 1 << 23;

static constexpr char UNSTR_PROPERTY_SEPARATOR[] = ":";

// Default configuration for csv file parsing
static constexpr const char* STRING_CSV_PARSING_OPTIONS[5] = {
"ESCAPE", "DELIM", "QUOTE", "LIST_BEGIN", "LIST_END"};
Expand Down
1 change: 0 additions & 1 deletion src/common/include/expression_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ const string IMPLICIT_CAST_TO_INT_FUNC_NAME = "_INT";
const string IMPLICIT_CAST_TO_STRING_FUNC_NAME = "_STRING";
const string IMPLICIT_CAST_TO_DATE_FUNC_NAME = "_DATE";
const string IMPLICIT_CAST_TO_TIMESTAMP_FUNC_NAME = "_TIMESTAMP";
const string IMPLICIT_CAST_TO_UNSTRUCTURED_FUNC_NAME = "_UNSTRUCTURED";

// list
const string LIST_CREATION_FUNC_NAME = "LIST_CREATION";
Expand Down
2 changes: 0 additions & 2 deletions src/common/include/type_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include "src/common/types/include/literal.h"
#include "src/common/types/include/types_include.h"
#include "src/common/types/include/value.h"

namespace kuzu {
namespace common {
Expand All @@ -28,7 +27,6 @@ class TypeUtils {
static inline string toString(const string& val) { return val; }
static string toString(const ku_list_t& val, const DataType& dataType);
static string toString(const Literal& literal);
static string toString(const Value& val);

static inline void encodeOverflowPtr(
uint64_t& overflowPtr, page_idx_t pageIdx, uint16_t pageOffset) {
Expand Down
Loading

0 comments on commit 97b9b8f

Please sign in to comment.