Skip to content

Compare InsertData rows against both datasets regardless of block boundaries #576

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
Hakaou wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −23
Open

Compare InsertData rows against both datasets regardless of block boundaries #576

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
38 changes: 15 additions & 23 deletions ut/client_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,22 +552,20 @@ TEST_P(ClientCase, InsertData) {
client_->Execute(
"CREATE TEMPORARY TABLE IF NOT EXISTS test_clickhouse_cpp_insert (id UInt64, name String, f Bool)");

const struct {
struct Row {
uint64_t id;
std::string name;
bool f;
} TEST_DATA[] = {
};

const std::vector<Row> TEST_DATA = {
{ 1, "id", true },
{ 3, "foo", false },
{ 5, "bar", true },
{ 7, "name", false },
};

const struct {
uint64_t id;
std::string name;
bool f;
} TEST_DATA2[] = {
const std::vector<Row> TEST_DATA2 = {
{ 2, "holden", true },
{ 4, "naomi", false },
{ 6, "amos", true },
Expand Down Expand Up @@ -610,33 +608,27 @@ TEST_P(ClientCase, InsertData) {
}

/// Select values inserted in the previous steps.
std::vector<Row> expected_rows(TEST_DATA);
expected_rows.insert(expected_rows.end(), TEST_DATA2.begin(), TEST_DATA2.end());

size_t row = 0;
client_->Select("SELECT id, name, f FROM test_clickhouse_cpp_insert", [TEST_DATA, TEST_DATA2, &row](const Block& block)
client_->Select("SELECT id, name, f FROM test_clickhouse_cpp_insert", [&expected_rows, &row](const Block& block)
{
if (block.GetRowCount() == 0) {
return;
}
EXPECT_EQ("id", block.GetColumnName(0));
EXPECT_EQ("name", block.GetColumnName(1));
size_t block_two_row_num = sizeof(TEST_DATA)/sizeof(TEST_DATA[0]);

if (row < block_two_row_num) {
for (size_t c = 0; c < block.GetRowCount(); ++c, ++row) {
EXPECT_EQ(TEST_DATA[row].id, (*block[0]->As<ColumnUInt64>())[c]);
EXPECT_EQ(TEST_DATA[row].name, (*block[1]->As<ColumnString>())[c]);
EXPECT_EQ(MakeClientBoolValue(TEST_DATA[row].f), (*block[2]->As<ClientBoolColumn>())[c]);
}
} else {
for (size_t c = 0; c < block.GetRowCount(); ++c, ++row) {
EXPECT_EQ(TEST_DATA2[row-block_two_row_num].id, (*block[0]->As<ColumnUInt64>())[c]);
EXPECT_EQ(TEST_DATA2[row-block_two_row_num].name, (*block[1]->As<ColumnString>())[c]);
EXPECT_EQ(MakeClientBoolValue(TEST_DATA2[row-block_two_row_num].f), (*block[2]->As<ClientBoolColumn>())[c]);
}
for (size_t c = 0; c < block.GetRowCount(); ++c, ++row) {
ASSERT_LT(row, expected_rows.size());
EXPECT_EQ(expected_rows[row].id, (*block[0]->As<ColumnUInt64>())[c]);
EXPECT_EQ(expected_rows[row].name, (*block[1]->As<ColumnString>())[c]);
EXPECT_EQ(MakeClientBoolValue(expected_rows[row].f), (*block[2]->As<ClientBoolColumn>())[c]);
}
}
);
auto exp = sizeof(TEST_DATA)/sizeof(TEST_DATA[0]) + sizeof(TEST_DATA2)/sizeof(TEST_DATA2[0]);
EXPECT_EQ(exp, row);
EXPECT_EQ(expected_rows.size(), row);
}

TEST_P(ClientCase, BeginInsertDoesNotAllowCallbacks) {
Expand Down