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.

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

HPCC-20173 Variable to validate serial read needs to be offset_t #11492

Merged
merged 1 commit into from
Jul 27, 2018

Conversation

jakesmith
Copy link
Member

@jakesmith jakesmith commented Jul 26, 2018

Signed-off-by: Jake Smith jake.smith@lexisnexisrisk.com

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
    • 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

Testing:

@hpcc-jirabot
Copy link

@jakesmith
Copy link
Member Author

@mckellyln - please review

}
virtual size32_t read(offset_t pos, size32_t len, void * data) override
{
assertex(pos == bufPos); // Must read sequentially
Copy link
Contributor

@mckellyln mckellyln Jul 26, 2018

Choose a reason for hiding this comment

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

Is this restriction no longer valid ?
If not then sure, remove all bufPos. If yes then make bufPos offset_t ?

Copy link
Member Author

@jakesmith jakesmith Jul 26, 2018

Choose a reason for hiding this comment

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

not used other than this [incorrect] assert.

Copy link
Member Author

Choose a reason for hiding this comment

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

but I guess if correct, it does protect again misuse. i.e. ensures serial as it needs to be.
So yes I will put back and make a offset_t.

@mckellyln
Copy link
Contributor

@jakesmith just one question

Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com>
@jakesmith jakesmith changed the title HPCC-20173 Remove unused bufPos causing spurious assert when > 2GB HPCC-20173 Variable to balidate serial read needs to be offset_t Jul 26, 2018
@jakesmith
Copy link
Member Author

@mckellyln - changed to offset_t

@HPCCSmoketest
Copy link
Contributor

Automated Smoketest: ✅
OS: centos 7.4.1708 (Linux 3.10.0-327.28.3.el7.x86_64)
Sha: 8f154fb
Build: success
Install hpccsystems-platform-community_7.0.0-trunk0.el7.x86_64.rpm
HPCC Start: OK

Unit tests result:

Test total passed failed errors timeout
unittest 89 89 0 0 0
wutoolTest(Dali) 19 19 0 0 0
wutoolTest(Cassandra) 19 19 0 0 0

Regression test result:

phase total pass fail
setup (hthor) 11 11 0
setup (thor) 11 11 0
setup (roxie) 11 11 0
test (hthor) 797 797 0
test (thor) 728 728 0
test (roxie) 868 868 0

HPCC Stop: OK
HPCC Uninstall: OK
Time stats:

Prep time Build time Package time Install time Start time Test time Stop time Summary
19 sec (00:00:19) 172 sec (00:02:52) 62 sec (00:01:02) 9 sec (00:00:09) 30 sec (00:00:30) 1456 sec (00:24:16) 18 sec (00:00:18) 1766 sec (00:29:26)

@jakesmith jakesmith changed the title HPCC-20173 Variable to balidate serial read needs to be offset_t HPCC-20173 Variable to validate serial read needs to be offset_t Jul 26, 2018
@richardkchapman richardkchapman merged commit 45ac864 into hpcc-systems:master Jul 27, 2018
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.

5 participants