Skip to content

MDEV-37502 Make Server Debug + Clang compile ready #4145

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
merged 6 commits into from
Sep 11, 2025
Merged

MDEV-37502 Make Server Debug + Clang compile ready #4145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a72de7
MDEV-37502: clang+debug mroonga remove -Wno-unused-but-set-variable
grooverdan Jun 1, 2025
fb959bf
MDEV-37502 mroonga + clang + Debug with exceeds stack frame size
grooverdan Jun 3, 2025
292daf3
MDEV-37502: mroonga+clang+debug violates its own setting of compile f…
grooverdan Jun 12, 2025
e9addff
MDEV-37502: clang/debug/rocksdb - stack frame size
grooverdan Aug 26, 2025
8fe39a3
Revert "MDEV-36701 command line client doesn't check session_track in…
grooverdan Sep 8, 2025
c7f2de5
MDEV-34388/MDEV-36701: mysql status_info_cb disable varargs warnings
grooverdan Sep 8, 2025
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
19 changes: 16 additions & 3 deletions client/mysql.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3199,18 +3199,31 @@ static int reconnect(void)
}

#ifndef EMBEDDED_LIBRARY
static void status_info_cb(void *data, enum enum_mariadb_status_info type,
enum enum_session_state_type state_type, MARIADB_CONST_STRING *val)
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wvarargs"
/* CONC-789 */
#endif

static void status_info_cb(void *data, enum enum_mariadb_status_info type, ...)
{
if (type == SESSION_TRACK_TYPE && state_type == SESSION_TRACK_SCHEMA)
va_list ap;
va_start(ap, type);
if (type == SESSION_TRACK_TYPE && va_arg(ap, int) == SESSION_TRACK_SCHEMA)
{
MARIADB_CONST_STRING *val= va_arg(ap, MARIADB_CONST_STRING *);
my_free(current_db);
if (val->length)
current_db= my_strndup(PSI_NOT_INSTRUMENTED, val->str, val->length, MYF(MY_FAE));
else
current_db= NULL;
}
va_end(ap);
}

#ifdef __clang__
#pragma clang diagnostic pop
#endif
#else
#define mysql_optionsv(A,B,C,D) do { } while(0)
#endif
Expand Down
2 changes: 1 addition & 1 deletion storage/mroonga/vendor/groonga/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ endif()

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX)
MY_CHECK_AND_SET_COMPILER_FLAG("-Wall")
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-unused-but-set-variable")
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-error=unused-but-set-variable")
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-pointer-sign")
MY_CHECK_AND_SET_COMPILER_FLAG("-Wformat")
MY_CHECK_AND_SET_COMPILER_FLAG("-Wstrict-aliasing=2")
Expand Down
7 changes: 4 additions & 3 deletions storage/mroonga/vendor/groonga/lib/ii.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,8 @@ buffer_segment_new(grn_ctx *ctx, grn_ii *ii, uint32_t *segno)
}
}

PRAGMA_DISABLE_CHECK_STACK_FRAME

static grn_rc
buffer_segment_reserve(grn_ctx *ctx, grn_ii *ii,
uint32_t *lseg0, uint32_t *pseg0,
Expand Down Expand Up @@ -386,6 +388,8 @@ buffer_segment_reserve(grn_ctx *ctx, grn_ii *ii,
return ctx->rc;
}

PRAGMA_REENABLE_CHECK_STACK_FRAME

#define BGQENQUE(lseg) do {\
if (ii->header->binfo[lseg] != GRN_II_PSEG_NOT_ASSIGNED) {\
ii->header->bgqbody[ii->header->bgqhead] = ii->header->binfo[lseg];\
Expand Down Expand Up @@ -4529,8 +4533,6 @@ grn_ii_get_disk_usage(grn_ctx *ctx, grn_ii *ii)
}


PRAGMA_DISABLE_CHECK_STACK_FRAME

#define BIT11_01(x) ((x >> 1) & 0x7ff)
#define BIT31_12(x) (x >> 12)

Expand Down Expand Up @@ -4808,7 +4810,6 @@ exit :
return ctx->rc;
}

PRAGMA_REENABLE_CHECK_STACK_FRAME

grn_rc
grn_ii_delete_one(grn_ctx *ctx, grn_ii *ii, grn_id tid, grn_ii_updspec *u, grn_hash *h)
Expand Down
4 changes: 4 additions & 0 deletions storage/mroonga/vendor/groonga/lib/proc/proc_schema.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,6 +1130,8 @@ command_schema_output_table(grn_ctx *ctx,
grn_ctx_output_map_close(ctx);
}

PRAGMA_DISABLE_CHECK_STACK_FRAME

static void
command_schema_output_tables(grn_ctx *ctx, grn_schema_data *data)
{
Expand Down Expand Up @@ -1201,6 +1203,8 @@ command_schema_output_tables(grn_ctx *ctx, grn_schema_data *data)
GRN_OBJ_FIN(ctx, &table_ids);
}

PRAGMA_REENABLE_CHECK_STACK_FRAME

static grn_obj *
command_schema(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
{
Expand Down
3 changes: 2 additions & 1 deletion storage/mroonga/vendor/groonga/lib/proc/proc_select.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3569,7 +3569,6 @@ grn_select_data_fill_drilldowns(grn_ctx *ctx,
return succeeded;
}
}
PRAGMA_REENABLE_CHECK_STACK_FRAME

static grn_obj *
command_select(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
Expand Down Expand Up @@ -3723,6 +3722,8 @@ exit :
return NULL;
}

PRAGMA_REENABLE_CHECK_STACK_FRAME

#define N_VARS 26
#define DEFINE_VARS grn_expr_var vars[N_VARS]

Expand Down
4 changes: 2 additions & 2 deletions storage/mroonga/vendor/groonga/plugins/tokenizers/mecab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static grn_plugin_mutex *sole_mecab_mutex = NULL;
static grn_encoding sole_mecab_encoding = GRN_ENC_NONE;

static grn_bool grn_mecab_chunked_tokenize_enabled = GRN_FALSE;
static int grn_mecab_chunk_size_threshold = 8192;
static ptrdiff_t grn_mecab_chunk_size_threshold = 8192;

typedef struct {
mecab_t *mecab;
Expand Down Expand Up @@ -186,7 +186,7 @@ static grn_bool
chunked_tokenize_utf8(grn_ctx *ctx,
grn_mecab_tokenizer *tokenizer,
const char *string,
unsigned int string_bytes)
ptrdiff_t string_bytes)
{
const char *chunk_start;
const char *current;
Expand Down
7 changes: 0 additions & 7 deletions storage/rocksdb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ SET(CPACK_RPM_rocksdb-engine_PACKAGE_SUMMARY "RocksDB storage engine for MariaDB
SET(CPACK_RPM_rocksdb-engine_PACKAGE_DESCRIPTION "The RocksDB storage engine is a high performance storage engine, aimed
at maximising storage efficiency while maintaining InnoDB-like performance." PARENT_SCOPE)

STRING(REGEX REPLACE "-Wframe-larger-than=[0-9]*" ""
CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
STRING(REGEX REPLACE "-Wframe-larger-than=[0-9]*" ""
CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
STRING(REGEX REPLACE "-Wframe-larger-than=[0-9]*" ""
CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
MY_CHECK_AND_SET_COMPILER_FLAG(-Wframe-larger-than=32768)
MY_CHECK_AND_SET_COMPILER_FLAG(-Wno-range-loop-construct)
MY_CHECK_AND_SET_COMPILER_FLAG(-Wno-effc++ DEBUG RELWITHDEBINFO)

Expand Down
4 changes: 4 additions & 0 deletions storage/rocksdb/build_rocksdb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,10 @@ if(MSVC)
# Workaround Win8.1 SDK bug, that breaks /permissive-
string(REPLACE "/permissive-" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
else()
set_source_files_properties(${ROCKSDB_SOURCE_DIR}/options/db_options.cc
Copy link
Member Author

@grooverdan grooverdan Sep 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dr-m @vlad-lesin on the assumption that the two warnings in the commit message are what was seen, I pushed the warning down to just these two files. I didn't use CHECK_CXX_COMPILER_FLAG because like many of the other things in the build_rocksdb.cmake file that assumed clang or gcc (because of the other flags used).

Copy link
Contributor

@ParadoxV5 ParadoxV5 Sep 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a couple of commas to your GitHub comment here?

Update: The comment has been updated inline.

PROPERTIES COMPILE_FLAGS "-Wframe-larger-than=40960")
set_source_files_properties(${ROCKSDB_SOURCE_DIR}/options/cf_options.cc
PROPERTIES COMPILE_FLAGS "-Wframe-larger-than=32768")
set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul ${CXX11_FLAGS}")

CHECK_CXX_SOURCE_COMPILES("
Expand Down