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

fix inconsistent result before deleting some rows (#6133) #6140

Merged
merged 3 commits into from
Oct 19, 2022
Merged

fix inconsistent result before deleting some rows (#6133) #6140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1631d84
fix
xzhangxian1008 Oct 14, 2022
2f64e54
tweaking
xzhangxian1008 Oct 14, 2022
8dd119e
tweaking
xzhangxian1008 Oct 14, 2022
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
6 changes: 3 additions & 3 deletions dbms/src/Functions/FunctionsLogical.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ struct NotImpl
{
using ResultType = UInt8;

static inline UInt8 apply(A a)
static inline bool apply(A a)
{
return !a;
}
Expand Down Expand Up @@ -180,7 +180,7 @@ struct AssociativeOperationImpl
{}

/// Returns a combination of values in the i-th row of all columns stored in the constructor.
inline UInt8 apply(size_t i) const
inline bool apply(size_t i) const
{
if (Op::isSaturable())
{
Expand Down Expand Up @@ -224,7 +224,7 @@ struct AssociativeOperationImpl<Op, 1>
: vec(in[in.size() - 1]->getData())
{}

inline UInt8 apply(size_t i) const
inline bool apply(size_t i) const
{
return vec[i];
}
Expand Down
28 changes: 21 additions & 7 deletions dbms/src/Functions/tests/gtest_logical.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,20 @@ try
func_name,
createOnlyNullColumn(2),
createColumn<Nullable<UInt8>>({1, 0})));
// issue 6127
ASSERT_COLUMN_EQ(
createColumn<UInt8>({0, 1, 0, 0}),
executeFunction(
func_name,
createColumn<Int64>({0, 123, 0, 41}),
createColumn<UInt8>({0, 11, 221, 0})));
// issue 6127, position of UInt8 column may affect the result
ASSERT_COLUMN_EQ(
createColumn<UInt8>({0, 1, 0, 0}),
executeFunction(
func_name,
createColumn<UInt8>({0, 123, 0, 41}),
createColumn<Int64>({0, 11, 221, 0})));
}
CATCH

Expand All @@ -59,13 +73,6 @@ try
func_name,
createColumn<Nullable<UInt8>>({0, 1, 0, 1, {}, 0}),
createColumn<Nullable<UInt8>>({0, 1, 1, 0, 1, {}})));
// issue 5849
ASSERT_COLUMN_EQ(
createColumn<UInt8>({0, 1, 1, 1}),
executeFunction(
func_name,
createColumn<UInt8>({0, 123, 0, 41}),
createColumn<Int64>({0, 11, 221, 0})));
// column, const
ASSERT_COLUMN_EQ(
createColumn<Nullable<UInt8>>({1, 1}),
Expand All @@ -87,6 +94,13 @@ try
func_name,
createOnlyNullColumn(2),
createColumn<Nullable<UInt8>>({1, 0})));
// issue 5849
ASSERT_COLUMN_EQ(
createColumn<UInt8>({0, 1, 1, 1}),
executeFunction(
func_name,
createColumn<UInt8>({0, 123, 0, 41}),
createColumn<Int64>({0, 11, 221, 0})));
}
CATCH

Expand Down