Skip to content

Conversation

c-herrewijn
Copy link
Member

The naming convention of ENV-variables and MACROS across the chain Makefile -> CMakeList.txt -> DuckDB Macro is not always consistent.
For example: CRASH_ON_ASSERT=1 => -DASSERT_EXCEPTION=0 => -DDUCKDB_CRASH_ON_ASSERT.
This PR homogenizes the chains of 2 macros related to assertion handling.

Current situation

Makefile (ENV) CMakeLists.txt (varialbe) CMAKE_CXX_FLAGS / DuckDB Macro
CRASH_ON_ASSERT=1 ASSERT_EXCEPTION=0 DUCKDB_CRASH_ON_ASSERT
N.A. DFORCE_ASSERT=1 DUCKDB_FORCE_ASSERT

Changes in this PR (in $\texttt{\color{green}green}$)

Makefile (ENV) CMakeLists.txt (varialbe) CMAKE_CXX_FLAGS / Duckdb Macro
CRASH_ON_ASSERT=1 $\texttt{\color{green}CRASH\_ON\_ASSERT=1}$ DUCKDB_CRASH_ON_ASSERT
$\texttt{\color{green}FORCE\_ASSERT=1}$ DFORCE_ASSERT=1 DUCKDB_FORCE_ASSERT

@Mytherin Mytherin merged commit 320a99e into duckdb:main Sep 19, 2024
38 checks passed
@Mytherin
Copy link
Collaborator

Thanks!

github-actions bot pushed a commit to duckdb/duckdb-r that referenced this pull request Sep 27, 2024
[Arrow] Move `ArrowUtil` to its own file (duckdb/duckdb#13990)
Improve assertion macros (duckdb/duckdb#14033)
krlmlr added a commit to duckdb/duckdb-r that referenced this pull request Oct 3, 2024
[Arrow] Move `ArrowUtil` to its own file (duckdb/duckdb#13990)
Improve assertion macros (duckdb/duckdb#14033)
github-actions bot added a commit to duckdb/duckdb-r that referenced this pull request Oct 3, 2024
[Arrow] Move `ArrowUtil` to its own file (duckdb/duckdb#13990)
Improve assertion macros (duckdb/duckdb#14033)

Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
@c-herrewijn c-herrewijn deleted the improve_assertion_macros branch October 7, 2024 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants