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

CLICKHOUSE-3893 - Add modificator rollup. #2948

Merged
merged 25 commits into from
Sep 6, 2018
Merged

CLICKHOUSE-3893 - Add modificator rollup. #2948

merged 25 commits into from
Sep 6, 2018

Commits on Aug 7, 2018

  1. test

    @CurtizJ
    CurtizJ committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    df017f9 View commit details
    Browse the repository at this point in the history

  2. Revert "test" 

    This reverts commit df017f9.
    @CurtizJ
    CurtizJ committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    8f97453 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2018

  1. working on rollup

    @CurtizJ
    CurtizJ committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    4534d44 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/yandex/ClickHouse

    @CurtizJ
    CurtizJ committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    dbfd513 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into CLICKHOUSE-3893

    @CurtizJ
    CurtizJ committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    0704da5 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2018

  1. Add rollup modificator

    @CurtizJ
    CurtizJ committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    c18ad18 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into CLICKHOUSE-3893

    @CurtizJ
    CurtizJ committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    e0b3283 View commit details
    Browse the repository at this point in the history

  3. Add test

    @CurtizJ
    CurtizJ committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    bdedf1d View commit details
    Browse the repository at this point in the history

  4. minor changes

    @CurtizJ
    CurtizJ committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    cf3fbb8 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2018

  1. remove redundant code

    @CurtizJ
    CurtizJ committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    a04c372 View commit details
    Browse the repository at this point in the history

  2. add mysql like rollup syntax

    @CurtizJ
    CurtizJ committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    b48a144 View commit details
    Browse the repository at this point in the history

  3. update syntax and test

    @CurtizJ
    CurtizJ committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    0e28195 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2018

  1. remove redundant code

    @CurtizJ
    CurtizJ committed Aug 28, 2018
    Configuration menu
    Copy the full SHA
    a603595 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2018

  1. do not merge blocks into one

    @CurtizJ
    CurtizJ committed Sep 3, 2018
    Configuration menu
    Copy the full SHA
    3bc743c View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2018

  1. Revert "Merge branch 'master' into CLICKHOUSE-3893" 

    This reverts commit 0704da5, reversing
changes made to 4534d44.
    @CurtizJ
    CurtizJ committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    cdb2c8a View commit details
    Browse the repository at this point in the history

  2. Revert "Revert "Merge branch 'master' into CLICKHOUSE-3893"" 

    This reverts commit cdb2c8a.
    @CurtizJ
    CurtizJ committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    a7bbf83 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into CLICKHOUSE-3893

    @CurtizJ
    CurtizJ committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    18da41a View commit details
    Browse the repository at this point in the history

  4. optimize memory consumption

    @CurtizJ
    CurtizJ committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    35cbdcd View commit details
    Browse the repository at this point in the history

  5. fix submodules updates

    @CurtizJ
    CurtizJ committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    ea2b569 View commit details
    Browse the repository at this point in the history

  6. fix submodules updates

    @CurtizJ
    CurtizJ committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    d0b56da View commit details
    Browse the repository at this point in the history

  7. fix submodules updates

    @CurtizJ
    CurtizJ committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    0ad5793 View commit details
    Browse the repository at this point in the history

  8. add rollup to formatted query

    @CurtizJ
    CurtizJ committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    472adf4 View commit details
    Browse the repository at this point in the history

  9. Update InterpreterSelectQuery.cpp

    @CurtizJ
    CurtizJ committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    e6d49c4 View commit details
    Browse the repository at this point in the history

  10. Update InterpreterSelectQuery.cpp

    @CurtizJ
    CurtizJ committed Sep 5, 2018
    Configuration menu
    Copy the full SHA
    7f71bc4 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2018

  1. Update RollupBlockInputStream.cpp

    @alexey-milovidov
    alexey-milovidov committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    4c549f7 View commit details
    Browse the repository at this point in the history