Skip to content

Commit

Permalink
refactor(rdsn): flatten source code directory by moving files from 's…
Browse files Browse the repository at this point in the history
…rc/rdsn/src/*' to 'src/*' (#1190)
  • Loading branch information
acelyc111 authored Oct 22, 2022
1 parent f9c85bf commit e52e879
Show file tree
Hide file tree
Showing 893 changed files with 664 additions and 688 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
src/.matchfile
src/base/rrdb_types.cpp
src/include/rrdb/rrdb_types.h
src/rdsn/src/common/serialization_helper/dsn.layer2_types.h
src/rdsn/src/runtime/dsn.layer2_types.cpp
src/common/serialization_helper/dsn.layer2_types.h
src/runtime/dsn.layer2_types.cpp
src/runtime
src/*builder

Expand Down
1,180 changes: 590 additions & 590 deletions .licenserc.yaml

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ limitations under the License.

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

src/rdsn/** - MIT License
** - MIT License

The MIT License (MIT)

Expand Down Expand Up @@ -327,15 +327,15 @@ src/shell/argh.h - BSD-3-Clause License

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

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
src/rdsn/src/utils/test/smart_pointers_test.cpp
src/rdsn/src/utils/test/string_view_test.cpp
src/utils/smart_pointers.h - Apache 2.0 License
src/utils/string_view.h
src/utils/absl/base/internal/invoke.h
src/utils/absl/utility/utility.h
src/utils/memutil.h
src/utils/string_view.cpp
src/utils/test/memutil_test.cpp
src/utils/test/smart_pointers_test.cpp
src/utils/test/string_view_test.cpp

Copyright 2017 The Abseil Authors.

Expand All @@ -353,7 +353,7 @@ limitations under the License.

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

src/rdsn/src/utils/safe_strerror_posix.cpp - BSD-3-Clause License
src/utils/safe_strerror_posix.cpp - BSD-3-Clause License

Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.

Expand Down Expand Up @@ -385,9 +385,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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

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
src/utils/TokenBucket.h - Apache License, Version 2.0
src/utils/test/TokenBucketTest.cpp
src/utils/test/TokenBucketTest.h

Copyright (c) Facebook, Inc. and its affiliates.

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

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

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
src/utils/hpc_locks/autoreseteventcondvar.h - zlib License
src/utils/hpc_locks/rwlock.h
src/utils/hpc_locks/autoresetevent.h
src/utils/hpc_locks/sema.h
src/utils/hpc_locks/bitfield.h
src/utils/hpc_locks/benaphore.h

Copyright (c) 2015 Jeff Preshing

Expand All @@ -432,8 +432,8 @@ freely, subject to the following restrictions:

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

src/rdsn/src/runtime/build_config.h - BSD-3-Clause License
src/rdsn/src/utils/test/autoref_ptr_test.cpp
src/runtime/build_config.h - BSD-3-Clause License
src/utils/test/autoref_ptr_test.cpp

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

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

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion cmake_modules/CompilerInfo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# Sets COMPILER_VERSION to the version

include(CMakeDetermineCXXCompiler)
message("Running rdsn/bin/compiler_info.cmake")
message("Running CompilerInfo.cmake")
execute_process(COMMAND env LANG=C "${CMAKE_CXX_COMPILER}" -v
ERROR_VARIABLE COMPILER_VERSION_FULL)
message(${COMPILER_VERSION_FULL})
Expand Down
4 changes: 2 additions & 2 deletions scripts/compile_thrift.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
}
},
"file_move": {
"_types.h": "src/rdsn/src/common/serialization_helper",
"_types.cpp": "src/rdsn/src/runtime"
"_types.h": "src/common/serialization_helper",
"_types.cpp": "src/runtime"
}
},
]
Expand Down
35 changes: 27 additions & 8 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,44 @@ project(pegasus C CXX)

set(PEGASUS_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR})

set(DSN_BUILD_RUNTIME TRUE)

dsn_common_setup()

if(UNIX)
add_compile_options(-fPIC)
endif()

include_directories(${PEGASUS_PROJECT_DIR})
include_directories(${PEGASUS_PROJECT_DIR}/common/serialization_helper)
include_directories(${PEGASUS_PROJECT_DIR}/include)
include_directories(${PEGASUS_PROJECT_DIR}/rdsn/src)
include_directories(${PEGASUS_PROJECT_DIR}/rdsn/src/common/serialization_helper)

add_subdirectory(rdsn/src)
add_subdirectory(aio)
add_subdirectory(base)
add_subdirectory(reporter)
add_subdirectory(base/test)
add_subdirectory(block_service)
add_subdirectory(client)
add_subdirectory(client_lib)
add_subdirectory(common)
add_subdirectory(failure_detector)
add_subdirectory(geo)
add_subdirectory(http)
add_subdirectory(meta)
add_subdirectory(nfs)
add_subdirectory(perf_counter)
add_subdirectory(redis_protocol)
add_subdirectory(remote_cmd)
add_subdirectory(replica)
add_subdirectory(reporter)
add_subdirectory(runtime)
add_subdirectory(sample)
add_subdirectory(server)
add_subdirectory(server/test)
add_subdirectory(shell)
add_subdirectory(geo)
add_subdirectory(redis_protocol)
add_subdirectory(test/bench_test)
add_subdirectory(test/function_test)
add_subdirectory(test/kill_test)
add_subdirectory(test/pressure_test)
add_subdirectory(test/bench_test)
add_subdirectory(sample)
add_subdirectory(tools)
add_subdirectory(utils)
add_subdirectory(zookeeper)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
// specific language governing permissions and limitations
// under the License.

include "../../../../idl/dsn.thrift"
include "../../../../idl/dsn.layer2.thrift"
include "../../idl/dsn.thrift"
include "../../idl/dsn.layer2.thrift"

namespace cpp dsn.replication

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
// specific language governing permissions and limitations
// under the License.

include "../../../../idl/dsn.thrift"
include "../../../../idl/dsn.layer2.thrift"
include "../../idl/dsn.thrift"
include "../../idl/dsn.layer2.thrift"
include "metadata.thrift"

namespace cpp dsn.replication
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* THE SOFTWARE.
*/

include "../../../../idl/dsn.thrift"
include "../../../../idl/dsn.layer2.thrift"
include "../../idl/dsn.thrift"
include "../../idl/dsn.layer2.thrift"
include "metadata.thrift"

namespace cpp dsn.replication
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
// specific language governing permissions and limitations
// under the License.

include "../../../../idl/dsn.thrift"
include "../../../../idl/dsn.layer2.thrift"
include "../../idl/dsn.thrift"
include "../../idl/dsn.layer2.thrift"

namespace cpp dsn.replication

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* THE SOFTWARE.
*/

include "../../../../idl/dsn.thrift"
include "../../../../idl/dsn.layer2.thrift"
include "../../idl/dsn.thrift"
include "../../idl/dsn.layer2.thrift"
include "metadata.thrift"

namespace cpp dsn.replication
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* THE SOFTWARE.
*/

include "../../../../idl/dsn.thrift"
include "../../../../idl/dsn.layer2.thrift"
include "../../idl/dsn.thrift"
include "../../idl/dsn.layer2.thrift"

namespace cpp dsn.replication

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
// specific language governing permissions and limitations
// under the License.

include "../../../../idl/dsn.thrift"
include "../../../../idl/dsn.layer2.thrift"
include "../../idl/dsn.thrift"
include "../../idl/dsn.layer2.thrift"
include "metadata.thrift"

namespace cpp dsn.replication
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* THE SOFTWARE.
*/

include "../../../../idl/dsn.thrift"
include "../../../../idl/dsn.layer2.thrift"
include "../../idl/dsn.thrift"
include "../../idl/dsn.layer2.thrift"
include "metadata.thrift"

namespace cpp dsn.replication
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* THE SOFTWARE.
*/

include "../../../../idl/dsn.thrift"
include "../../idl/dsn.thrift"

namespace cpp dsn.fd

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/rdsn/src/nfs/nfs.thrift → src/nfs/nfs.thrift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* THE SOFTWARE.
*/

include "../../../../idl/dsn.thrift"
include "../../idl/dsn.thrift"

namespace cpp dsn.service

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
43 changes: 0 additions & 43 deletions src/rdsn/src/CMakeLists.txt

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit e52e879

Please sign in to comment.