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

refactor(rdsn): remove 'include' directory in rdsn #1189

Merged
merged 1 commit into from
Oct 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .github/workflows/lint_and_test_cpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
run: |
mv thirdparty/hadoop-bin ./
rm -rf thirdparty
tar -zcvhf release__builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini hadoop-bin --exclude='*CMakeFiles*'
tar -zcvhf release__builder.tar src/builder/output src/builder/bin src/builder/src/server/test/config.ini hadoop-bin --exclude='*CMakeFiles*'
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:
run: |
mv thirdparty/hadoop-bin ./
rm -rf thirdparty
tar -zcvhf release_address_builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini hadoop-bin --exclude='*CMakeFiles*'
tar -zcvhf release_address_builder.tar src/builder/output src/builder/bin src/builder/src/server/test/config.ini hadoop-bin --exclude='*CMakeFiles*'
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -341,7 +341,7 @@ jobs:
# run: |
# mv thirdparty/hadoop-bin ./
# rm -rf thirdparty
# tar -zcvhf release_undefined_builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini hadoop-bin --exclude='*CMakeFiles*'
# tar -zcvhf release_undefined_builder.tar src/builder/output src/builder/bin src/builder/src/server/test/config.ini hadoop-bin --exclude='*CMakeFiles*'
# - name: Upload Artifact
# uses: actions/upload-artifact@v3
# with:
Expand Down Expand Up @@ -457,7 +457,7 @@ jobs:
run: |
mv thirdparty/hadoop-bin ./
rm -rf thirdparty
tar -zcvhf release_jemalloc_builder.tar DSN_ROOT/ src/builder/bin src/builder/src/server/test/config.ini hadoop-bin --exclude='*CMakeFiles*'
tar -zcvhf release_jemalloc_builder.tar src/builder/output src/builder/bin src/builder/src/server/test/config.ini hadoop-bin --exclude='*CMakeFiles*'
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
src/.matchfile
src/base/rrdb_types.cpp
src/include/rrdb/rrdb_types.h
src/rdsn/include/dsn/cpp/serialization_helper/dsn.layer2_types.h
src/rdsn/src/common/serialization_helper/dsn.layer2_types.h
src/rdsn/src/runtime/dsn.layer2_types.cpp
src/runtime
src/*builder
Expand All @@ -38,7 +38,6 @@ src/include/pegasus/git_commit.h
src/sample/data
src/sample/pegasus_cpp_sample
test_report
DSN_ROOT
*.config
*.creator
*.creator.*
Expand Down
237 changes: 116 additions & 121 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,27 @@ header:
- 'nodejs-client/src/dsn/*.js'
- '**/.npmigonre'
# Copyright (c) Facebook, Inc
- 'src/rdsn/include/dsn/utility/TokenBucket.h'
- 'src/rdsn/src/utils/TokenBucket.h'
- 'src/rdsn/src/utils/test/TokenBucketTest.cpp'
- 'src/rdsn/src/utils/test/TokenBucketTest.h'
# https://github.com/preshing/cpp11-on-multicore/blob/master/LICENSE
- 'src/rdsn/include/dsn/utility/hpc_locks/autoresetevent.h'
- 'src/rdsn/include/dsn/utility/hpc_locks/autoreseteventcondvar.h'
- 'src/rdsn/include/dsn/utility/hpc_locks/benaphore.h'
- 'src/rdsn/include/dsn/utility/hpc_locks/bitfield.h'
- 'src/rdsn/include/dsn/utility/hpc_locks/readme.txt'
- 'src/rdsn/include/dsn/utility/hpc_locks/rwlock.h'
- 'src/rdsn/include/dsn/utility/hpc_locks/sema.h'
- 'src/rdsn/src/utils/hpc_locks/autoresetevent.h'
- 'src/rdsn/src/utils/hpc_locks/autoreseteventcondvar.h'
- 'src/rdsn/src/utils/hpc_locks/benaphore.h'
- 'src/rdsn/src/utils/hpc_locks/bitfield.h'
- 'src/rdsn/src/utils/hpc_locks/readme.txt'
- 'src/rdsn/src/utils/hpc_locks/rwlock.h'
- 'src/rdsn/src/utils/hpc_locks/sema.h'
# Copyright (c) xxxx The Chromium Authors
- 'src/rdsn/include/dsn/utility/safe_strerror_posix.h'
- 'src/rdsn/src/utils/safe_strerror_posix.h'
- 'src/rdsn/src/runtime/build_config.h'
- 'src/rdsn/src/utils/test/autoref_ptr_test.cpp'
- 'src/rdsn/src/utils/safe_strerror_posix.cpp'
# Copyright 2017 The Abseil Authors
- 'src/rdsn/include/dsn/utility/absl/base/internal/invoke.h'
- 'src/rdsn/include/dsn/utility/absl/utility/utility.h'
- 'src/rdsn/include/dsn/utility/smart_pointers.h'
- 'src/rdsn/include/dsn/utility/string_view.h'
- 'src/rdsn/src/utils/absl/base/internal/invoke.h'
- 'src/rdsn/src/utils/absl/utility/utility.h'
- 'src/rdsn/src/utils/smart_pointers.h'
- 'src/rdsn/src/utils/string_view.h'
- 'src/rdsn/src/utils/test/memutil_test.cpp'
- 'src/rdsn/src/utils/test/string_view_test.cpp'
- 'src/rdsn/src/utils/test/smart_pointers_test.cpp'
Expand Down Expand Up @@ -96,114 +96,109 @@ header:
- 'idl/dsn.thrift'
- 'scripts/compile_thrift.py'
- 'scripts/learn_stat.py'
- 'src/rdsn/include/dsn/c/api_common.h'
- 'src/rdsn/include/dsn/c/api_layer1.h'
- 'src/rdsn/include/dsn/c/api_task.h'
- 'src/rdsn/include/dsn/c/api_utilities.h'
- 'src/rdsn/include/dsn/c/app_model.h'
- 'src/rdsn/include/dsn/cpp/json_helper.h'
- 'src/rdsn/include/dsn/cpp/rpc_stream.h'
- 'src/rdsn/include/dsn/cpp/serialization.h'
- 'src/rdsn/include/dsn/cpp/serialization_helper/dsn.layer2_types.h'
- 'src/rdsn/include/dsn/cpp/serialization_helper/dsn_types.h'
- 'src/rdsn/include/dsn/cpp/serialization_helper/thrift_helper.h'
- 'src/rdsn/include/dsn/cpp/serverlet.h'
- 'src/rdsn/include/dsn/cpp/service_app.h'
- 'src/rdsn/include/dsn/dist/distributed_lock_service.h'
- 'src/rdsn/include/dsn/dist/failure_detector.h'
- 'src/rdsn/include/dsn/dist/failure_detector/failure_detector.h'
- 'src/rdsn/include/dsn/dist/failure_detector/fd.client.h'
- 'src/rdsn/include/dsn/dist/failure_detector/fd.code.definition.h'
- 'src/rdsn/include/dsn/dist/failure_detector/fd.server.h'
- 'src/rdsn/include/dsn/dist/failure_detector_multimaster.h'
- 'src/rdsn/include/dsn/dist/meta_state_service.h'
- 'src/rdsn/include/dsn/dist/nfs_node.h'
- 'src/rdsn/include/dsn/dist/replication.h'
- 'src/rdsn/include/dsn/dist/replication/meta_service_app.h'
- 'src/rdsn/include/dsn/dist/replication/mutation_log_tool.h'
- 'src/rdsn/include/dsn/dist/replication/partition_resolver.h'
- 'src/rdsn/include/dsn/dist/replication/replica_base.h'
- 'src/rdsn/include/dsn/dist/replication/replica_envs.h'
- 'src/rdsn/include/dsn/dist/replication/replica_test_utils.h'
- 'src/rdsn/include/dsn/dist/replication/replication.codes.h'
- 'src/rdsn/include/dsn/dist/replication/replication_app_base.h'
- 'src/rdsn/include/dsn/dist/replication/replication_ddl_client.h'
- 'src/rdsn/include/dsn/dist/replication/replication_enums.h'
- 'src/rdsn/include/dsn/dist/replication/replication_other_types.h'
- 'src/rdsn/include/dsn/dist/replication/replication_service_app.h'
- 'src/rdsn/include/dsn/dist/replication/storage_serverlet.h'
- 'src/rdsn/include/dsn/perf_counter/perf_counter.h'
- 'src/rdsn/include/dsn/perf_counter/perf_counter_wrapper.h'
- 'src/rdsn/include/dsn/perf_counter/perf_counters.h'
- 'src/rdsn/include/dsn/service_api_c.h'
- 'src/rdsn/include/dsn/service_api_cpp.h'
- 'src/rdsn/include/dsn/tool-api/aio_task.h'
- 'src/rdsn/include/dsn/tool-api/async_calls.h'
- 'src/rdsn/include/dsn/tool-api/auto_codes.h'
- 'src/rdsn/include/dsn/tool-api/command_manager.h'
- 'src/rdsn/include/dsn/tool-api/env_provider.h'
- 'src/rdsn/include/dsn/tool-api/file_io.h'
- 'src/rdsn/include/dsn/tool-api/future_types.h'
- 'src/rdsn/include/dsn/tool-api/global_config.h'
- 'src/rdsn/include/dsn/tool-api/gpid.h'
- 'src/rdsn/include/dsn/tool-api/group_address.h'
- 'src/rdsn/include/dsn/tool-api/logging_provider.h'
- 'src/rdsn/include/dsn/tool-api/message_parser.h'
- 'src/rdsn/include/dsn/tool-api/network.h'
- 'src/rdsn/include/dsn/tool-api/rpc_address.h'
- 'src/rdsn/include/dsn/tool-api/rpc_message.h'
- 'src/rdsn/include/dsn/tool-api/task.h'
- 'src/rdsn/include/dsn/tool-api/task_code.h'
- 'src/rdsn/include/dsn/tool-api/task_queue.h'
- 'src/rdsn/include/dsn/tool-api/task_spec.h'
- 'src/rdsn/include/dsn/tool-api/task_tracker.h'
- 'src/rdsn/include/dsn/tool-api/task_worker.h'
- 'src/rdsn/include/dsn/tool-api/thread_access_checker.h'
- 'src/rdsn/include/dsn/tool-api/threadpool_code.h'
- 'src/rdsn/include/dsn/tool-api/threadpool_spec.h'
- 'src/rdsn/include/dsn/tool-api/timer_service.h'
- 'src/rdsn/include/dsn/tool-api/uniq_timestamp_us.h'
- 'src/rdsn/include/dsn/tool-api/zlocks.h'
- 'src/rdsn/include/dsn/tool/nativerun.h'
- 'src/rdsn/include/dsn/tool/node_scoper.h'
- 'src/rdsn/include/dsn/tool/providers.common.h'
- 'src/rdsn/include/dsn/tool/simulator.h'
- 'src/rdsn/include/dsn/tool_api.h'
- 'src/rdsn/include/dsn/toollet/fault_injector.h'
- 'src/rdsn/include/dsn/toollet/profiler.h'
- 'src/rdsn/include/dsn/toollet/tracer.h'
- 'src/rdsn/include/dsn/utility/apply.h'
- 'src/rdsn/include/dsn/utility/autoref_ptr.h'
- 'src/rdsn/include/dsn/utility/binary_reader.h'
- 'src/rdsn/include/dsn/utility/binary_writer.h'
- 'src/rdsn/include/dsn/utility/blob.h'
- 'src/rdsn/include/dsn/utility/chrono_literals.h'
- 'src/rdsn/include/dsn/utility/config_api.h'
- 'src/rdsn/include/dsn/utility/config_helper.h'
- 'src/rdsn/include/dsn/utility/configuration.h'
- 'src/rdsn/include/dsn/utility/crc.h'
- 'src/rdsn/include/dsn/utility/customizable_id.h'
- 'src/rdsn/include/dsn/utility/dlib.h'
- 'src/rdsn/include/dsn/utility/enum_helper.h'
- 'src/rdsn/include/dsn/utility/error_code.h'
- 'src/rdsn/include/dsn/utility/errors.h'
- 'src/rdsn/include/dsn/utility/exp_delay.h'
- 'src/rdsn/include/dsn/utility/extensible_object.h'
- 'src/rdsn/include/dsn/utility/factory_store.h'
- 'src/rdsn/include/dsn/utility/filesystem.h'
- 'src/rdsn/include/dsn/utility/fixed_size_buffer_pool.h'
- 'src/rdsn/include/dsn/utility/function_traits.h'
- 'src/rdsn/include/dsn/utility/join_point.h'
- 'src/rdsn/include/dsn/utility/link.h'
- 'src/rdsn/include/dsn/utility/optional.h'
- 'src/rdsn/include/dsn/utility/ports.h'
- 'src/rdsn/include/dsn/utility/priority_queue.h'
- 'src/rdsn/include/dsn/utility/singleton_store.h'
- 'src/rdsn/include/dsn/utility/strings.h'
- 'src/rdsn/include/dsn/utility/synchronize.h'
- 'src/rdsn/include/dsn/utility/utils.h'
- 'src/rdsn/include/dsn/utility/work_queue.h'
- 'src/rdsn/include/dsn/utils/time_utils.h'
- 'src/rdsn/src/common/api_common.h'
- 'src/rdsn/src/runtime/api_layer1.h'
- 'src/rdsn/src/runtime/api_task.h'
- 'src/rdsn/src/utils/api_utilities.h'
- 'src/rdsn/src/runtime/app_model.h'
- 'src/rdsn/src/common/json_helper.h'
- 'src/rdsn/src/runtime/rpc/rpc_stream.h'
- 'src/rdsn/src/runtime/rpc/serialization.h'
- 'src/rdsn/src/common/serialization_helper/dsn.layer2_types.h'
- 'src/rdsn/src/common/serialization_helper/dsn_types.h'
- 'src/rdsn/src/common/serialization_helper/thrift_helper.h'
- 'src/rdsn/src/runtime/serverlet.h'
- 'src/rdsn/src/runtime/service_app.h'
- 'src/rdsn/src/utils/distributed_lock_service.h'
- 'src/rdsn/src/failure_detector/failure_detector.h'
- 'src/rdsn/src/failure_detector/fd.client.h'
- 'src/rdsn/src/failure_detector/fd.code.definition.h'
- 'src/rdsn/src/failure_detector/fd.server.h'
- 'src/rdsn/src/failure_detector/failure_detector_multimaster.h'
- 'src/rdsn/src/meta/meta_state_service.h'
- 'src/rdsn/src/nfs/nfs_node.h'
- 'src/rdsn/src/meta/meta_service_app.h'
- 'src/rdsn/src/tools/mutation_log_tool.h'
- 'src/rdsn/src/client/partition_resolver.h'
- 'src/rdsn/src/replica/replica_base.h'
- 'src/rdsn/src/common/replica_envs.h'
- 'src/rdsn/src/replica/replica_test_utils.h'
- 'src/rdsn/src/common/replication.codes.h'
- 'src/rdsn/src/replica/replication_app_base.h'
- 'src/rdsn/src/client/replication_ddl_client.h'
- 'src/rdsn/src/common/replication_enums.h'
- 'src/rdsn/src/common/replication_other_types.h'
- 'src/rdsn/src/replica/replication_service_app.h'
- 'src/rdsn/src/common/storage_serverlet.h'
- 'src/rdsn/src/perf_counter/perf_counter.h'
- 'src/rdsn/src/perf_counter/perf_counter_wrapper.h'
- 'src/rdsn/src/perf_counter/perf_counters.h'
- 'src/rdsn/src/aio/aio_task.h'
- 'src/rdsn/src/runtime/task/async_calls.h'
- 'src/rdsn/src/utils/command_manager.h'
- 'src/rdsn/src/runtime/env_provider.h'
- 'src/rdsn/src/aio/file_io.h'
- 'src/rdsn/src/runtime/task/future_types.h'
- 'src/rdsn/src/runtime/global_config.h'
- 'src/rdsn/src/common/gpid.h'
- 'src/rdsn/src/runtime/rpc/group_address.h'
- 'src/rdsn/src/utils/logging_provider.h'
- 'src/rdsn/src/runtime/rpc/message_parser.h'
- 'src/rdsn/src/runtime/rpc/network.h'
- 'src/rdsn/src/utils/rpc_address.h'
- 'src/rdsn/src/runtime/rpc/rpc_message.h'
- 'src/rdsn/src/runtime/task/task.h'
- 'src/rdsn/src/runtime/task/task_code.h'
- 'src/rdsn/src/runtime/task/task_queue.h'
- 'src/rdsn/src/runtime/task/task_spec.h'
- 'src/rdsn/src/runtime/task/task_tracker.h'
- 'src/rdsn/src/runtime/task/task_worker.h'
- 'src/rdsn/src/utils/thread_access_checker.h'
- 'src/rdsn/src/utils/threadpool_code.h'
- 'src/rdsn/src/utils/threadpool_spec.h'
- 'src/rdsn/src/runtime/task/timer_service.h'
- 'src/rdsn/src/utils/uniq_timestamp_us.h'
- 'src/rdsn/src/utils/zlocks.h'
- 'src/rdsn/src/runtime/nativerun.h'
- 'src/rdsn/src/runtime/node_scoper.h'
- 'src/rdsn/src/runtime/providers.common.h'
- 'src/rdsn/src/runtime/simulator.h'
- 'src/rdsn/src/runtime/tool_api.h'
- 'src/rdsn/src/runtime/fault_injector.h'
- 'src/rdsn/src/runtime/profiler.h'
- 'src/rdsn/src/runtime/tracer.h'
- 'src/rdsn/src/utils/apply.h'
- 'src/rdsn/src/utils/autoref_ptr.h'
- 'src/rdsn/src/utils/binary_reader.h'
- 'src/rdsn/src/utils/binary_writer.h'
- 'src/rdsn/src/utils/blob.h'
- 'src/rdsn/src/utils/chrono_literals.h'
- 'src/rdsn/src/utils/config_api.h'
- 'src/rdsn/src/utils/config_helper.h'
- 'src/rdsn/src/utils/configuration.h'
- 'src/rdsn/src/utils/crc.h'
- 'src/rdsn/src/utils/customizable_id.h'
- 'src/rdsn/src/utils/dlib.h'
- 'src/rdsn/src/utils/enum_helper.h'
- 'src/rdsn/src/utils/error_code.h'
- 'src/rdsn/src/utils/errors.h'
- 'src/rdsn/src/utils/exp_delay.h'
- 'src/rdsn/src/utils/extensible_object.h'
- 'src/rdsn/src/utils/factory_store.h'
- 'src/rdsn/src/utils/filesystem.h'
- 'src/rdsn/src/utils/fixed_size_buffer_pool.h'
- 'src/rdsn/src/utils/function_traits.h'
- 'src/rdsn/src/utils/join_point.h'
- 'src/rdsn/src/utils/link.h'
- 'src/rdsn/src/utils/optional.h'
- 'src/rdsn/src/utils/ports.h'
- 'src/rdsn/src/utils/priority_queue.h'
- 'src/rdsn/src/utils/singleton_store.h'
- 'src/rdsn/src/utils/strings.h'
- 'src/rdsn/src/utils/synchronize.h'
- 'src/rdsn/src/utils/utils.h'
- 'src/rdsn/src/utils/work_queue.h'
- 'src/rdsn/src/utils/time_utils.h'
- 'src/rdsn/src/aio/CMakeLists.txt'
- 'src/rdsn/src/aio/aio_provider.cpp'
- 'src/rdsn/src/aio/aio_provider.h'
Expand Down
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ set(THIRDPARTY_ROOT ${PROJECT_ROOT}/thirdparty)
set(THIRDPARTY_INSTALL_DIR ${PROJECT_ROOT}/thirdparty/output)
message(STATUS "THIRDPARTY_INSTALL_DIR = ${THIRDPARTY_INSTALL_DIR}")

# TODO(yingchun): we will remove it later
# Set DSN_ROOT to ./DSN_ROOT, this is where rdsn will be installed
set(DSN_ROOT ${PROJECT_ROOT}/DSN_ROOT)
message(STATUS "DSN_ROOT = ${DSN_ROOT}")

set(BUILD_DIR ${PROJECT_ROOT}/src/builder)
message(STATUS "BUILD_DIR = ${BUILD_DIR}")

Expand Down
24 changes: 12 additions & 12 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,10 @@ src/shell/argh.h - BSD-3-Clause License

--------------------------------------------------------------------------------

src/rdsn/include/dsn/utility/smart_pointers.h - Apache 2.0 License
src/rdsn/include/dsn/utility/string_view.h
src/rdsn/include/dsn/utility/absl/base/internal/invoke.h
src/rdsn/include/dsn/utility/absl/utility/utility.h
src/rdsn/src/utils/smart_pointers.h - Apache 2.0 License
src/rdsn/utils/string_view.h
src/rdsn/src/utils/absl/base/internal/invoke.h
src/rdsn/src/utils/absl/utility/utility.h
src/rdsn/src/utils/memutil.h
src/rdsn/src/utils/string_view.cpp
src/rdsn/src/utils/test/memutil_test.cpp
Expand Down Expand Up @@ -385,7 +385,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------

src/rdsn/include/dsn/utility/TokenBucket.h - Apache License, Version 2.0
src/rdsn/src/utils/TokenBucket.h - Apache License, Version 2.0
src/rdsn/src/utils/test/TokenBucketTest.cpp
src/rdsn/src/utils/test/TokenBucketTest.h

Expand All @@ -405,12 +405,12 @@ limitations under the License.

--------------------------------------------------------------------------------

src/rdsn/include/dsn/utility/hpc_locks/autoreseteventcondvar.h - zlib License
src/rdsn/include/dsn/utility/hpc_locks/rwlock.h
src/rdsn/include/dsn/utility/hpc_locks/autoresetevent.h
src/rdsn/include/dsn/utility/hpc_locks/sema.h
src/rdsn/include/dsn/utility/hpc_locks/bitfield.h
src/rdsn/include/dsn/utility/hpc_locks/benaphore.h
src/rdsn/src/utils/hpc_locks/autoreseteventcondvar.h - zlib License
src/rdsn/src/utils/hpc_locks/rwlock.h
src/rdsn/src/utils/hpc_locks/autoresetevent.h
src/rdsn/src/utils/hpc_locks/sema.h
src/rdsn/src/utils/hpc_locks/bitfield.h
src/rdsn/src/utils/hpc_locks/benaphore.h

Copyright (c) 2015 Jeff Preshing

Expand Down Expand Up @@ -532,7 +532,7 @@ SOFTWARE.

--------------------------------------------------------------------------------

src/rdsn/include/dsn/utility/safe_strerror_posix.h - BSD-3-Clause License
src/rdsn/src/utils/safe_strerror_posix.h - BSD-3-Clause License

Copyright (c) 2011 The Chromium Authors. All rights reserved.

Expand Down
Loading