MXS-2020 Replace ss[_info]_dassert with mxb_assert[_message]
This commit is contained in:
@ -100,7 +100,7 @@ Avro* Avro::create(SERVICE* service, SRowEventHandler handler)
|
||||
if (param)
|
||||
{
|
||||
SERVICE *source = service_find(param->value);
|
||||
ss_dassert(source);
|
||||
mxb_assert(source);
|
||||
|
||||
if (source)
|
||||
{
|
||||
|
@ -385,15 +385,15 @@ static int send_row(DCB *dcb, json_t* row)
|
||||
void AvroSession::set_current_gtid(json_t *row)
|
||||
{
|
||||
json_t *obj = json_object_get(row, avro_sequence);
|
||||
ss_dassert(json_is_integer(obj));
|
||||
mxb_assert(json_is_integer(obj));
|
||||
gtid.seq = json_integer_value(obj);
|
||||
|
||||
obj = json_object_get(row, avro_server_id);
|
||||
ss_dassert(json_is_integer(obj));
|
||||
mxb_assert(json_is_integer(obj));
|
||||
gtid.server_id = json_integer_value(obj);
|
||||
|
||||
obj = json_object_get(row, avro_domain);
|
||||
ss_dassert(json_is_integer(obj));
|
||||
mxb_assert(json_is_integer(obj));
|
||||
gtid.domain = json_integer_value(obj);
|
||||
}
|
||||
|
||||
@ -477,20 +477,20 @@ bool AvroSession::seek_to_gtid()
|
||||
while ((row = maxavro_record_read_json(file_handle)))
|
||||
{
|
||||
json_t *obj = json_object_get(row, avro_sequence);
|
||||
ss_dassert(json_is_integer(obj));
|
||||
mxb_assert(json_is_integer(obj));
|
||||
uint64_t value = json_integer_value(obj);
|
||||
|
||||
/** If a larger GTID is found, use that */
|
||||
if (value >= gtid.seq)
|
||||
{
|
||||
obj = json_object_get(row, avro_server_id);
|
||||
ss_dassert(json_is_integer(obj));
|
||||
mxb_assert(json_is_integer(obj));
|
||||
value = json_integer_value(obj);
|
||||
|
||||
if (value == gtid.server_id)
|
||||
{
|
||||
obj = json_object_get(row, avro_domain);
|
||||
ss_dassert(json_is_integer(obj));
|
||||
mxb_assert(json_is_integer(obj));
|
||||
value = json_integer_value(obj);
|
||||
|
||||
if (value == gtid.domain)
|
||||
@ -630,7 +630,7 @@ GWBUF* read_avro_binary_schema(std::string avrofile, std::string dir)
|
||||
void AvroSession::rotate_avro_file(std::string fullname)
|
||||
{
|
||||
auto pos = fullname.find_last_of('/');
|
||||
ss_dassert(pos != std::string::npos);
|
||||
mxb_assert(pos != std::string::npos);
|
||||
avro_binfile = fullname.substr(pos + 1);
|
||||
last_sent_pos = 0;
|
||||
|
||||
@ -659,7 +659,7 @@ static std::string get_next_filename(std::string file, std::string dir)
|
||||
// Find the last and second to last dot
|
||||
auto last = file.find_last_of('.');
|
||||
auto almost_last = file.find_last_of('.', last);
|
||||
ss_dassert(last != std::string::npos && almost_last != std::string::npos);
|
||||
mxb_assert(last != std::string::npos && almost_last != std::string::npos);
|
||||
|
||||
// Extract the number between the dots
|
||||
std::string number_part = file.substr(almost_last + 1, last);
|
||||
|
@ -140,7 +140,7 @@ char* json_new_schema_from_table(const STableMapEvent& map, const STableCreateEv
|
||||
MXS_ERROR("Version mismatch for table %s.%s. Table map version is %d and "
|
||||
"the table definition version is %d.", map->database.c_str(),
|
||||
map->table.c_str(), map->version, create->version);
|
||||
ss_dassert(!true); // Should not happen
|
||||
mxb_assert(!true); // Should not happen
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -226,7 +226,7 @@ static const char* codec_to_string(enum mxs_avro_codec_type type)
|
||||
case MXS_AVRO_CODEC_SNAPPY:
|
||||
return "snappy";
|
||||
default:
|
||||
ss_dassert(false);
|
||||
mxb_assert(false);
|
||||
return "null";
|
||||
}
|
||||
}
|
||||
@ -388,5 +388,5 @@ void AvroConverter::set_active(int i)
|
||||
{
|
||||
MXB_AT_DEBUG(int rc =)avro_value_get_by_name(&m_record, m_create->columns[i].name.c_str(),
|
||||
&m_field, NULL);
|
||||
ss_dassert(rc == 0);
|
||||
mxb_assert(rc == 0);
|
||||
}
|
||||
|
@ -152,7 +152,7 @@ static int conv_state_handler(void* data, const char* section, const char* key,
|
||||
{
|
||||
gtid_pos_t gtid;
|
||||
MXB_AT_DEBUG(bool rval = )gtid.parse(value);
|
||||
ss_dassert(rval);
|
||||
mxb_assert(rval);
|
||||
router->handler.set_gtid(gtid);
|
||||
}
|
||||
else if (strcmp(key, "position") == 0)
|
||||
@ -461,7 +461,7 @@ avro_binlog_end_t avro_read_all_events(Avro *router)
|
||||
std::string next_binlog;
|
||||
bool rotate_seen = false;
|
||||
|
||||
ss_dassert(router->binlog_fd != -1);
|
||||
mxb_assert(router->binlog_fd != -1);
|
||||
|
||||
while (!service_should_stop)
|
||||
{
|
||||
@ -573,17 +573,17 @@ void avro_load_metadata_from_schemas(Avro *router)
|
||||
for (int i = files.gl_pathc - 1; i > -1; i--)
|
||||
{
|
||||
char *dbstart = strrchr(files.gl_pathv[i], '/');
|
||||
ss_dassert(dbstart);
|
||||
mxb_assert(dbstart);
|
||||
dbstart++;
|
||||
|
||||
char *tablestart = strchr(dbstart, '.');
|
||||
ss_dassert(tablestart);
|
||||
mxb_assert(tablestart);
|
||||
|
||||
snprintf(db, sizeof(db), "%.*s", (int)(tablestart - dbstart), dbstart);
|
||||
tablestart++;
|
||||
|
||||
char *versionstart = strchr(tablestart, '.');
|
||||
ss_dassert(versionstart);
|
||||
mxb_assert(versionstart);
|
||||
|
||||
snprintf(table, sizeof(table), "%.*s", (int)(versionstart - tablestart), tablestart);
|
||||
versionstart++;
|
||||
|
@ -216,7 +216,7 @@ static void
|
||||
clientReply(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session, GWBUF *queue, DCB *backend_dcb)
|
||||
{
|
||||
/** We should never end up here */
|
||||
ss_dassert(false);
|
||||
mxb_assert(false);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -239,7 +239,7 @@ errorReply(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session, GWBUF *mess
|
||||
bool *succp)
|
||||
{
|
||||
/** We should never end up here */
|
||||
ss_dassert(false);
|
||||
mxb_assert(false);
|
||||
}
|
||||
|
||||
static uint64_t getCapabilities(MXS_ROUTER* instance)
|
||||
|
@ -243,12 +243,12 @@ uint8_t* process_row_event_data(STableMapEvent map, STableCreateEvent create,
|
||||
|
||||
/** BIT type values use the extra bits in the row event header */
|
||||
int extra_bits = (((ncolumns + 7) / 8) * 8) - ncolumns;
|
||||
ss_dassert(ptr < end);
|
||||
mxb_assert(ptr < end);
|
||||
|
||||
/** Store the null value bitmap */
|
||||
uint8_t *null_bitmap = ptr;
|
||||
ptr += (ncolumns + 7) / 8;
|
||||
ss_dassert(ptr < end || (bit_is_set(null_bitmap, ncolumns, 0)));
|
||||
mxb_assert(ptr < end || (bit_is_set(null_bitmap, ncolumns, 0)));
|
||||
|
||||
char trace[ncolumns][768];
|
||||
memset(trace, 0, sizeof(trace));
|
||||
@ -405,7 +405,7 @@ uint8_t* process_row_event_data(STableMapEvent map, STableCreateEvent create,
|
||||
sprintf(trace[i], "[%ld] %s", i, column_type_to_string(map->column_types[i]));
|
||||
check_overflow(ptr <= end);
|
||||
}
|
||||
ss_dassert(metadata_offset <= map->column_metadata.size());
|
||||
mxb_assert(metadata_offset <= map->column_metadata.size());
|
||||
metadata_offset += get_metadata_len(map->column_types[i]);
|
||||
}
|
||||
else
|
||||
@ -476,7 +476,7 @@ bool Rpl::handle_table_map_event(REP_HEADER *hdr, uint8_t *ptr)
|
||||
|
||||
if (create != m_created_tables.end())
|
||||
{
|
||||
ss_dassert(create->second->columns.size() > 0);
|
||||
mxb_assert(create->second->columns.size() > 0);
|
||||
auto it = m_table_maps.find(table_ident);
|
||||
STableMapEvent map(table_map_alloc(ptr, ev_len, create->second.get()));
|
||||
|
||||
@ -506,7 +506,7 @@ bool Rpl::handle_table_map_event(REP_HEADER *hdr, uint8_t *ptr)
|
||||
|
||||
m_table_maps[table_ident] = map;
|
||||
m_active_maps[map->id] = map;
|
||||
ss_dassert(m_active_maps[id] == map);
|
||||
mxb_assert(m_active_maps[id] == map);
|
||||
MXS_DEBUG("Table %s mapped to %lu", table_ident, map->id);
|
||||
rval = true;
|
||||
}
|
||||
@ -777,7 +777,7 @@ bool Rpl::save_and_replace_table_create(STableCreateEvent created)
|
||||
}
|
||||
|
||||
m_created_tables[table_ident] = created;
|
||||
ss_dassert(created->columns.size() > 0);
|
||||
mxb_assert(created->columns.size() > 0);
|
||||
return m_handler->create_table(created);
|
||||
}
|
||||
|
||||
|
@ -401,7 +401,7 @@ static const char *extract_field_name(const char* ptr, char* dest, size_t size)
|
||||
dest[bytes] = '\0';
|
||||
|
||||
make_valid_avro_identifier(dest);
|
||||
ss_dassert(strlen(dest) > 0);
|
||||
mxb_assert(strlen(dest) > 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -522,10 +522,10 @@ STableCreateEvent table_create_alloc(char* ident, const char* sql, int len)
|
||||
/** Extract the table definition so we can get the column names from it */
|
||||
int stmt_len = 0;
|
||||
const char* statement_sql = get_table_definition(sql, len, &stmt_len);
|
||||
ss_dassert(statement_sql);
|
||||
mxb_assert(statement_sql);
|
||||
|
||||
char* tbl_start = strchr(ident, '.');
|
||||
ss_dassert(tbl_start);
|
||||
mxb_assert(tbl_start);
|
||||
*tbl_start++ = '\0';
|
||||
|
||||
char table[MYSQL_TABLE_MAXLEN + 1];
|
||||
@ -620,7 +620,7 @@ Rpl::Rpl(SERVICE* service, SRowEventHandler handler, gtid_pos_t gtid):
|
||||
0, &pcreerr, &erroff, NULL);
|
||||
m_alter_table_re = pcre2_compile((PCRE2_SPTR) alter_table_regex, PCRE2_ZERO_TERMINATED,
|
||||
0, &pcreerr, &erroff, NULL);
|
||||
ss_info_dassert(m_create_table_re && m_alter_table_re,
|
||||
mxb_assert_message(m_create_table_re && m_alter_table_re,
|
||||
"CREATE TABLE and ALTER TABLE regex compilation should not fail");
|
||||
|
||||
}
|
||||
@ -732,7 +732,7 @@ static void remove_extras(char* str)
|
||||
memmove(str, start, len);
|
||||
str[len] = '\0';
|
||||
|
||||
ss_dassert(strlen(str) == len);
|
||||
mxb_assert(strlen(str) == len);
|
||||
}
|
||||
|
||||
static void remove_backticks(char* src)
|
||||
@ -751,7 +751,7 @@ static void remove_backticks(char* src)
|
||||
src++;
|
||||
}
|
||||
|
||||
ss_dassert(dest == src || (*dest != '\0' && dest < src));
|
||||
mxb_assert(dest == src || (*dest != '\0' && dest < src));
|
||||
*dest = '\0';
|
||||
}
|
||||
|
||||
@ -950,7 +950,7 @@ static void rskip_token(const char* sql, const char** end)
|
||||
static bool get_placement_specifier(const char* sql, const char* end, const char** tgt, int* tgt_len)
|
||||
{
|
||||
bool rval = false;
|
||||
ss_dassert(end > sql);
|
||||
mxb_assert(end > sql);
|
||||
end--;
|
||||
|
||||
*tgt = NULL;
|
||||
@ -971,7 +971,7 @@ static bool get_placement_specifier(const char* sql, const char* end, const char
|
||||
}
|
||||
|
||||
const char* id_start = end + 1;
|
||||
ss_dassert(*end == '`' && *id_end == '`');
|
||||
mxb_assert(*end == '`' && *id_end == '`');
|
||||
|
||||
end--;
|
||||
|
||||
|
Reference in New Issue
Block a user