Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change value type to unique ptr #1852

Merged
merged 2 commits into from
Jul 24, 2023
Merged

change value type to unique ptr #1852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ee3e9
change value type to unique ptr
andyfengHKU Jul 24, 2023
74ecce0
Fix Java and Node.js APIs
mewim Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/c_api/value.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ kuzu_value* kuzu_value_get_list_element(kuzu_value* value, uint64_t index) {
uint64_t kuzu_value_get_struct_num_fields(kuzu_value* value) {
auto val = static_cast<Value*>(value->_value);
auto data_type = val->getDataType();
return StructType::getNumFields(&data_type);
return StructType::getNumFields(data_type);
}

char* kuzu_value_get_struct_field_name(kuzu_value* value, uint64_t index) {
auto val = static_cast<Value*>(value->_value);
auto data_type = val->getDataType();
auto struct_field_name = StructType::getFields(&data_type)[index]->getName();
auto struct_field_name = StructType::getFields(data_type)[index]->getName();
auto* c_struct_field_name = (char*)malloc(sizeof(char) * (struct_field_name.size() + 1));
strcpy(c_struct_field_name, struct_field_name.c_str());
return c_struct_field_name;
Expand All @@ -177,7 +177,7 @@ kuzu_value* kuzu_value_get_recursive_rel_rel_list(kuzu_value* value) {

kuzu_logical_type* kuzu_value_get_data_type(kuzu_value* value) {
auto* c_data_type = (kuzu_logical_type*)malloc(sizeof(kuzu_logical_type));
c_data_type->_data_type = new LogicalType(static_cast<Value*>(value->_value)->getDataType());
c_data_type->_data_type = new LogicalType(*static_cast<Value*>(value->_value)->getDataType());
return c_data_type;
}

Expand Down
6 changes: 3 additions & 3 deletions src/common/arrow/arrow_row_batch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
} break;
default: {
throw RuntimeException("Invalid data type " +
LogicalTypeUtils::dataTypeToString(value->dataType) +
LogicalTypeUtils::dataTypeToString(*value->dataType) +

Check warning on line 306 in src/common/arrow/arrow_row_batch.cpp

View check run for this annotation

Codecov / codecov/patch

src/common/arrow/arrow_row_batch.cpp#L306 

Added line #L306 was not covered by tests
" for arrow export.");
}
}
Expand Down Expand Up @@ -335,7 +335,7 @@
}

void ArrowRowBatch::copyNullValue(ArrowVector* vector, Value* value, std::int64_t pos) {
switch (value->dataType.getLogicalTypeID()) {
switch (value->dataType->getLogicalTypeID()) {
case LogicalTypeID::BOOL: {
templateCopyNullValue<LogicalTypeID::BOOL>(vector, pos);
} break;
Expand Down Expand Up @@ -377,7 +377,7 @@
} break;
default: {
throw RuntimeException("Invalid data type " +
LogicalTypeUtils::dataTypeToString(value->dataType) +
LogicalTypeUtils::dataTypeToString(*value->dataType) +

Check warning on line 380 in src/common/arrow/arrow_row_batch.cpp

View check run for this annotation

Codecov / codecov/patch

src/common/arrow/arrow_row_batch.cpp#L380 

Added line #L380 was not covered by tests
" for arrow export.");
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/common/types/types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ LogicalType& LogicalType::operator=(LogicalType&& other) noexcept {
return *this;
}

std::unique_ptr<LogicalType> LogicalType::copy() {
std::unique_ptr<LogicalType> LogicalType::copy() const {
auto dataType = std::make_unique<LogicalType>(typeID);
if (extraTypeInfo != nullptr) {
dataType->extraTypeInfo = extraTypeInfo->copy();
Expand Down