morningman commented on code in PR #13778:
URL: https://github.com/apache/doris/pull/13778#discussion_r1014761169
##########
be/src/vec/functions/function_jsonb.cpp:
##########
@@ -405,13 +404,13 @@ struct JsonbExtractStringImpl {
if constexpr (std::is_same_v<DataTypeJsonb, ReturnType>) {
writer->reset();
writer->writeValue(value);
- // StringOP::push_value_string(
- // std::string_view(writer->getOutput()->getBuffer(),
writer->getOutput()->getSize()),
- // i, res_data, res_offsets);
- res_data.insert(writer->getOutput()->getBuffer(),
- writer->getOutput()->getBuffer() +
writer->getOutput()->getSize());
- res_data.push_back('\0');
- res_offsets[i] = res_data.size();
+
StringOP::push_value_string(std::string_view(writer->getOutput()->getBuffer(),
+
writer->getOutput()->getSize()),
+ i, res_data, res_offsets);
+ // res_data.insert(writer->getOutput()->getBuffer(),
Review Comment:
Remove unused code?
Or add some comment if you want to use it later.
##########
be/src/vec/sink/vmysql_result_writer.cpp:
##########
@@ -110,14 +110,8 @@ Status VMysqlResultWriter::_add_one_column(const
ColumnPtr& column_ptr,
}
if constexpr (type == TYPE_JSONB) {
const auto json_val = column->get_data_at(i);
- if (json_val.data == nullptr) {
- if (json_val.size == 0) {
- // 0x01 is a magic num, not useful actually, just for
present ""
- char* tmp_val = reinterpret_cast<char*>(0x01);
- buf_ret = _buffer.push_string(tmp_val, json_val.size);
- } else {
- buf_ret = _buffer.push_null();
- }
+ if (json_val.data == nullptr || json_val.size == 0) {
Review Comment:
Do we need to distinguish "null" and "empty string"?
##########
be/src/vec/data_types/data_type_jsonb.cpp:
##########
@@ -30,51 +29,36 @@
namespace doris::vectorized {
-template <typename Reader>
-static inline void read(IColumn& column, Reader&& reader) {
- ColumnJsonb& column_json = assert_cast<ColumnJsonb&>(column);
- ColumnJsonb::Chars& data = column_json.get_chars();
- ColumnJsonb::Offsets& offsets = column_json.get_offsets();
- size_t old_chars_size = data.size();
- size_t old_offsets_size = offsets.size();
- try {
- reader(data);
- data.push_back(0);
- offsets.push_back(data.size());
- } catch (...) {
- offsets.resize_assume_reserved(old_offsets_size);
- data.resize_assume_reserved(old_chars_size);
- throw;
- }
-}
-
std::string DataTypeJsonb::to_string(const IColumn& column, size_t row_num)
const {
const StringRef& s =
- reinterpret_cast<const
ColumnJsonb&>(*column.convert_to_full_column_if_const().get())
+ reinterpret_cast<const
ColumnString&>(*column.convert_to_full_column_if_const().get())
.get_data_at(row_num);
- return JsonbToJson::jsonb_to_json_string(s.data, s.size);
+ return s.size > 0 ? JsonbToJson::jsonb_to_json_string(s.data, s.size) : "";
Review Comment:
is `s.size == 0` a special value to indicate something?
If not, i suggest to move this logic inside the
`JsonbToJson::jsonb_to_json_string()`, or it is very error-prone.
##########
fe/fe-core/src/main/jflex/sql_scanner.flex:
##########
@@ -270,7 +270,7 @@ import org.apache.doris.qe.SqlModeHelper;
keywordMap.put("isolation", new
Integer(SqlParserSymbols.KW_ISOLATION));
keywordMap.put("job", new Integer(SqlParserSymbols.KW_JOB));
keywordMap.put("join", new Integer(SqlParserSymbols.KW_JOIN));
- keywordMap.put("json", new Integer(SqlParserSymbols.KW_JSON));
+ keywordMap.put("jsonb", new Integer(SqlParserSymbols.KW_JSONB));
Review Comment:
why changing `json` to `jsonb`?
I think `jsonb` is an internal implementation, so for user interface, it is
better be "json"?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
