search

hyrise / hyrise-v1

HYRISE In-Memory Hybrid Storage Engine (archived, now developed in hyrise/hyrise repo)
https://github.com/hyrise/hyrise
MIT License
89 stars 44 forks source link

Feature/dynamic #383

Closed kaihowl closed 9 years ago

kaihowl commented 10 years ago

Merge the work for dynamic parallelization including some bug fixes in to the main line.

review-ninja commented 10 years ago

ReviewNinja

hyrise-bot commented 10 years ago

Test failed. Refer to this link for build results: http://ares.epic.hpi.uni-potsdam.de/hyrise-trigger/job/hyrise-multiconf-pull/859/

Build Log last 20 lines

[...truncated 36 lines...]
 > git clean -fdx
 > git submodule foreach --recursive git reset --hard
 > git submodule foreach --recursive git clean -fdx
Triggering hyrise-multiconf-pull » release,g++48,1
Triggering hyrise-multiconf-pull » release,g++48,0
Triggering hyrise-multiconf-pull » debug,g++48,0
Triggering hyrise-multiconf-pull » debug,clang++34,0
Triggering hyrise-multiconf-pull » debug,g++48,1
Triggering hyrise-multiconf-pull » release,clang++34,0
Triggering hyrise-multiconf-pull » release,clang++34,1
Triggering hyrise-multiconf-pull » debug,clang++34,1
hyrise-multiconf-pull » release,g++48,1 completed with result FAILURE
hyrise-multiconf-pull » release,g++48,0 completed with result FAILURE
hyrise-multiconf-pull » debug,g++48,0 completed with result FAILURE
hyrise-multiconf-pull » debug,clang++34,0 completed with result FAILURE
hyrise-multiconf-pull » debug,g++48,1 completed with result FAILURE
hyrise-multiconf-pull » release,clang++34,0 completed with result FAILURE
hyrise-multiconf-pull » release,clang++34,1 completed with result FAILURE
hyrise-multiconf-pull » debug,clang++34,1 completed with result FAILURE
hyrise-bot commented 10 years ago

Test PASSED! Refer to this link for build results: http://ares.epic.hpi.uni-potsdam.de/hyrise-trigger/job/hyrise-multiconf-pull/860/

schwald commented 10 years ago

@kaihowl Kannst du den PR squashen, dann merge ich ihn gerne...

kaihowl commented 10 years ago

This is a long-running epic branch. Are you sure you want to squash this and not just merge?

kaihowl commented 10 years ago

You would lose a lot of history then

schwald commented 10 years ago

Yes, this is true. However, there seem to be a lot of very small commits which probably should not all end up as single commits in the master... I feel like squashing would be the better option in order to keep the main clean. Whats your view?

kaihowl commented 10 years ago

Ok. Sounds reasonable. I'll squash in the next couple days and try to retain some context in the commit message.

On Nov 24, 2014, at 6:14 PM, David Schwalb notifications@github.com wrote:

Yes, this is true. However, there seem to be a lot of very small commits which probably should not all end up as single commits in the master... I feel like squashing would be the better option in order to keep the main clean. Whats your view?

— Reply to this email directly or view it on GitHub.

schwald commented 9 years ago

@kaihowl Sounds good, thanks!

kaihowl commented 9 years ago

@schwald One of the merge conflicts pertains to a fix from you: https://github.com/hyrise/hyrise/commit/cb23a8af93137541d1ba54057fb2bc132b259b47

@JWUST solution was this: https://github.com/hyrise/hyrise/blob/b1187cceacd4b15d7117d5d8ea2f2e9f57f3105d/src/lib/taskscheduler/ThreadLevelQueue.h#L140

I have no insight into both solutions. At quick sight both seem to be accomplishing the same thing while @schwald's solutions states the intent more clearly. Nevertheless, the both of you have to decide which solution is the "correct" one. Let me know and I will fix this last remaining merge conflict.

schwald commented 9 years ago

It seems that there are also some other status values, so please use the version from @JWUST

kaihowl commented 9 years ago

Done

schwald commented 9 years ago

Thanks!