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

兼容性提升 #238

Merged
merged 17 commits into from
Apr 19, 2024
Merged

兼容性提升 #238

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0be9901
feat: support datetime(n)
cyz-2023 Feb 26, 2024
56a18d0
feat: support find_in_set
cyz-2023 Jan 3, 2024
655da10
feat: field hit range weight
cyz-2023 Jan 23, 2024
2bd9b96
feat: 兼容mysql索引语法
cyz-2023 Jan 24, 2024
3ebf41e
feat: 补齐时间类函数
cyz-2023 Jan 25, 2024
6194da4
feat: 兼容mysql建表语法
cyz-2023 Feb 2, 2024
6d25ee7
feat: add FLAGS_max_select_region_count for select sql
cyz-2023 Feb 4, 2024
f8ab44a
feat: support change column
cyz-2023 Feb 5, 2024
eea78fe
feat: default charset utf8
wy1433 Jan 29, 2024
5f4572d
feat: support multiple alter_specifications for add column
wy1433 Feb 7, 2024
ab4618c
feat: store请求部分错误码不重试
cyz-2023 Feb 21, 2024
294d054
feat: index.short_name保留大小写
cyz-2023 Feb 22, 2024
cd28db2
feat: support drop index name on table
cyz-2023 Feb 23, 2024
0874a84
feat: 补齐字符串类函数
cyz-2023 Jan 25, 2024
27fa6c5
fix: for code review
wy1433 Apr 19, 2024
7860631
fix: for code review
wy1433 Apr 19, 2024
96938ac
fix: for code review
wy1433 Apr 19, 2024
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: 1 addition & 1 deletion include/common/datetime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ extern time_t str_to_timestamp(const char* str_time);

// encode DATETIME to string format
// ref: https://dev.mysql.com/doc/internals/en/date-and-time-data-type-representation.html
extern std::string datetime_to_str(uint64_t datetime);
extern std::string datetime_to_str(uint64_t datetime, int precision_len = 0);
extern uint64_t str_to_datetime(const char* str_time, bool* is_full_datetime = nullptr);

extern time_t datetime_to_timestamp(uint64_t datetime);
Expand Down
44 changes: 36 additions & 8 deletions include/common/expr_value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace baikaldb {

struct ExprValue {
pb::PrimitiveType type;
int32_t float_precision_len;
int32_t float_precision_len = -1; // -1代表未定义精度，保留原值的最大精度。0代表不保留小数点部分
union {
bool bool_val;
int8_t int8_val;
Expand All @@ -50,7 +50,7 @@ struct ExprValue {

explicit ExprValue(pb::PrimitiveType type_ = pb::NULL_TYPE) : type(type_) {
_u.int64_val = 0;
float_precision_len = 0;
float_precision_len = -1;
if (type_ == pb::BITMAP) {
_u.bitmap = new(std::nothrow) Roaring();
} else if (type_ == pb::TDIGEST) {
Expand Down Expand Up @@ -124,7 +124,7 @@ struct ExprValue {
}
explicit ExprValue(const pb::ExprValue& value) {
type = value.type();
float_precision_len = 0;
float_precision_len = -1;
switch (type) {
case pb::BOOL:
_u.bool_val = value.bool_val();
Expand Down Expand Up @@ -187,7 +187,7 @@ struct ExprValue {

explicit ExprValue(pb::PrimitiveType primitive_type, const std::string& value_str) {
type = pb::STRING;
float_precision_len = 0;
float_precision_len = -1;
str_val = value_str;
if (primitive_type == pb::STRING
|| primitive_type == pb::HEX
Expand Down Expand Up @@ -624,7 +624,7 @@ struct ExprValue {
case pb::TDIGEST:
return str_val;
case pb::DATETIME:
return datetime_to_str(_u.uint64_val);
return datetime_to_str(_u.uint64_val, float_precision_len);
case pb::TIME:
return time_to_str(_u.int32_val);
case pb::TIMESTAMP:
Expand Down Expand Up @@ -860,14 +860,18 @@ struct ExprValue {
return ret;
}
// 默认不带us
static ExprValue Now(int precision = 0) {
static ExprValue Now(int32_t precision = 0) {
ExprValue tmp(pb::TIMESTAMP);
tmp._u.uint32_val = time(NULL);
tmp.cast_to(pb::DATETIME);
if (precision == 6) {

if (precision > 0 and precision <= 6) {
timeval tv;
gettimeofday(&tv, NULL);
tmp._u.uint64_val |= tv.tv_usec;
tmp.set_precision_len(precision);
} else {
tmp.set_precision_len(0);
}
return tmp;
}
Expand All @@ -883,7 +887,7 @@ struct ExprValue {
ExprValue ret(pb::UINT64);
return ret;
}
static ExprValue UTC_TIMESTAMP() {
static ExprValue UTC_TIMESTAMP(int32_t precision = 0) {
// static int UTC_OFFSET = 8 * 60 * 60;
time_t current_time;
struct tm timeinfo;
Expand All @@ -896,6 +900,11 @@ struct ExprValue {
timeval tv;
gettimeofday(&tv, NULL);
tmp._u.uint64_val |= tv.tv_usec;
if (precision >=0 && precision <= 6) {
tmp.set_precision_len(precision);
} else {
tmp.set_precision_len(0);
}
return tmp;
}
// For string, end-self
Expand Down Expand Up @@ -924,6 +933,25 @@ struct ExprValue {
return ev._u.uint64_val;
}
};

void dt_cast_len() {
if (float_precision_len >= 0 and float_precision_len <= 6) {
uint64_t carry = std::pow(10, (6 - float_precision_len));
uint64_t oldmic = _u.uint64_val & 0xffffff;
uint64_t newmic = ::round(oldmic / carry) * carry;
_u.uint64_val = (_u.uint64_val & ~0xffffff) | newmic;
}
}

void set_precision_len(int32_t precision) {
if (float_precision_len == precision) {
return;
}
float_precision_len = precision;
if (type == pb::DATETIME) {
dt_cast_len();
}
}
};

using ExprValueFlatSet = butil::FlatSet<ExprValue, ExprValue::HashFunction>;
Expand Down
12 changes: 11 additions & 1 deletion include/common/type_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,8 @@ inline std::string to_mysql_type_string(pb::PrimitiveType type) {
}
}

inline std::string to_mysql_type_full_string(pb::PrimitiveType type) {
inline std::string to_mysql_type_full_string(pb::PrimitiveType type,
int32_t float_total_len = -1, int32_t float_precision_len = -1) {
switch (type) {
case pb::BOOL:
return "tinyint(3)";
Expand All @@ -413,12 +414,21 @@ inline std::string to_mysql_type_full_string(pb::PrimitiveType type) {
case pb::UINT64:
return "bigint(21) unsigned";
case pb::FLOAT:
if (float_total_len != -1 && float_precision_len != -1) {
return "float(" + std::to_string(float_total_len) + "," + std::to_string(float_precision_len) + ")";
}
return "float";
case pb::DOUBLE:
if (float_total_len != -1 && float_precision_len != -1) {
return "double(" + std::to_string(float_total_len) + "," + std::to_string(float_precision_len) + ")";
}
return "double";
case pb::STRING:
return "varchar(1024)";
case pb::DATETIME:
if (float_precision_len > 0 && float_precision_len <= 6) {
return "datetime(" + std::to_string(float_precision_len) + ")";
}
return "datetime";
case pb::DATE:
return "date";
Expand Down
13 changes: 13 additions & 0 deletions include/expr/internal_functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,22 @@ ExprValue unix_timestamp(const std::vector<ExprValue>& input);
ExprValue from_unixtime(const std::vector<ExprValue>& input);
ExprValue now(const std::vector<ExprValue>& input);
ExprValue utc_timestamp(const std::vector<ExprValue>& input);
ExprValue utc_date(const std::vector<ExprValue>& input);
ExprValue utc_time(const std::vector<ExprValue>& input);
ExprValue minute(const std::vector<ExprValue>& input);
ExprValue second(const std::vector<ExprValue>& input);
ExprValue microsecond(const std::vector<ExprValue>& input);
ExprValue func_time(const std::vector<ExprValue>& input);
ExprValue func_quarter(const std::vector<ExprValue>& input);
ExprValue period_diff(const std::vector<ExprValue>& input);
ExprValue period_add(const std::vector<ExprValue>& input);
ExprValue date_format(const std::vector<ExprValue>& input);
ExprValue str_to_date(const std::vector<ExprValue>& input);
ExprValue time_format(const std::vector<ExprValue>& input);
ExprValue convert_tz(const std::vector<ExprValue>& input);
ExprValue timediff(const std::vector<ExprValue>& input);
ExprValue timestampdiff(const std::vector<ExprValue>& input);
ExprValue timestampadd(const std::vector<ExprValue>& input);
ExprValue curdate(const std::vector<ExprValue>& input);
ExprValue current_date(const std::vector<ExprValue>& input);
ExprValue curtime(const std::vector<ExprValue>& input);
Expand Down Expand Up @@ -106,6 +116,8 @@ ExprValue weekday(const std::vector<ExprValue>& input);
ExprValue extract(const std::vector<ExprValue>& input);
ExprValue tso_to_timestamp(const std::vector<ExprValue>& input);
ExprValue timestamp_to_tso(const std::vector<ExprValue>& input);
ExprValue to_days(const std::vector<ExprValue>& input);
ExprValue to_seconds(const std::vector<ExprValue>& input);
// hll functions
ExprValue hll_add(const std::vector<ExprValue>& input);
ExprValue hll_merge(const std::vector<ExprValue>& input);
Expand Down Expand Up @@ -161,6 +173,7 @@ ExprValue tdigest_location(const std::vector<ExprValue>& input);
// other
ExprValue version(const std::vector<ExprValue>& input);
ExprValue last_insert_id(const std::vector<ExprValue>& input);
ExprValue find_in_set(const std::vector<ExprValue>& input);
//transfer (latitude A, longitude A), (latitude B, longitude B) to distance of A to B (m)
ExprValue point_distance(const std::vector<ExprValue>& input);
ExprValue cast_to_date(const std::vector<ExprValue>& inpt);
Expand Down
3 changes: 2 additions & 1 deletion include/logical_plan/ddl_planner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class DDLPlanner : public LogicalPlanner {
int parse_alter_table(pb::MetaManagerRequest& alter_request);
int check_partition_key_constraint(pb::SchemaInfo& table, const std::string& field_name);

int add_column_def(pb::SchemaInfo& table, parser::ColumnDef* column, bool is_unique_indicator);
int add_column_def(pb::SchemaInfo& table, parser::ColumnDef* column,
bool is_unique_indicator, const std::string& old_field_name = "");
int parse_create_namespace(pb::NameSpaceInfo& namespace_info);
int parse_drop_namespace(pb::NameSpaceInfo& namespace_info);
int parse_alter_namespace(pb::NameSpaceInfo& namespace_info);
Expand Down
9 changes: 8 additions & 1 deletion include/meta_server/table_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,8 +980,15 @@ class TableManager {
return false;
}

bool check_field_is_compatible_type(pb::PrimitiveType src_type, pb::PrimitiveType target_type) {
bool check_field_is_compatible_type(const pb::FieldInfo& src_field, const pb::FieldInfo& target_field) {
auto src_type = src_field.mysql_type();
auto target_type = target_field.mysql_type();
if (src_type == target_type) {
if (src_type == pb::DATETIME || src_type == pb::FLOAT || src_type == pb::DOUBLE) {
if (src_field.float_precision_len() > target_field.float_precision_len()) {
wy1433 marked this conversation as resolved.
Show resolved Hide resolved
return false;
}
}
return true;
}
switch (src_type) {
Expand Down
1 change: 1 addition & 0 deletions include/sqlparser/ddl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ enum AlterSpecType : unsigned char {
ALTER_SPEC_ADD_LEARNER,
ALTER_SPEC_DROP_LEARNER,
ALTER_SPEC_MODIFY_COLUMN,
ALTER_SPEC_CHANGE_COLUMN,
ALTER_SPEC_SWAP_TABLE,

ALTER_SPEC_ADD_PARTITION,
Expand Down
14 changes: 12 additions & 2 deletions include/sqlparser/sql_lex.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@ UPDATE { return UPDATE; }
USAGE { return USAGE; }
USE { return USE; }
USING { return USING; }
UTC_DATE { return UTC_DATE; }
UTC_TIME { return UTC_TIME; }
VALUES { return VALUES; }
LONG { return LONG; }
VARCHAR { return VARCHAR; }
Expand Down Expand Up @@ -276,6 +274,7 @@ EXECUTE { un_reserved_keyword(yylval, yyscanner, parser); return EXECUTE; }
FIELDS { un_reserved_keyword(yylval, yyscanner, parser); return FIELDS; }
FILE { un_reserved_keyword(yylval, yyscanner, parser); return FILE_T; }
FIRST { un_reserved_keyword(yylval, yyscanner, parser); return FIRST; }
LAST { un_reserved_keyword(yylval, yyscanner, parser); return LAST; }
FIXED { un_reserved_keyword(yylval, yyscanner, parser); return FIXED; }
FLUSH { un_reserved_keyword(yylval, yyscanner, parser); return FLUSH; }
FORMAT { un_reserved_keyword(yylval, yyscanner, parser); return FORMAT; }
Expand Down Expand Up @@ -307,6 +306,12 @@ MAX_UPDATES_PER_HOUR { un_reserved_keyword(yylval, yyscanner, parser); return MA
MAX_USER_CONNECTIONS { un_reserved_keyword(yylval, yyscanner, parser); return MAX_USER_CONNECTIONS; }
MERGE { un_reserved_keyword(yylval, yyscanner, parser); return MERGE; }
MIN_ROWS { un_reserved_keyword(yylval, yyscanner, parser); return MIN_ROWS; }
ENCRYPTION { un_reserved_keyword(yylval, yyscanner, parser); return ENCRYPTION; }
ENGINE_ATTRIBUTE { un_reserved_keyword(yylval, yyscanner, parser); return ENGINE_ATTRIBUTE; }
SECONDARY_ENGINE_ATTRIBUTE {un_reserved_keyword(yylval, yyscanner, parser);
return SECONDARY_ENGINE_ATTRIBUTE; }
INSERT_METHOD { un_reserved_keyword(yylval, yyscanner, parser); return INSERT_METHOD; }
AUTOEXTEND_SIZE { un_reserved_keyword(yylval, yyscanner, parser); return AUTOEXTEND_SIZE; }
NAMES { un_reserved_keyword(yylval, yyscanner, parser); return NAMES; }
NATIONAL { un_reserved_keyword(yylval, yyscanner, parser); return NATIONAL; }
NO { un_reserved_keyword(yylval, yyscanner, parser); return NO; }
Expand Down Expand Up @@ -338,13 +343,17 @@ ROUTINE { un_reserved_keyword(yylval, yyscanner, parser); return ROUTINE; }
ROW { un_reserved_keyword(yylval, yyscanner, parser); return ROW; }
ROW_COUNT { un_reserved_keyword(yylval, yyscanner, parser); return ROW_COUNT; }
ROW_FORMAT { un_reserved_keyword(yylval, yyscanner, parser); return ROW_FORMAT; }
STATS_AUTO_RECALC { un_reserved_keyword(yylval, yyscanner, parser); return STATS_AUTO_RECALC; }
SECOND { un_reserved_keyword(yylval, yyscanner, parser); return SECOND; }
SECURITY { un_reserved_keyword(yylval, yyscanner, parser); return SECURITY; }
SEPARATOR { un_reserved_keyword(yylval, yyscanner, parser); return SEPARATOR; }
SERIALIZABLE { un_reserved_keyword(yylval, yyscanner, parser); return SERIALIZABLE; }
SESSION { un_reserved_keyword(yylval, yyscanner, parser); return SESSION; }
SHARE { un_reserved_keyword(yylval, yyscanner, parser); return SHARE; }
SHARED { un_reserved_keyword(yylval, yyscanner, parser); return SHARED; }
INPLACE { un_reserved_keyword(yylval, yyscanner, parser); return INPLACE; }
INSTANT { un_reserved_keyword(yylval, yyscanner, parser); return INSTANT; }
COPY { un_reserved_keyword(yylval, yyscanner, parser); return COPY; }
SHUTDOWN { un_reserved_keyword(yylval, yyscanner, parser); return SHUTDOWN; }
SIGNED { un_reserved_keyword(yylval, yyscanner, parser); return SIGNED; }
SLAVE { un_reserved_keyword(yylval, yyscanner, parser); return SLAVE; }
Expand All @@ -353,6 +362,7 @@ SQL_CACHE { un_reserved_keyword(yylval, yyscanner, parser); return SQL_CACHE; }
SQL_NO_CACHE { un_reserved_keyword(yylval, yyscanner, parser); return SQL_NO_CACHE; }
START { un_reserved_keyword(yylval, yyscanner, parser); return START; }
STATS_PERSISTENT { un_reserved_keyword(yylval, yyscanner, parser); return STATS_PERSISTENT; }
STATS_SAMPLE_PAGES { un_reserved_keyword(yylval, yyscanner, parser); return STATS_SAMPLE_PAGES; }
STATUS { un_reserved_keyword(yylval, yyscanner, parser); return STATUS; }
SUPER { un_reserved_keyword(yylval, yyscanner, parser); return SUPER; }
SOME { un_reserved_keyword(yylval, yyscanner, parser); return SOME; }
Expand Down
Loading
Loading