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-15582 Revert HPCC-15489 and give slave managers own cache #8676

Merged
merged 2 commits into from
May 23, 2016

Conversation

jakesmith
Copy link
Member

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

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
@hpcc-jirabot
Copy link

@jakesmith
Copy link
Member Author

@ghalliday - please review

@HPCCSmoketest
Copy link
Contributor

Automated Smoketest
Sha: f8bb024
Build: success
Install hpccsystems-platform-community_6.0.0-rc5.el6.x86_64.rpm
HPCC Start: OK
HPCC Stop: OK
HPCC Uninstall: OK

roxiemem::RoxieHeapFlags flags;
AllocatorKey(IOutputMetaData *_meta, unsigned __int64 &_activityId, roxiemem::RoxieHeapFlags _flags)
AllocatorKey(IOutputMetaData *_meta, unsigned &_activityId, roxiemem::RoxieHeapFlags _flags)
Copy link
Member

Choose a reason for hiding this comment

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

minor: normally activityId wouldn't be a reference parameter

@ghalliday
Copy link
Member

@jakesmith a few minor comments.

I think the change will work. I'm not a great fan of passing in the array of slave allocators, but it is relatively clean, so no big objections.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
@jakesmith
Copy link
Member Author

I'm not a great fan of passing in the array of slave allocators,

An alternative I supposed would be to either have a :

globalRowManger->addSlaveRowManager(<cache>)

which create the slaveManager with provided cache at the time.

Or a :

globalRowManager->setSlaveRowManagerCache(unsigned slaveId, <cache>);

.. i.e. used default globalRowManager cache, unless this was called to override.

@ghalliday

@HPCCSmoketest
Copy link
Contributor

Automated Smoketest
Sha: 2ed51b3
Build: success
Install hpccsystems-platform-community_6.0.0-rc5.el6.x86_64.rpm
HPCC Start: OK
HPCC Stop: OK
HPCC Uninstall: OK

@ghalliday
Copy link
Member

I'll merge as-is. We can possibly think about restructuring the parameters at a later date.

@ghalliday ghalliday merged commit dbda65f into hpcc-systems:candidate-6.0.0 May 23, 2016
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.

4 participants