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

Refactor merge policy #17025

Closed
wants to merge 53 commits into from
Closed

Refactor merge policy #17025

wants to merge 53 commits into from

Commits on Jun 14, 2024

  1. refactor merge policy

    @w-zr
    w-zr committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    72b57ee View commit details
    Browse the repository at this point in the history

  2. reduce single object merge frequency

    @w-zr
    w-zr committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    5de9055 View commit details
    Browse the repository at this point in the history

  3. reduce multi object merge frequency

    @w-zr
    w-zr committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    7090769 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Merge remote-tracking branch 'upstream/main' into refacor-merge-policy

    @w-zr
    w-zr committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    753b45c View commit details
    Browse the repository at this point in the history

  2. rename merge scheduler

    @w-zr
    w-zr committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    a8a0c19 View commit details
    Browse the repository at this point in the history

  3. reduce multi object merge freqency

    @w-zr
    w-zr committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    af35bdf View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/main' into refacor-merge-policy

    @w-zr
    w-zr committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    8c2461c View commit details
    Browse the repository at this point in the history

  5. copy single object targets

    @w-zr
    w-zr committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    d1cf9ed View commit details
    Browse the repository at this point in the history

  6. improve log print & limit cpu usage

    @w-zr
    w-zr committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    97351e3 View commit details
    Browse the repository at this point in the history

  7. add some log

    @w-zr
    w-zr committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    19598b7 View commit details
    Browse the repository at this point in the history

  8. remove unnessary lock

    @w-zr
    w-zr committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    322f3cd View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. fix deadlock

    @w-zr
    w-zr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    e408457 View commit details
    Browse the repository at this point in the history

  2. add lock to get createdAt

    @w-zr
    w-zr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    09b8a44 View commit details
    Browse the repository at this point in the history

  3. remove some log

    @w-zr
    w-zr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    19f8e90 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/main' into refacor-merge-policy

    @w-zr
    w-zr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    7dd9710 View commit details
    Browse the repository at this point in the history

  5. revert some change

    @w-zr
    w-zr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    0cb13ee View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'upstream/main' into refacor-merge-policy

    @w-zr
    w-zr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    5f357b1 View commit details
    Browse the repository at this point in the history

  7. refactor lock

    @w-zr
    w-zr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    d677326 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into refacor-merge-policy

    @mergify
    mergify[bot] committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    0b4e413 View commit details
    Browse the repository at this point in the history

  9. fix sca error

    @w-zr
    w-zr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    279c5e7 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'refacor-merge-policy' of github.com:w-zr/matrixone into… 

    … refacor-merge-policy
    @w-zr
    w-zr committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    36c2da9 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Merge remote-tracking branch 'upstream/main' into refacor-merge-policy

    @w-zr
    w-zr committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    0558812 View commit details
    Browse the repository at this point in the history

  2. use deltaLoc to determin single object merge

    @w-zr
    w-zr committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    35dbb64 View commit details
    Browse the repository at this point in the history

  3. reduce merge size

    @w-zr
    w-zr committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    8dcadd9 View commit details
    Browse the repository at this point in the history

  4. enable cn merge

    @w-zr
    w-zr committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    2bd515f View commit details
    Browse the repository at this point in the history

  5. reduce multi object merge size

    @w-zr
    w-zr committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    9fb7e4a View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. reduce log

    @w-zr
    w-zr committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    9ff911a View commit details
    Browse the repository at this point in the history

  2. dn merge

    @w-zr
    w-zr committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    7b27e16 View commit details
    Browse the repository at this point in the history

  3. refactor

    @w-zr
    w-zr committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    f67cf50 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/main' into refacor-merge-policy

    @w-zr
    w-zr committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    1e6424d View commit details
    Browse the repository at this point in the history

  5. fix merge error

    @w-zr
    w-zr committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    2211bd8 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. fix bug

    @w-zr
    w-zr committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    f714768 View commit details
    Browse the repository at this point in the history

  2. reduce multi obj merge

    @w-zr
    w-zr committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    8c8d6bd View commit details
    Browse the repository at this point in the history

  3. refresh mem info before exec

    @w-zr
    w-zr committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    6931f5c View commit details
    Browse the repository at this point in the history

  4. log obj size

    @w-zr
    w-zr committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    dcd6407 View commit details
    Browse the repository at this point in the history

  5. humanreadable bytes

    @w-zr
    w-zr committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    d7b3ab4 View commit details
    Browse the repository at this point in the history

  6. fix bug

    @w-zr
    w-zr committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    693c305 View commit details
    Browse the repository at this point in the history

  7. restrict active merge blk

    @w-zr
    w-zr committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    28ce572 View commit details
    Browse the repository at this point in the history

  8. remove merging object

    @w-zr
    w-zr committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    001e98d View commit details
    Browse the repository at this point in the history

  9. fix error

    @w-zr
    w-zr committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    e529636 View commit details
    Browse the repository at this point in the history

  10. add min delete limit

    @w-zr
    w-zr committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    43fe5c7 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. disable single obj policy

    @w-zr
    w-zr committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    200d8c5 View commit details
    Browse the repository at this point in the history

  2. do not consider cpu usage

    @w-zr
    w-zr committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5f9baab View commit details
    Browse the repository at this point in the history

  3. release memory restrict

    @w-zr
    w-zr committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    58a85b9 View commit details
    Browse the repository at this point in the history

  4. fix

    @w-zr
    w-zr committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    43613e5 View commit details
    Browse the repository at this point in the history

  5. add restiction

    @w-zr
    w-zr committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    dcdf6ef View commit details
    Browse the repository at this point in the history

  6. do not merge same table too frequently

    @w-zr
    w-zr committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    52b62a2 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge remote-tracking branch 'upstream/main' into refacor-merge-policy

    @w-zr
    w-zr committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    bd5e72a View commit details
    Browse the repository at this point in the history

  2. remove restriction

    @w-zr
    w-zr committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    a108a59 View commit details
    Browse the repository at this point in the history

  3. fix error

    @w-zr
    w-zr committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    ff6af73 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. merge overlapped objects with most cnt

    @w-zr
    w-zr committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    20946c2 View commit details
    Browse the repository at this point in the history

  2. reuse memory

    @w-zr
    w-zr committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    2e82447 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. do not consider big gap

    @w-zr
    w-zr committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    6486bb3 View commit details
    Browse the repository at this point in the history