[chore][client] Adjust code dir struct.

Author: rock-git

src/cache/common/CMakeLists.txt

@@ -23,5 +23,5 @@ target_link_libraries(cache_common
 
     dingofs_status
     dingofs_common
-    vfs_meta_v2_rpc_lib
+    vfs_meta_mds_rpc_lib
 )

src/cache/common/mds_client.cpp

@@ -35,8 +35,8 @@
 
 #include "cache/common/macro.h"
 #include "cache/utils/helper.h"
-#include "client/vfs/meta/v2/mds_discovery.h"
-#include "client/vfs/meta/v2/rpc.h"
+#include "client/vfs/metasystem/mds/mds_discovery.h"
+#include "client/vfs/metasystem/mds/rpc.h"
 #include "common/status.h"
 #include "dingofs/cachegroup.pb.h"
 #include "dingofs/error.pb.h"

src/cache/common/mds_client.h

@@ -26,8 +26,8 @@
 #include <cstdint>
 #include <string>
 
-#include "client/vfs/meta/v2/mds_discovery.h"
-#include "client/vfs/meta/v2/rpc.h"
+#include "client/vfs/metasystem/mds/mds_discovery.h"
+#include "client/vfs/metasystem/mds/rpc.h"
 #include "common/status.h"
 #include "dingofs/mds.pb.h"
 #include "mds/mds/mds_meta.h"

src/client/CMakeLists.txt

@@ -13,21 +13,17 @@
 # limitations under the License.
 
 add_subdirectory(memory)
-add_subdirectory(meta)
 add_subdirectory(vfs)
 
 file(GLOB FUSE_CLIENT_LIB_SRCS
-    "vfs_wrapper/access_log.cpp"
-    "vfs_wrapper/access_wrapper.cpp"
-    "vfs_wrapper/vfs_wrapper.cpp"
     "fuse/fuse_op.cpp"
     "fuse/fuse_server.cpp"
 )
 
 add_library(fuse_client_lib ${FUSE_CLIENT_LIB_SRCS})
 target_link_libraries(fuse_client_lib
     PROTO_OBJS
-    vfs_meta
+    
     vfs_lib
     block_accesser
     dingofs_metrics

src/client/const.h renamed to src/client/common/const.h

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef DINGOFS_CLIENT_COMMON_CONST_H_
+#define DINGOFS_CLIENT_COMMON_CONST_H_
+
 #include "fmt/format.h"
 #include "glog/logging.h"
 #include "options/common/dynamic_vlog.h"
@@ -48,4 +51,6 @@ static int InitLog(const char* argv0, const std::string& conf_path) {
   google::InitGoogleLogging(argv0);
 
   return 0;
-}
+}
+
+#endif  // DINGOFS_CLIENT_COMMON_CONST_H_

src/client/vfs_wrapper/global_log.h renamed to src/client/common/global_log.h

@@ -23,9 +23,9 @@
 
 #include "absl/strings/str_format.h"
 #include "client/common/utils.h"
-#include "client/meta/vfs_meta.h"
 #include "client/vfs/common/helper.h"
-#include "client/vfs_wrapper/vfs_wrapper.h"
+#include "client/vfs/vfs_meta.h"
+#include "client/vfs/vfs_wrapper.h"
 #include "common/define.h"
 #include "common/status.h"
 #include "fmt/format.h"

src/client/fuse/fuse_op.cpp

@@ -18,9 +18,9 @@
 #include <cstdlib>
 
 #include "absl/cleanup/cleanup.h"
+#include "client/common/global_log.h"
 #include "client/fuse/fuse_op.h"
 #include "client/fuse/fuse_server.h"
-#include "client/vfs_wrapper/global_log.h"
 #include "options/client/option.h"
 #include "utils/configuration.h"