refactor: Move some common files out of rdsn directory

.gitignore

@@ -16,7 +16,14 @@
 # under the License.
 
 src/.matchfile
+src/base/rrdb_types.cpp
+src/include/rrdb/rrdb_types.h
+src/rdsn/builder/
+src/rdsn/include/dsn/cpp/serialization_helper/dsn.layer2_types.h
+src/rdsn/src/runtime/dsn.layer2_types.cpp
+src/runtime
 src/builder
+
 onebox/
 .zk_install/
 *.data/
@@ -263,9 +270,4 @@ package-lock.json
 #go
 go-client/bin
 
-# rdsn
-rdsn/builder
-thirdparty/build
-thirdparty/output
-rdsn/cmake-build-debug
-rdsn/test_reports
+thirdparty/output/

.licenserc.yaml

@@ -94,9 +94,11 @@ header:
     - 'src/rdsn/src/utils/test/config-empty.ini'
     # The MIT License (MIT), Copyright (c) 2015 Microsoft Corporation
     - 'cmake_modules/BaseFunctions.cmake'
+    - 'docs/rdsn-README.md'
+    - 'scripts/compile_thrift.py'
     - 'scripts/learn_stat.py'
-    - 'src/rdsn/README.md'
-    - 'src/rdsn/compile_thrift.py'
+    - 'src/idl/dsn.layer2.thrift'
+    - 'src/idl/dsn.thrift'
     - 'src/rdsn/include/dsn/c/api_common.h'
     - 'src/rdsn/include/dsn/c/api_layer1.h'
     - 'src/rdsn/include/dsn/c/api_task.h'
@@ -234,8 +236,6 @@ header:
     - 'src/rdsn/src/common/test/duplication_common_test.cpp'
     - 'src/rdsn/src/common/test/main.cpp'
     - 'src/rdsn/src/common/test/run.sh'
-    - 'src/rdsn/src/dsn.layer2.thrift'
-    - 'src/rdsn/src/dsn.thrift'
     - 'src/rdsn/src/failure_detector/failure_detector.cpp'
     - 'src/rdsn/src/failure_detector/failure_detector_multimaster.cpp'
     - 'src/rdsn/src/failure_detector/fd.thrift'

src/rdsn/src/dsn.layer2.thrift → idl/dsn.layer2.thrift

@@ -26,6 +26,7 @@
 
 include "dsn.thrift"
 
+# TODO(yingchun): reuse the idls for server and all client libs
 namespace cpp dsn
 
 struct partition_configuration

run.sh

@@ -249,9 +249,8 @@ function run_build()
     fi
 
     echo "INFO: Start build rdsn..."
-    cd $ROOT/src/rdsn
     echo "Gen rdsn thrift"
-    python3 compile_thrift.py
+    python3 $ROOT/scripts/compile_thrift.py
     BUILD_DIR="$ROOT/src/rdsn/builder"
     if [ "$CLEAR" == "YES" ]; then
         echo "Clear $BUILD_DIR ..."
@@ -285,9 +284,7 @@ function run_build()
 
     echo "INFO: start build pegasus..."
     echo "Gen pegasus thrift"
-    pushd $ROOT/src/idl
-    sh recompile_thrift.sh
-    popd
+    sh scripts/recompile_thrift.sh
 
     cd "$ROOT/src"
     PEGASUS_GIT_COMMIT="non-git-repo"

src/rdsn/compile_thrift.py → scripts/compile_thrift.py

@@ -36,7 +36,7 @@
 thrift_description = [
     {
         "name": "dsn.layer2",
-        "path": "src",
+        "path": "idl",
         "include_fix": {
             "_types.h": {
                 "add": ["<dsn/cpp/serialization_helper/dsn_types.h>"],
@@ -48,8 +48,8 @@
             }
         },
         "file_move": {
-            "_types.h": "include/dsn/cpp/serialization_helper",
-            "_types.cpp": "src/runtime"
+            "_types.h": "src/rdsn/include/dsn/cpp/serialization_helper",
+            "_types.cpp": "src/rdsn/src/runtime"
         }
     },
 ]
@@ -219,8 +219,8 @@ def add_hook(name, path, func, args):
 
 
 if __name__ == "__main__":
-    thrift_exe = os.getcwd() + "/../../thirdparty/output/bin/thrift"
     root_dir = os.getcwd()
+    thrift_exe = root_dir + "/thirdparty/output/bin/thrift"
     print("thrift_exe = " + thrift_exe)
     print("root_dir = " + root_dir)
 
@@ -230,11 +230,8 @@ def add_hook(name, path, func, args):
 
     ctor_kv_pair = "  kv_pair(const std::string& _key, const std::string& _val): key(_key), value(_val) {\n  }"
     ctor_configuration_proposal_action = "  configuration_proposal_action(::dsn::rpc_address t, ::dsn::rpc_address n, config_type::type tp): target(t), node(n), type(tp) {}"
-    add_hook("simple_kv", "src/replica/storage/simple_kv", constructor_hook,
-             ["simple_kv_types.h", "kv_pair", ctor_kv_pair])
-    add_hook("replication", "src/", constructor_hook,
-             ["replication_types.h", "configuration_proposal_action", ctor_configuration_proposal_action])
-    add_hook("dsn.layer2", "src", replace_hook, ["dsn.layer2_types.h", {
+
+    add_hook("dsn.layer2", "idl", replace_hook, ["dsn.layer2_types.h", {
              r"dsn\.layer2_TYPES_H": 'dsn_layer2_TYPES_H'}])
 
     for i in thrift_description:

src/idl/recompile_thrift.sh → scripts/recompile_thrift.sh

@@ -17,7 +17,7 @@
 # under the License.
 
 cd `dirname $0`
-THIRDPARTY_ROOT=../../thirdparty
+THIRDPARTY_ROOT=../thirdparty
 
 if [ ! -d "$THIRDPARTY_ROOT" ]; then
   echo "ERROR: THIRDPARTY_ROOT not set"
@@ -28,16 +28,12 @@ TMP_DIR=./tmp
 rm -rf $TMP_DIR
 
 mkdir -p $TMP_DIR
-$THIRDPARTY_ROOT/output/bin/thrift --gen cpp:moveable_types -out $TMP_DIR rrdb.thrift
+$THIRDPARTY_ROOT/output/bin/thrift --gen cpp:moveable_types -out $TMP_DIR ../idl/rrdb.thrift
 
-sed 's/#include "dsn_types.h"/#include <dsn\/service_api_cpp.h>/' $TMP_DIR/rrdb_types.h > ../include/rrdb/rrdb_types.h
-sed 's/#include "rrdb_types.h"/#include <rrdb\/rrdb_types.h>/' $TMP_DIR/rrdb_types.cpp > ../base/rrdb_types.cpp
+sed 's/#include "dsn_types.h"/#include <dsn\/service_api_cpp.h>/' $TMP_DIR/rrdb_types.h > ../src/include/rrdb/rrdb_types.h
+sed 's/#include "rrdb_types.h"/#include <rrdb\/rrdb_types.h>/' $TMP_DIR/rrdb_types.cpp > ../src/base/rrdb_types.cpp
 
 rm -rf $TMP_DIR
 
-echo
-echo "You should manually modify these files:"
-echo "  src/include/rrdb/rrdb.code.definition.h"
-echo "  src/include/rrdb/rrdb.client.h"
 echo
 echo "done"

src/rdsn/src/common/backup.thrift

@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-include "../dsn.thrift"
-include "../dsn.layer2.thrift"
+include "../../../../idl/dsn.thrift"
+include "../../../../idl/dsn.layer2.thrift"
 
 namespace cpp dsn.replication
 

src/rdsn/src/common/bulk_load.thrift

@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-include "../dsn.thrift"
-include "../dsn.layer2.thrift"
+include "../../../../idl/dsn.thrift"
+include "../../../../idl/dsn.layer2.thrift"
 include "metadata.thrift"
 
 namespace cpp dsn.replication

src/rdsn/src/common/consensus.thrift

@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-include "../dsn.thrift"
-include "../dsn.layer2.thrift"
+include "../../../../idl/dsn.thrift"
+include "../../../../idl/dsn.layer2.thrift"
 include "metadata.thrift"
 
 namespace cpp dsn.replication

src/rdsn/src/common/duplication.thrift

@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-include "../dsn.thrift"
-include "../dsn.layer2.thrift"
+include "../../../../idl/dsn.thrift"
+include "../../../../idl/dsn.layer2.thrift"
 
 namespace cpp dsn.replication
 

src/rdsn/src/common/meta_admin.thrift

@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-include "../dsn.thrift"
-include "../dsn.layer2.thrift"
+include "../../../../idl/dsn.thrift"
+include "../../../../idl/dsn.layer2.thrift"
 include "metadata.thrift"
 
 namespace cpp dsn.replication

src/rdsn/src/common/metadata.thrift

@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-include "../dsn.thrift"
-include "../dsn.layer2.thrift"
+include "../../../../idl/dsn.thrift"
+include "../../../../idl/dsn.layer2.thrift"
 
 namespace cpp dsn.replication
 

src/rdsn/src/common/partition_split.thrift

@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-include "../dsn.thrift"
-include "../dsn.layer2.thrift"
+include "../../../../idl/dsn.thrift"
+include "../../../../idl/dsn.layer2.thrift"
 include "metadata.thrift"
 
 namespace cpp dsn.replication

src/rdsn/src/common/replica_admin.thrift

@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-include "../dsn.thrift"
-include "../dsn.layer2.thrift"
+include "../../../../idl/dsn.thrift"
+include "../../../../idl/dsn.layer2.thrift"
 include "metadata.thrift"
 
 namespace cpp dsn.replication

src/rdsn/src/failure_detector/fd.thrift

@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-include "../dsn.thrift"
+include "../../../../idl/dsn.thrift"
 
 namespace cpp dsn.fd
 

src/rdsn/src/nfs/nfs.thrift

@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-include "../dsn.thrift"
+include "../../../../idl/dsn.thrift"
 
 namespace cpp dsn.service
 

src/rdsn/src/runtime/security/security.thrift

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-include "../../dsn.thrift"
+include "../../../../../idl/dsn.thrift"
 
 namespace cpp dsn.security