You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@quickstep.apache.org by hbdeshmukh <gi...@git.apache.org> on 2017/04/02 21:25:02 UTC
[GitHub] incubator-quickstep pull request #226: Bug fix in memory measurement
GitHub user hbdeshmukh opened a pull request:
https://github.com/apache/incubator-quickstep/pull/226
Bug fix in memory measurement
- Some NULL checks added without which we may have segmentation faults.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/hbdeshmukh/incubator-quickstep AggState-getMemory-bugfix
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-quickstep/pull/226.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #226
----
commit 18bea4aa879cd6bef4c8b92bd2ba77a0e0d8d32c
Author: Harshad Deshmukh <hb...@apache.org>
Date: 2017-04-02T21:23:16Z
Bug fix in memory measurement
- Some NULL checks added without which we may have segmentation faults.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quickstep issue #226: Bug fix in memory measurement
Posted by cramja <gi...@git.apache.org>.
Github user cramja commented on the issue:
https://github.com/apache/incubator-quickstep/pull/226
+1
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quickstep pull request #226: Bug fix in memory measurement
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-quickstep/pull/226
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quickstep issue #226: Bug fix in memory measurement
Posted by jianqiao <gi...@git.apache.org>.
Github user jianqiao commented on the issue:
https://github.com/apache/incubator-quickstep/pull/226
LGTM! Merging.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quickstep issue #226: Bug fix in memory measurement
Posted by jianqiao <gi...@git.apache.org>.
Github user jianqiao commented on the issue:
https://github.com/apache/incubator-quickstep/pull/226
Have merged the branch but not reflected in github.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quickstep pull request #226: Bug fix in memory measurement
Posted by hbdeshmukh <gi...@git.apache.org>.
Github user hbdeshmukh commented on a diff in the pull request:
https://github.com/apache/incubator-quickstep/pull/226#discussion_r109703085
--- Diff: storage/AggregationOperationState.cpp ---
@@ -949,9 +949,15 @@ void AggregationOperationState::finalizeHashTableImplThreadPrivate(
std::size_t AggregationOperationState::getMemoryConsumptionBytes() const {
std::size_t memory = getMemoryConsumptionBytesHelper(distinctify_hashtables_);
memory += getMemoryConsumptionBytesHelper(group_by_hashtables_);
- memory += collision_free_hashtable_->getMemoryConsumptionBytes();
- memory += group_by_hashtable_pool_->getMemoryConsumptionPoolBytes();
- memory += partitioned_group_by_hashtable_pool_->getMemoryConsumptionPoolBytes();
+ if (collision_free_hashtable_ != nullptr) {
--- End diff --
I think it is alright to have different if statements here.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-quickstep pull request #226: Bug fix in memory measurement
Posted by cramja <gi...@git.apache.org>.
Github user cramja commented on a diff in the pull request:
https://github.com/apache/incubator-quickstep/pull/226#discussion_r109448735
--- Diff: storage/AggregationOperationState.cpp ---
@@ -949,9 +949,15 @@ void AggregationOperationState::finalizeHashTableImplThreadPrivate(
std::size_t AggregationOperationState::getMemoryConsumptionBytes() const {
std::size_t memory = getMemoryConsumptionBytesHelper(distinctify_hashtables_);
memory += getMemoryConsumptionBytesHelper(group_by_hashtables_);
- memory += collision_free_hashtable_->getMemoryConsumptionBytes();
- memory += group_by_hashtable_pool_->getMemoryConsumptionPoolBytes();
- memory += partitioned_group_by_hashtable_pool_->getMemoryConsumptionPoolBytes();
+ if (collision_free_hashtable_ != nullptr) {
--- End diff --
Are these mutually exclusive? If so, could we use `else if` ?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---