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 hugegraph project structure to prepare for merge #2266

Merged
merged 4 commits into from
Aug 5, 2023

Conversation

VGalaxies
Copy link
Contributor

@VGalaxies VGalaxies commented Aug 3, 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

The following files are currently in the root directory of this repository:

.
├── BUILDING.md
├── CONTRIBUTING.md
├── DISCLAIMER
├── Dockerfile
├── LICENSE
├── NOTICE
├── README.md
├── hugegraph-api
├── hugegraph-cassandra
├── hugegraph-core
├── hugegraph-dist
├── hugegraph-example
├── hugegraph-hbase
├── hugegraph-mysql
├── hugegraph-palo
├── hugegraph-postgresql
├── hugegraph-rocksdb
├── hugegraph-scylladb
├── hugegraph-style.xml
├── hugegraph-test
├── pom.xml
└── style

After adjusting the project structure, the existing sub-modules will be moved to the hugegraph-server folder, and two new folders, hugegraph-pd and hugegraph-store, are added for future integration (add empty README.md files in these folders for being tracked by git).

.
├── BUILDING.md
├── CONTRIBUTING.md
├── DISCLAIMER
├── Dockerfile
├── LICENSE
├── NOTICE
├── README.md
├── hugegraph-pd
│   └── README.md
├── hugegraph-server
│   ├── hugegraph-api
│   ├── hugegraph-cassandra
│   ├── hugegraph-core
│   ├── hugegraph-dist
│   ├── hugegraph-example
│   ├── hugegraph-hbase
│   ├── hugegraph-mysql
│   ├── hugegraph-palo
│   ├── hugegraph-postgresql
│   ├── hugegraph-rocksdb
│   ├── hugegraph-scylladb
│   └── hugegraph-test
├── hugegraph-store
│   └── README.md
├── hugegraph-style.xml
├── pom.xml
└── style

This PR also establishes a basic pom hierarchy for maven to recognize changes in the project structure. It is important to note that this PR changed the revision property to 1.5.0, which caused the maven build to fail. After changing it to 1.0.0, the sub-module hugegraph-server (formerly the parent module) can still be successfully built.

The remaining configuration files in the root directory will be adjusted in subsequent PRs.

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

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

@imbajin
Copy link
Member

imbajin commented Aug 3, 2023

Note: If u'r not the first time to pull/switch code, u may find the empty (outdated) dir leave in the path, try to use git clean -fdx -i to select & clean them gracefully 🗝️

image

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.

LGTM, and attach the pic
image

@imbajin
Copy link
Member

imbajin commented Aug 5, 2023

TODO:
image
@msgui we need fix the CI problem later, could take a look for it

@imbajin imbajin merged commit 49a1acf into apache:pd-store Aug 5, 2023
2 of 19 checks passed
@imbajin
Copy link
Member

imbajin commented Aug 9, 2023

@javeme as PR #2265 says:

we will submit this PR merge to master branch soon, it only adjust the server level, and firstly we only include root-server + 2 README file to occupy 2 modules

image

To avoid different module paths may take side-effect for new PRs

imbajin pushed a commit that referenced this pull request Nov 8, 2023
#2338)

## 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).


---------

Co-authored-by: M <87920097+msgui@users.noreply.github.com>
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
dependencies Incompatible dependencies of package feature New feature java11 Upgrade to java 11+
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants