Skip to content

[fix](be) Remove unsafe JsonbWriter key overload #63355

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

Merged
HappenLee merged 1 commit into from
May 20, 2026
Merged

[fix](be) Remove unsafe JsonbWriter key overload #63355

Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions be/src/util/jsonb_writer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ class JsonbWriterT {
}
}

bool writeKey(const char* key) { return writeKey(key, strlen(key)); }

// write a key string (or key id if an external dict is provided)
bool writeKey(const char* key, uint8_t len) {
if (!stack_.empty() && verifyKeyState()) {
Expand Down
4 changes: 2 additions & 2 deletions be/test/core/jsonb/convert_field_to_type_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ TEST_F(ConvertFieldToTypeTest, ConvertFieldToType_ToJsonb) {
{
JsonbWriter test_writer;
test_writer.writeStartObject();
test_writer.writeKey("key");
test_writer.writeKey("key", static_cast<uint8_t>(sizeof("key") - 1));
test_writer.writeString("value");
test_writer.writeEndObject();

Expand Down Expand Up @@ -513,4 +513,4 @@ TEST_F(ConvertFieldToTypeTest, ConvertFieldToType_ErrorCases) {
}
}

} // namespace doris
} // namespace doris
37 changes: 19 additions & 18 deletions be/test/core/jsonb/jsonb_document_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "util/jsonb_writer.h"

namespace doris {

class JsonbDocumentTest : public testing::Test {
protected:
void SetUp() override {}
Expand All @@ -40,27 +41,27 @@ TEST_F(JsonbDocumentTest, writer) {
JsonbWriter writer;
writer.writeStartObject();

writer.writeKey("key_null");
writer.writeKey("key_null", static_cast<uint8_t>(sizeof("key_null") - 1));
writer.writeNull();

writer.writeKey("key_true");
writer.writeKey("key_true", static_cast<uint8_t>(sizeof("key_true") - 1));
writer.writeBool(true);

writer.writeKey("key_false");
writer.writeKey("key_false", static_cast<uint8_t>(sizeof("key_false") - 1));
writer.writeBool(false);

writer.writeKey("key_int");
writer.writeKey("key_int", static_cast<uint8_t>(sizeof("key_int") - 1));
writer.writeInt(12345);

writer.writeKey("key_float");
writer.writeKey("key_float", static_cast<uint8_t>(sizeof("key_float") - 1));
writer.writeFloat(123.456);

writer.writeKey("key_string");
writer.writeKey("key_string", static_cast<uint8_t>(sizeof("key_string") - 1));
writer.writeStartString();
writer.writeString("hello world");
writer.writeEndString();

writer.writeKey("key_array");
writer.writeKey("key_array", static_cast<uint8_t>(sizeof("key_array") - 1));

writer.writeStartArray();
writer.writeInt(1);
Expand All @@ -69,24 +70,24 @@ TEST_F(JsonbDocumentTest, writer) {
writer.writeEndString();
writer.writeEndArray();

writer.writeKey("key_int128");
writer.writeKey("key_int128", static_cast<uint8_t>(sizeof("key_int128") - 1));

__int128_t int128_value = __int128_t(std::numeric_limits<uint64_t>::max()) + 1;
writer.writeInt128(int128_value);

writer.writeKey("key_decimal32");
writer.writeKey("key_decimal32", static_cast<uint8_t>(sizeof("key_decimal32") - 1));
Decimal32 decimal_value32(int32_t(99999999));
writer.writeDecimal(decimal_value32, 9, 4);

writer.writeKey("key_decimal64");
writer.writeKey("key_decimal64", static_cast<uint8_t>(sizeof("key_decimal64") - 1));
Decimal64 decimal_value64(int64_t(999999999999999999ULL));
writer.writeDecimal(decimal_value64, 18, 4);

writer.writeKey("key_decimal128");
writer.writeKey("key_decimal128", static_cast<uint8_t>(sizeof("key_decimal128") - 1));
Decimal128V3 decimal_value((__int128_t(std::numeric_limits<uint64_t>::max())));
writer.writeDecimal(decimal_value, 30, 8);

writer.writeKey("key_decimal256");
writer.writeKey("key_decimal256", static_cast<uint8_t>(sizeof("key_decimal256") - 1));
wide::Int256 int256_value(wide::Int256(std::numeric_limits<__int128_t>::max()) * 2);
Decimal256 decimal256_value(int256_value);
writer.writeDecimal(decimal256_value, 40, 8);
Expand Down Expand Up @@ -218,21 +219,21 @@ TEST_F(JsonbDocumentTest, forobject) {
JsonbWriter writer;
writer.writeStartObject();

writer.writeKey("key_null");
writer.writeKey("key_null", static_cast<uint8_t>(sizeof("key_null") - 1));
writer.writeNull();

writer.writeKey("key_true");
writer.writeKey("key_true", static_cast<uint8_t>(sizeof("key_true") - 1));
writer.writeBool(true);

writer.writeKey("key_false");
writer.writeKey("key_false", static_cast<uint8_t>(sizeof("key_false") - 1));
writer.writeBool(false);

writer.writeKey("key_int");
writer.writeKey("key_int", static_cast<uint8_t>(sizeof("key_int") - 1));
writer.writeInt(12345);

// writer array

writer.writeKey("key_array");
writer.writeKey("key_array", static_cast<uint8_t>(sizeof("key_array") - 1));
writer.writeStartArray();
writer.writeInt(1);
writer.writeStartString();
Expand Down Expand Up @@ -294,4 +295,4 @@ TEST_F(JsonbDocumentTest, invaild_jsonb_document) {
EXPECT_EQ(json_null, json_string);
}

} // namespace doris
} // namespace doris
8 changes: 4 additions & 4 deletions be/test/util/jsonb_serialize_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,19 +136,19 @@ TEST_F(JsonbSerializeTest, serialization2) {

writer.writeKey("key_decimal32", 13);

writer.writeKey("key_decimal32");
writer.writeKey("key_decimal32", static_cast<uint8_t>(sizeof("key_decimal32") - 1));
Decimal32 decimal_value32(int32_t(99999999));
writer.writeDecimal(decimal_value32, 9, 4);

writer.writeKey("key_decimal64");
writer.writeKey("key_decimal64", static_cast<uint8_t>(sizeof("key_decimal64") - 1));
Decimal64 decimal_value64(int64_t(999999999999999999ULL));
writer.writeDecimal(decimal_value64, 18, 4);

writer.writeKey("key_decimal128");
writer.writeKey("key_decimal128", static_cast<uint8_t>(sizeof("key_decimal128") - 1));
Decimal128V3 decimal_value((__int128_t(std::numeric_limits<uint64_t>::max())));
writer.writeDecimal(decimal_value, 27, 8);

writer.writeKey("key_decimal256");
writer.writeKey("key_decimal256", static_cast<uint8_t>(sizeof("key_decimal256") - 1));
Decimal256 decimal256_value((wide::Int256(std::numeric_limits<__int128_t>::max()) * 2));
writer.writeDecimal(decimal256_value, 40, 8);

Expand Down
Loading