Skip to content
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

Jump to bottom

HPCC-32395 Clean up compile warnings from jhtree and roxiemem #18959

Merged
merged 1 commit into from
Sep 19, 2024
Merged

HPCC-32395 Clean up compile warnings from jhtree and roxiemem #18959

merged 1 commit into from
Sep 19, 2024

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Aug 7, 2024 •
edited
Loading

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 7, 2024

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-32395

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR
Assigning user: [email protected]

ghalliday
ghalliday commented Aug 7, 2024
View reviewed changes
roxie/roxiemem/roxiemem.cpp
@@ -8243,7 +8240,7 @@ class RoxieMemTests : public CppUnit::TestFixture
}
void * otherrow = rowManager->allocate(100, 0);
savedRowHeap.setown(rowManager->createFixedRowHeap(8, ACTIVITY_FLAG_ISREGISTERED|0, RHFhasdestructor|RHFunique));
void * leakedRow = savedRowHeap->allocate();
[[maybe_unused]] void * leakedRow = savedRowHeap->allocate();
Copy link
Member Author

Choose a reason for hiding this comment

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

Would the following be better?

void * leakedRow [[maybe_unused]] = savedRowHeap->allocate();

Copy link
Member

Choose a reason for hiding this comment

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

Maybe, slightly. I assume they behave the same?

ghalliday
ghalliday commented Aug 7, 2024
View reviewed changes
system/jhtree/jhinplace.cpp Outdated
@@ -269,6 +269,7 @@ inline void skipPacked(const byte * & cur)

//----- special packed format - code is untested

#ifdef ALTERNATIVE_PACKING_FORMAT
Copy link
Member Author

Choose a reason for hiding this comment

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

Currently unused, and generates warnings about unused static functions. Should possibly delete instead.

ghalliday
ghalliday commented Aug 7, 2024
View reviewed changes
system/lzma/LzmaEnc.cpp Outdated
@@ -1923,7 +1923,7 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
{
UInt32 beforeSize = kNumOpts;
Bool btMode;
Bool btMode [[maybe_unused]];
Copy link
Member Author

Choose a reason for hiding this comment

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

Alternatively I could move this into the #ifdef on line 1930. Would probably be better.

Copy link
Member

Choose a reason for hiding this comment

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

Better as

  #ifdef COMPRESS_MF_MT
  Bool btMode;
  btMode = (p->matchFinderBase.btMode != 0);
  p->mtMode = (p->multiThread && !p->fastMode && btMode);
  #endif

Copy link
Member

Choose a reason for hiding this comment

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

agree

richardkchapman
richardkchapman requested changes Aug 7, 2024
View reviewed changes
Copy link
Member

@richardkchapman richardkchapman left a comment

Choose a reason for hiding this comment

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

There are some places where the warnings are effectively revealing dead code, and it would seem prudent to kill that dead code rather than just killing enough to suppress the warning (and thus make the dead code even less obvious)

roxie/roxiemem/roxiemem.cpp
@@ -8243,7 +8240,7 @@ class RoxieMemTests : public CppUnit::TestFixture
}
void * otherrow = rowManager->allocate(100, 0);
savedRowHeap.setown(rowManager->createFixedRowHeap(8, ACTIVITY_FLAG_ISREGISTERED|0, RHFhasdestructor|RHFunique));
void * leakedRow = savedRowHeap->allocate();
[[maybe_unused]] void * leakedRow = savedRowHeap->allocate();
Copy link
Member

Choose a reason for hiding this comment

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

Maybe, slightly. I assume they behave the same?

system/jhtree/keybuild.cpp Outdated
@@ -278,7 +278,7 @@ class CKeyBuilder : public CInterfaceOf<IKeyBuilder>

offset_t nextLevel()
{
offset_t ret = endLevel(false);
endLevel(false);
Copy link
Member

Choose a reason for hiding this comment

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

What is the return value supposed to be? Should we be returning ret?

Copy link
Member

Choose a reason for hiding this comment

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

endLevel() function seems completely redundant, and nextLevel a bit pointless... if nextLevel always returns 0 then there's also some redundant code in buildTree.

Feels like this may be supporting some very long-deleted functionality

system/lzma/LzmaEnc.cpp Outdated
@@ -1923,7 +1923,7 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
{
UInt32 beforeSize = kNumOpts;
Bool btMode;
Bool btMode [[maybe_unused]];
Copy link
Member

Choose a reason for hiding this comment

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

Better as

  #ifdef COMPRESS_MF_MT
  Bool btMode;
  btMode = (p->matchFinderBase.btMode != 0);
  p->mtMode = (p->multiThread && !p->fastMode && btMode);
  #endif

jakesmith
jakesmith reviewed Aug 14, 2024
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@ghalliday - a few additional comments

system/lzma/LzmaEnc.cpp Outdated
@@ -1923,7 +1923,7 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig)
{
UInt32 beforeSize = kNumOpts;
Bool btMode;
Bool btMode [[maybe_unused]];
Copy link
Member

Choose a reason for hiding this comment

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

agree

plugins/timelib/timelib.cpp Outdated
@@ -796,7 +796,7 @@ TIMELIB_API unsigned int TIMELIB_CALL tlAdjustCalendar(unsigned int date, short
unsigned int month = (date - (year * 10000)) / 100;
unsigned int day = date - (year * 10000) - (month * 100);
int expectedMonthVal = month - 1;
time_t seconds;
time_t seconds [[maybe_unused]];
Copy link
Member

Choose a reason for hiding this comment

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

looks like this should be removed along with the assignment on line 826..

roxie/roxiemem/roxiemem.cpp Show resolved Hide resolved
@ghalliday ghalliday changed the base branch from candidate-9.6.x to master September 11, 2024 10:59
@ghalliday ghalliday closed this Sep 11, 2024
@ghalliday ghalliday reopened this Sep 11, 2024
@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-32395

Jirabot Action Result:
Workflow Transition To: Merge Pending

richardkchapman
richardkchapman approved these changes Sep 11, 2024
View reviewed changes
Copy link
Member

@richardkchapman richardkchapman left a comment

Choose a reason for hiding this comment

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

Changes look fine although there may be some overlap and/or clashes with PRs of mine that have already been merged.

jakesmith
jakesmith approved these changes Sep 13, 2024
View reviewed changes
Copy link
Member

@jakesmith jakesmith left a comment

Choose a reason for hiding this comment

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

@ghalliday - looks good to me.

@ghalliday ghalliday merged commit cca773d into hpcc-systems:master Sep 19, 2024
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakesmith jakesmith jakesmith approved these changes

@richardkchapman richardkchapman richardkchapman approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ghalliday @richardkchapman @jakesmith