From 8070548ecccf2e2b8bcf7bbac4d0d3319230178d Mon Sep 17 00:00:00 2001
From: Dianjin Wang <wangdianjin@gmail.com>
Date: Thu, 9 Oct 2025 17:33:55 +0800
Subject: [PATCH] Move yyjson dependency to PAX storage directory

Move yyjson from top-level dependency directory to
`contrib/pax_storage/src/cpp/contrib/yyjson` since it's only used by the
PAX storage component. Update all references in CMake build files,
.gitmodules, and documentation to reflect the new location. This change
improves the project structure by keeping PAX-specific dependencies
together and removing the unnecessary top-level dependency directory.

The move includes:
- Moving yyjson directory to contrib/pax_storage/src/cpp/contrib/yyjson
- Updating CMakeLists.txt and pax.cmake to reference the new location
- Updating .gitmodules to reflect the new submodule path
- Updating README.md documentation to show the new location
---
 .gitmodules                                                | 2 +-
 contrib/pax_storage/CMakeLists.txt                         | 2 +-
 contrib/pax_storage/doc/README.md                          | 2 +-
 contrib/pax_storage/src/cpp/cmake/pax.cmake                | 2 +-
 {dependency => contrib/pax_storage/src/cpp/contrib}/yyjson | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename {dependency => contrib/pax_storage/src/cpp/contrib}/yyjson (100%)

diff --git a/.gitmodules b/.gitmodules
index a7b61644ee2..0223f4f460a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,6 +12,6 @@
 	path = contrib/pax_storage/src/cpp/contrib/googlebench
 	url = https://github.com/google/benchmark.git
 [submodule "dependency/yyjson"]
-	path = dependency/yyjson
+	path = contrib/pax_storage/src/cpp/contrib/yyjson
 	url = https://github.com/ibireme/yyjson.git
 
diff --git a/contrib/pax_storage/CMakeLists.txt b/contrib/pax_storage/CMakeLists.txt
index 29c3a347dd8..3ead3e0a4eb 100644
--- a/contrib/pax_storage/CMakeLists.txt
+++ b/contrib/pax_storage/CMakeLists.txt
@@ -105,7 +105,7 @@ if(USE_MANIFEST_API AND NOT USE_PAX_CATALOG)
 
     set(BUILD_SHARED_LIBS ON)
     set(CMAKE_INSTALL_SO_NO_EXE OFF)
-    add_subdirectory(${CMAKE_SOURCE_DIR}/../../dependency/yyjson ${CMAKE_BINARY_DIR}/yyjson_build)
+    add_subdirectory(src/cpp/contrib/yyjson ${CMAKE_BINARY_DIR}/yyjson_build)
 
     set(BUILD_SHARED_LIBS ${SAVED_BUILD_SHARED_LIBS})
     set(CMAKE_INSTALL_SO_NO_EXE ${SAVED_CMAKE_INSTALL_SO_NO_EXE})
diff --git a/contrib/pax_storage/doc/README.md b/contrib/pax_storage/doc/README.md
index 39077955a0c..9e8e8fefb1a 100644
--- a/contrib/pax_storage/doc/README.md
+++ b/contrib/pax_storage/doc/README.md
@@ -54,7 +54,7 @@ git submodule update --init --recursive
 ```
 
 The following submodules will be downloaded for building and tesing PAX:
-- yyjson (`dependency/yyjson`)
+- yyjson (`contrib/pax_storage/src/cpp/contrib/yyjson`)
 - cpp-stub (`contrib/pax_storage/src/cpp/cotnrib`)
 - googlebench (`contrib/pax_storage/src/cpp/cotnrib`)
 - googletest (`contrib/pax_storage/src/cpp/cotnrib`)
diff --git a/contrib/pax_storage/src/cpp/cmake/pax.cmake b/contrib/pax_storage/src/cpp/cmake/pax.cmake
index 099a66f30d8..39e4944eb54 100644
--- a/contrib/pax_storage/src/cpp/cmake/pax.cmake
+++ b/contrib/pax_storage/src/cpp/cmake/pax.cmake
@@ -143,7 +143,7 @@ if (USE_MANIFEST_API)
     set(pax_catalog_src ${pax_catalog_src} catalog/pax_manifest_impl.cc)
   else()
     # use manifest implementation
-    set(pax_target_include ${pax_target_include} ${TOP_DIR}/dependency/yyjson/src)
+    set(pax_target_include ${pax_target_include} ${CMAKE_CURRENT_SOURCE_DIR}/contrib/yyjson/src)
     set(pax_catalog_src ${pax_catalog_src} ${manifest_src})
   endif()
 else() # USE_MANIFEST_API
diff --git a/dependency/yyjson b/contrib/pax_storage/src/cpp/contrib/yyjson
similarity index 100%
rename from dependency/yyjson
rename to contrib/pax_storage/src/cpp/contrib/yyjson