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

[Feature](datatype) Add IPv4/v6 data type for doris #24965

Merged
merged 14 commits into from
Oct 26, 2023
Merged

[Feature](datatype) Add IPv4/v6 data type for doris #24965

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0b5f828
ip crud, stream load and implicit/explicit cast
sjyango Sep 26, 2023
ddd410f
fix ip functions_comparison bug
sjyango Sep 27, 2023
bb19475
upload ip base code, including crud, stream load, cast
sjyango Sep 27, 2023
f5ab18f
add code to nereids
sjyango Oct 16, 2023
050900f
add ipv4/v6 codes for nereids optimizer
sjyango Oct 17, 2023
960c27e
update code for nereids
sjyango Oct 20, 2023
8e0f586
restore be/CMakeLists.txt
sjyango Oct 20, 2023
af9cb70
Prohibition of comparison between IPv4 and IPv6
sjyango Oct 23, 2023
a2810b8
format be codes
sjyango Oct 24, 2023
4733eb5
format be codes
sjyango Oct 24, 2023
ca9ac74
format be codes
sjyango Oct 24, 2023
0b8ae22
resolve conflicts
sjyango Oct 25, 2023
958b020
resolve master conflicts
sjyango Oct 26, 2023
1f9ffcc
format be codes
sjyango Oct 26, 2023
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
Prev Previous commit
Next Next commit
resolve conflicts
  • Loading branch information
@sjyango
sjyango committed Oct 26, 2023
commit 0b8ae229d0c29cf6be8f624b78950395ad235716
2 changes: 1 addition & 1 deletion be/src/olap/types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const TypeInfo* get_scalar_type_info(FieldType field_type) {
get_scalar_type_info<FieldType::OLAP_FIELD_TYPE_AGG_STATE>(),
get_scalar_type_info<FieldType::OLAP_FIELD_TYPE_DECIMAL256>(),
get_scalar_type_info<FieldType::OLAP_FIELD_TYPE_IPV4>(),
get_scalar_type_info<FieldType::OLAP_FIELD_TYPE_IPV6>()
get_scalar_type_info<FieldType::OLAP_FIELD_TYPE_IPV6>(),
nullptr};
return field_type_array[int(field_type)];
}
Expand Down
9 changes: 9 additions & 0 deletions be/src/vec/core/extended_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@ concept is_integer =
std::is_integral_v<T> || std::is_same_v<T, Int256> || std::is_same_v<T, UInt256>;

namespace std {
// uint128_t and UInt128 are not compatible
template <>
struct make_unsigned<doris::vectorized::Int128> {
using type = doris::vectorized::Int128;
};
template <>
struct make_unsigned<doris::vectorized::UInt128> {
using type = doris::uint128_t;
};
template <>
struct make_unsigned<Int256> {
using type = UInt256;
Expand Down