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

refact: merge pd into hugegraph #2270

Merged
merged 19 commits into from
Aug 7, 2023
Merged

refact: merge pd into hugegraph #2270

merged 19 commits into from
Aug 7, 2023

Conversation

VGalaxies
Copy link
Contributor

@VGalaxies VGalaxies commented Aug 7, 2023

Purpose of the PR

subtask of #2265

Merge the internal version of pd into hugegraph.

Main Changes

  1. Merge the internal version of pd into hugegraph-pd module.
  2. Modified some pom files under the hugegraph-pd module so that it can be built normally under certain conditions.
  3. Clean some comments in hugegraph-pd.
  4. Add apache-rat-plugin for hugegraph-pd and add some license headers.
  5. (TODO) potential code cleanup or style issues

NOTE:

  1. Due to the modification of <parent> in the root pom of hugegraph-pd from spring-boot-starter-parent to hugegraph, it is necessary to explicitly specify the version of some dependencies for the hugegraph-pd submodules.
  2. The hugegraph-pd module incorporates features that are not supported in Java 8, such as the var keyword. To ensure compatibility with Java 8, subsequent PRs could consider adjusting the compilation version based on whether the user opts to use hugegraph-pd and hugegraph-store.

Verifying these changes

  • Trivial rework / code cleanup without any test coverage. (No Need)
  • Already covered by existing tests, such as (please modify tests here).
  • Need tests and can be verified as follows:
    • subsequent PRs will merge store and more adaptation work needs to be done

Does this PR potentially affect the following parts?

  • Nope
  • Dependencies (add/update license info)
  • Modify configurations
  • The public API
  • Other affects (breaking changes)

Documentation Status

  • Doc - TODO
  • Doc - Done
  • Doc - No Need

VGalaxies and others added 16 commits May 6, 2023 18:24
Change-Id: I3f38685af534468a51b79b7f45d24fdb30a74f34
Change-Id: Id2fa1374d7fa85635906a7e75655e7dad56f1807
Change-Id: Id8ec0a0d754f646c59f7251158dd89de669b2016
…nge code

Change-Id: Id8ec0a0d754f646c59f7251158dd89de669b2016
- also replace "a/b/c" regrex
- replace pom version to ${revision}

Change-Id: Ia3a9ce891fcff58cef4a5a1f95adb44ef8ee8049
- lack this with instance filed
- lack {} in 'if/while/for'

Change-Id: I37d21f1ab94529a8122f4598636fbe02b2264904
Change-Id: I9a21c17a07c96c42eafc5ffeedfc70b2a77563d2

GraphPlatform-2120 检查channel

Change-Id: I9135b19b2a3bd66f31dcdbcf9169b1884ae934c2

GraphPlatform-2120 处理加锁

Change-Id: I64441d02221e96aa21027faafe90c8b7e04b15d1

GraphPlatform-1749 修复可能导致的死锁问题

Change-Id: Ie5ab9fd62746bfcd77edcaf8881671abee678d31

GraphPlatform-1749 修正pd raft

Change-Id: I31064fa2ce31b677cf044a85645e7244cbbbff26

GraphPlatform-2120 控制pd线程池大小

Change-Id: Ie505f5525bcff79f84c0cd674b92c6abf3a2c03f

GraphPlatform-1749 优化partition cache

Change-Id: I5cafd9078ccc91b7f0b4d9157a3913049c38d8cb

GraphPlatform-1657 rest接口转发到leader

Change-Id: Ib5db654a35733ddead7972d5e4b08b981a89fb31

GraphPlatform-2020 fix cache bug when direct put

Change-Id: I52428d8d5d4bb977ee7796c0fe1e4ced07aff12d

GraphPlatform-2020 fix cache bug when direct put

Change-Id: Id57427a94732e12f2d96429a2b677d5c5f71e8ff

GraphPlatform-1771 update code

Change-Id: Ic3b95ca22900453adbc3571734e1da2c97e28355
1. Added the
[flatten](apache#2004)
plugin.
2. Unified the global version to 1.5.0.
3. Modified the version of `jraft-core`.

---------

Co-authored-by: imbajin <[email protected]>
from inner commit 0a95b1e587e65ea6a0a06774d53c80868f36af5b

---------

Co-authored-by: zhangyingjie02 <[email protected]>
Co-authored-by: V_Galaxy <[email protected]>
from inner commit 0a95b1e587e65ea6a0a06774d53c80868f36af5b

fix store compile problem
https://hugegraph.feishu.cn/wiki/Y6d2wys9KiWf24kpzNKct0Yknnr

---------
Co-authored-by: V_Galaxy <[email protected]>
---------

Co-authored-by: V_Galaxy <[email protected]>
Copy link
Member

@imbajin imbajin left a comment

Choose a reason for hiding this comment

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

Update: we need revert / reset this merge commit & keep all of them

@imbajin imbajin merged commit a891780 into apache:pd-store Aug 7, 2023
imbajin added a commit that referenced this pull request Aug 7, 2023
imbajin added a commit that referenced this pull request Aug 7, 2023
@VGalaxies VGalaxies deleted the merge-pd branch August 8, 2023 11:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants