ADBDEV-6655: Fix -Wunused-but-set-variable errors #1107
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bandetto
changed the title
Comment on lines
+232
to
+240
| #ifdef USE_ASSERT_CHECKING | ||
| AOCODMLState *state; | ||
| #endif | ||
| Assert(aocoDMLStates.state_table); | ||
|
|
||
| state = (AOCODMLState *) hash_search(aocoDMLStates.state_table, | ||
| #ifdef USE_ASSERT_CHECKING | ||
| state = (AOCODMLState *) | ||
| #endif | ||
| hash_search(aocoDMLStates.state_table, |
There was a problem hiding this comment.
I suggest to use one ifdef and don't cast, because the type of state does not matter
Assert(aocoDMLStates.state_table);
#ifdef USE_ASSERT_CHECKING
void* state =
#endif
hash_search(aocoDMLStates.state_table,| /* Remember if it's a system catalog */ | ||
| is_system_catalog = IsSystemRelation(heapRelation); | ||
| #endif | ||
|
|
||
| /* Appendoptimized catalog tables are not supported. */ | ||
| Assert(!is_system_catalog); |
There was a problem hiding this comment.
what about Assert(!IsSystemRelation(heapRelation)); ? IsSystemRelation doesn't change anything
| @@ -1858,6 +1868,7 @@ aoco_index_build_range_scan(Relation heapRelation, | |||
| * only one of those is requested. | |||
| */ | |||
| Assert(!(anyvisible && checking_uniqueness)); | |||
There was a problem hiding this comment.
We can replace checking_uniqueness with (indexInfo->ii_Unique || indexInfo->ii_ExclusionOps != NULL). In this case we can remove variable and ifdef
Comment on lines
+2168
to
+2170
| #ifdef USE_ASSERT_CHECKING | ||
| err = | ||
| #endif |
There was a problem hiding this comment.
Use one ifdef instead of two
Suggested change
| #ifdef USE_ASSERT_CHECKING | |
| err = | |
| #endif | |
| #ifdef USE_ASSERT_CHECKING | |
| int err = | |
| #endif |
| @@ -1611,7 +1613,9 @@ aorow_compression_ratio_internal(Relation parentrel) | |||
|
|
|||
| /* Do the query. */ | |||
| ret = SPI_execute(sqlstmt.data, false, 0); | |||
| #ifdef USE_ASSERT_CHECKING | |||
| proc = (int) SPI_processed; | |||
There was a problem hiding this comment.
Can we use SPI_processed in Assert and remove the proc variable?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix -Wunused-but-set-variable errors
Commit 4be34c4 fixed the most part of 'unused-but-set-variable' errors, but some
of them were suppressed by
-Wno-unused-but-set-variableflag in configurescript.
This patch removes this flag and fixes all the errors that emerged after. The
error can't be fixed for files generated by Yacc, so
-Wno-unused-but-set-variablewas remained intact for them.Co-authored-by: Vladimir Sarmin <[email protected]>