Skip to content

GH-48120: [C++][ODBC] Remove and replace IsComplexType with is_nested #48847

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

Open
AestheticAkhmad wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −14
Open

GH-48120: [C++][ODBC] Remove and replace IsComplexType with is_nested #48847

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions cpp/src/arrow/flight/sql/odbc/odbc_impl/util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "arrow/compute/api.h"
#include "arrow/type.h"
#include "arrow/type_fwd.h"
#include "arrow/type_traits.h"

#include "arrow/flight/sql/odbc/odbc_impl/json_converter.h"

Expand All @@ -37,19 +38,6 @@
namespace arrow::flight::sql::odbc {
namespace util {
namespace {
bool IsComplexType(Type::type type_id) {
switch (type_id) {
case Type::LIST:
case Type::LARGE_LIST:
case Type::FIXED_SIZE_LIST:
case Type::MAP:
case Type::STRUCT:
return true;
default:
return false;
}
}

SqlDataType GetDefaultSqlCharType(bool use_wide_char) {
return use_wide_char ? SqlDataType_WCHAR : SqlDataType_CHAR;
}
Expand Down Expand Up @@ -998,7 +986,7 @@ ArrayConvertTask GetConverter(Type::type original_type_id, CDataType target_type

return finish.ValueOrDie();
};
} else if (IsComplexType(original_type_id) &&
} else if (is_nested(original_type_id) &&
(target_type == CDataType_CHAR || target_type == CDataType_WCHAR)) {
return [=](const std::shared_ptr<Array>& original_array) {
const auto& json_conversion_result = ConvertToJson(original_array);
Expand Down
Loading