You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
chore(build): fixes to satisfy clang19 warnings
This commit is contained in:
committed by
Leonid Fedorov
parent
9fd7f342a7
commit
a0bee173f6
@ -751,7 +751,7 @@ bool anyNullInTheColumn(THD* thd, string& schema, string& table, string& columnN
|
||||
}
|
||||
}
|
||||
|
||||
int ProcessDDLStatement(string& ddlStatement, string& schema, const string& table, int sessionID,
|
||||
int ProcessDDLStatement(string& ddlStatement, string& schema, const string& /*table*/, int sessionID,
|
||||
string& emsg, int compressionTypeIn = 2, bool isAnyAutoincreCol = false,
|
||||
int64_t nextvalue = 1, std::string autoiColName = "",
|
||||
const CHARSET_INFO* default_table_charset = NULL)
|
||||
@ -767,7 +767,8 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
|
||||
int rc = 0;
|
||||
parser.Parse(ddlStatement.c_str());
|
||||
|
||||
if (get_fe_conn_info_ptr() == NULL) {
|
||||
if (get_fe_conn_info_ptr() == NULL)
|
||||
{
|
||||
set_fe_conn_info_ptr((void*)new cal_connection_info());
|
||||
thd_set_ha_data(thd, mcs_hton, get_fe_conn_info_ptr());
|
||||
}
|
||||
@ -1064,12 +1065,11 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool isAutoIncrementColumn =
|
||||
default_table_charset ? datatypes::CollationAwareComparator(default_table_charset)(
|
||||
autoiColName, createTable->fTableDef->fColumns[i]->fName)
|
||||
: datatypes::ASCIIStringCaseInsensetiveEquals(
|
||||
autoiColName, createTable->fTableDef->fColumns[i]->fName);
|
||||
bool isAutoIncrementColumn = default_table_charset
|
||||
? datatypes::CollationAwareComparator(default_table_charset)(
|
||||
autoiColName, createTable->fTableDef->fColumns[i]->fName)
|
||||
: datatypes::ASCIIStringCaseInsensetiveEquals(
|
||||
autoiColName, createTable->fTableDef->fColumns[i]->fName);
|
||||
|
||||
if (!autoIncre && isAnyAutoincreCol && isAutoIncrementColumn)
|
||||
{
|
||||
@ -1395,7 +1395,8 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
|
||||
{
|
||||
//@Bug 3782 This is for synchronization after calonlinealter to use
|
||||
boost::algorithm::to_upper(comment);
|
||||
std::regex pat("[[:space:]]*SCHEMA[[:space:]]+SYNC[[:space:]]+ONLY", std::regex_constants::extended);
|
||||
std::regex pat("[[:space:]]*SCHEMA[[:space:]]+SYNC[[:space:]]+ONLY",
|
||||
std::regex_constants::extended);
|
||||
|
||||
if (std::regex_search(comment, pat))
|
||||
{
|
||||
@ -2184,7 +2185,8 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
|
||||
{
|
||||
rc = 0;
|
||||
string errmsg(
|
||||
"Error occurred during file deletion. Restart DDLProc or use command tool ddlcleanup to clean up. ");
|
||||
"Error occurred during file deletion. Restart DDLProc or use command tool ddlcleanup to clean "
|
||||
"up. ");
|
||||
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, errmsg.c_str());
|
||||
}
|
||||
|
||||
@ -2228,7 +2230,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
|
||||
// been created.
|
||||
//
|
||||
|
||||
static bool get_field_default_value(THD* thd, Field* field, String* def_value, bool quoted)
|
||||
static bool get_field_default_value(THD* /*thd*/, Field* field, String* def_value, bool quoted)
|
||||
{
|
||||
bool has_default;
|
||||
enum enum_field_types field_type = field->type();
|
||||
@ -2306,7 +2308,7 @@ bool hasZerofillDecimal(TABLE* table_arg)
|
||||
return false;
|
||||
}
|
||||
|
||||
int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* create_info,
|
||||
int ha_mcs_impl_create_(const char* /*name*/, TABLE* table_arg, HA_CREATE_INFO* create_info,
|
||||
cal_connection_info& ci)
|
||||
{
|
||||
#ifdef MCS_DEBUG
|
||||
@ -2391,7 +2393,7 @@ int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* crea
|
||||
return 1;
|
||||
}
|
||||
else if (db == "infinidb_vtable") //@bug 3540. table created in infinidb_vtable schema could be dropped
|
||||
//when select statement happen to have same tablename.
|
||||
// when select statement happen to have same tablename.
|
||||
{
|
||||
setError(thd, ER_INTERNAL_ERROR, "Table creation is not allowed in infinidb_vtable schema.");
|
||||
return 1;
|
||||
@ -2525,8 +2527,7 @@ int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* crea
|
||||
const CHARSET_INFO* field_cs = (*field)->charset();
|
||||
if (field_cs && (!share->table_charset || field_cs->number != share->table_charset->number))
|
||||
{
|
||||
oss << " CHARACTER SET " << field_cs->cs_name.str <<
|
||||
" COLLATE " << field_cs->coll_name.str;
|
||||
oss << " CHARACTER SET " << field_cs->cs_name.str << " COLLATE " << field_cs->coll_name.str;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2566,8 +2567,8 @@ int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* crea
|
||||
|
||||
if (share->table_charset)
|
||||
{
|
||||
oss << " DEFAULT CHARSET=" << share->table_charset->cs_name.str <<
|
||||
" COLLATE=" << share->table_charset->coll_name.str;
|
||||
oss << " DEFAULT CHARSET=" << share->table_charset->cs_name.str
|
||||
<< " COLLATE=" << share->table_charset->coll_name.str;
|
||||
}
|
||||
|
||||
// Process table level options such as MIN_ROWS, MAX_ROWS, COMMENT
|
||||
@ -2625,7 +2626,7 @@ int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* crea
|
||||
return rc;
|
||||
}
|
||||
|
||||
int ha_mcs_impl_delete_table_(const char* db, const char* name, cal_connection_info& ci)
|
||||
int ha_mcs_impl_delete_table_(const char* /*db*/, const char* name, cal_connection_info& ci)
|
||||
{
|
||||
#ifdef MCS_DEBUG
|
||||
cout << "ha_mcs_impl_delete_table: " << db << name << endl;
|
||||
@ -2751,7 +2752,7 @@ int ha_mcs_impl_rename_table_(const char* from, const char* to, cal_connection_i
|
||||
|
||||
extern "C"
|
||||
{
|
||||
long long calonlinealter(UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* error)
|
||||
long long calonlinealter(UDF_INIT* /*initid*/, UDF_ARGS* args, char* /*is_null*/, char* /*error*/)
|
||||
{
|
||||
string stmt(args->args[0], args->lengths[0]);
|
||||
|
||||
@ -2789,7 +2790,7 @@ extern "C"
|
||||
return rc;
|
||||
}
|
||||
|
||||
my_bool calonlinealter_init(UDF_INIT* initid, UDF_ARGS* args, char* message)
|
||||
my_bool calonlinealter_init(UDF_INIT* /*initid*/, UDF_ARGS* args, char* message)
|
||||
{
|
||||
if (args->arg_count != 1 || args->arg_type[0] != STRING_RESULT)
|
||||
{
|
||||
@ -2800,8 +2801,7 @@ extern "C"
|
||||
return 0;
|
||||
}
|
||||
|
||||
void calonlinealter_deinit(UDF_INIT* initid)
|
||||
void calonlinealter_deinit(UDF_INIT* /*initid*/)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user