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: adjust project structure for merge PD & Store[Breaking Change] #2338

Merged
merged 20 commits into from
Nov 8, 2023

Conversation

VGalaxies
Copy link
Contributor

@VGalaxies VGalaxies commented Oct 26, 2023

Purpose of the PR

Subtask of #2265.

Adjust the project structure of this repository to include three sub-modules: hugegraph-server, hugegraph-pd, hugegraph-store at the root level.

Main Changes

Roll back to the moment when #2266 was merged on pd-store and incorporate the latest changes in master.

For more detailed information, please refer to #2266 (comment).

TODO:

  • check pom.xml
  • pass required CI
  • core (common) version

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:
    • CI

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

@codecov
Copy link

codecov bot commented Oct 27, 2023

Codecov Report

Merging #2338 (a2fd4c5) into master (69e6b46) will increase coverage by 0.10%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##             master    #2338      +/-   ##
============================================
+ Coverage     68.31%   68.42%   +0.10%     
- Complexity      981      983       +2     
============================================
  Files           507      507              
  Lines         42084    42084              
  Branches       5832     5832              
============================================
+ Hits          28749    28795      +46     
+ Misses        10564    10527      -37     
+ Partials       2771     2762       -9     
Files Coverage Δ
...pi/src/main/java/org/apache/hugegraph/api/API.java 70.00% <ø> (ø)
...ava/org/apache/hugegraph/api/arthas/ArthasAPI.java 100.00% <ø> (ø)
.../java/org/apache/hugegraph/api/auth/AccessAPI.java 0.00% <ø> (ø)
.../java/org/apache/hugegraph/api/auth/BelongAPI.java 0.00% <ø> (ø)
...n/java/org/apache/hugegraph/api/auth/GroupAPI.java 0.00% <ø> (ø)
...n/java/org/apache/hugegraph/api/auth/LoginAPI.java 74.28% <ø> (ø)
...java/org/apache/hugegraph/api/auth/ProjectAPI.java 82.05% <ø> (ø)
.../java/org/apache/hugegraph/api/auth/TargetAPI.java 0.00% <ø> (ø)
...in/java/org/apache/hugegraph/api/auth/UserAPI.java 75.80% <ø> (ø)
...ava/org/apache/hugegraph/api/cypher/CypherAPI.java 60.86% <ø> (ø)
... and 263 more

... and 468 files with indirect coverage changes

📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today!

@VGalaxies VGalaxies changed the title refact: adjust hugegraph project structure to prepare for merge PD and Store (WIP) refact: adjust hugegraph project structure to prepare for merge PD and Store Oct 27, 2023
@imbajin
Copy link
Member

imbajin commented Oct 28, 2023

seems we shouldn't import guava separatly, it should be imported & define version by hugegrpah-common (could check the import, or just remove it if we already import common?)

image

@VGalaxies
Copy link
Contributor Author

seems we shouldn't import guava separatly, it should be imported & define version by hugegrpah-common (could check the import, or just remove it if we already import common?)

image

already imported in hugegraph-common (with version 30.0-jre), so removed

@imbajin
Copy link
Member

imbajin commented Oct 30, 2023

Similarly, the grpc dependencies should be imported from hugegraph-commons-rpc? (could also check & replace it) to solve the 3rd-party check

@VGalaxies
Copy link
Contributor Author

VGalaxies commented Oct 30, 2023

Similarly, the grpc dependencies should be imported from hugegraph-commons-rpc? (could also check & replace it) to solve the 3rd-party check

found in org.apache.hugegraph:hugegraph-rpc:jar:1.0.0 - com.alipay.sofa:sofa-rpc-all:jar:5.7.6 - io.grpc:grpc-protobuf:jar:1.28.0 (with lower version compared to hugegraph-server)

@imbajin
Copy link
Member

imbajin commented Oct 31, 2023

LGTM, merge it after #2337

Update: @VGalaxies could update the master code now

zyxxoo
zyxxoo previously approved these changes Nov 6, 2023
@imbajin imbajin changed the title refact: adjust hugegraph project structure to prepare for merge PD and Store refact: adjust hugegraph project structure to prepare for merge PD & Store(Breaking Change) Nov 8, 2023
@imbajin imbajin merged commit bce6d05 into apache:master Nov 8, 2023
17 of 21 checks passed
@imbajin imbajin changed the title refact: adjust hugegraph project structure to prepare for merge PD & Store(Breaking Change) refact: adjust project structure for merge PD & Store[Breaking Change] Nov 8, 2023
@VGalaxies VGalaxies deleted the refact-base branch November 10, 2023 02:54
VGalaxies added a commit to VGalaxies/incubator-hugegraph that referenced this pull request Nov 10, 2023
apache#2338)

Subtask of apache#2265.

Adjust the project structure of this repository to include three sub-modules: hugegraph-server, hugegraph-pd, hugegraph-store at the root level.

Roll back to the moment when apache#2266 was merged on `pd-store` and incorporate the latest changes in `master`.

For more detailed information, please refer to apache#2266 (comment).

---------

Co-authored-by: M <87920097+msgui@users.noreply.github.com>
imbajin pushed a commit that referenced this pull request Nov 10, 2023
#2338)

Subtask of #2265.

Adjust the project structure of this repository to include three sub-modules: hugegraph-server, hugegraph-pd, hugegraph-store at the root level.

Roll back to the moment when #2266 was merged on `pd-store` and incorporate the latest changes in `master`.

For more detailed information, please refer to #2266 (comment).

---------

Co-authored-by: M <87920097+msgui@users.noreply.github.com>
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.

4 participants