Improve files structure (#1134)

Signed-off-by: tison <wander4096@gmail.com>
apache · Nov 24, 2022 · f185bef · f185bef
1 parent 6f2def2
commit f185bef
Show file tree

Hide file tree

Showing 25 changed files with 24 additions and 24 deletions.
diff --git a/tools/ci/licenserc.yml → .github/config/licenserc.yml b/tools/ci/licenserc.yml → .github/config/licenserc.yml
diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml
@@ -47,7 +47,7 @@ jobs:
           sudo apt install -y clang-format-12 clang-tidy-12
       - uses: apache/skywalking-eyes/header@v0.4.0
         with:
-          config: tools/ci/licenserc.yml
+          config: .github/config/licenserc.yml
       - name: Check with clang-format
         id: check-format
         run: ./x.py check format --clang-format-path clang-format-12

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -206,7 +206,7 @@ add_executable(kvrocks src/main.cc)
 target_link_libraries(kvrocks PRIVATE kvrocks_objs ${EXTERNAL_LIBS})
 
 # kvrocks2redis sync tool
-file(GLOB KVROCKS2REDIS_SRCS tools/kvrocks2redis/*.cc)
+file(GLOB KVROCKS2REDIS_SRCS utils/kvrocks2redis/*.cc)
 add_executable(kvrocks2redis ${KVROCKS2REDIS_SRCS})
 
 target_link_libraries(kvrocks2redis PRIVATE kvrocks_objs ${EXTERNAL_LIBS})

diff --git a/tools/kvrocks2redis/tests/README.md b/tools/kvrocks2redis/tests/README.md
diff --git a/tools/try_cluster/.gitignore → utils/create-cluster/.gitignore b/tools/try_cluster/.gitignore → utils/create-cluster/.gitignore
diff --git a/tools/try_cluster/try_cluster.sh → utils/create-cluster/create-cluster b/tools/try_cluster/try_cluster.sh → utils/create-cluster/create-cluster
diff --git a/tools/try_cluster/default.conf → utils/create-cluster/default.conf b/tools/try_cluster/default.conf → utils/create-cluster/default.conf
diff --git a/tools/kvrocks2redis/README.md → utils/kvrocks2redis/README.md b/tools/kvrocks2redis/README.md → utils/kvrocks2redis/README.md
diff --git a/tools/kvrocks2redis/config.cc → utils/kvrocks2redis/config.cc b/tools/kvrocks2redis/config.cc → utils/kvrocks2redis/config.cc
diff --git a/tools/kvrocks2redis/config.h → utils/kvrocks2redis/config.h b/tools/kvrocks2redis/config.h → utils/kvrocks2redis/config.h
diff --git a/tools/kvrocks2redis/kvrocks2redis.conf → utils/kvrocks2redis/kvrocks2redis.conf b/tools/kvrocks2redis/kvrocks2redis.conf → utils/kvrocks2redis/kvrocks2redis.conf
diff --git a/tools/kvrocks2redis/main.cc → utils/kvrocks2redis/main.cc b/tools/kvrocks2redis/main.cc → utils/kvrocks2redis/main.cc
diff --git a/tools/kvrocks2redis/parser.cc → utils/kvrocks2redis/parser.cc b/tools/kvrocks2redis/parser.cc → utils/kvrocks2redis/parser.cc
diff --git a/tools/kvrocks2redis/parser.h → utils/kvrocks2redis/parser.h b/tools/kvrocks2redis/parser.h → utils/kvrocks2redis/parser.h
diff --git a/tools/kvrocks2redis/redis_writer.cc → utils/kvrocks2redis/redis_writer.cc b/tools/kvrocks2redis/redis_writer.cc → utils/kvrocks2redis/redis_writer.cc
diff --git a/tools/kvrocks2redis/redis_writer.h → utils/kvrocks2redis/redis_writer.h b/tools/kvrocks2redis/redis_writer.h → utils/kvrocks2redis/redis_writer.h
diff --git a/tools/kvrocks2redis/sync.cc → utils/kvrocks2redis/sync.cc b/tools/kvrocks2redis/sync.cc → utils/kvrocks2redis/sync.cc
diff --git a/tools/kvrocks2redis/sync.h → utils/kvrocks2redis/sync.h b/tools/kvrocks2redis/sync.h → utils/kvrocks2redis/sync.h
diff --git a/utils/kvrocks2redis/tests/README.md b/utils/kvrocks2redis/tests/README.md
@@ -0,0 +1,20 @@
+## Populate data and append new data script
+
+For testing the `kvrocks2redis` utility, manually check generate AOF.
+
+## Usage
+
+* Start `kvrocks` and `kvrocks2redis`
+    * [ ] TODO automatic create docker env
+* Install dependency::
+    * pip install git+https://github.com/andymccurdy/redis-py.git@2.10.3
+* Usage:
+
+```bash
+# populate data
+python populate-kvrocks.py  
+# check generated aof file 
+# append new data 
+python append-data-to-kvrocks.py
+# check appended new aof data  
+```
diff --git a/...cks2redis/tests/append-data-to-kvrocks.py → ...cks2redis/tests/append-data-to-kvrocks.py b/...cks2redis/tests/append-data-to-kvrocks.py → ...cks2redis/tests/append-data-to-kvrocks.py
diff --git a/...s/kvrocks2redis/tests/populate-kvrocks.py → ...s/kvrocks2redis/tests/populate-kvrocks.py b/...s/kvrocks2redis/tests/populate-kvrocks.py → ...s/kvrocks2redis/tests/populate-kvrocks.py
diff --git a/tools/kvrocks2redis/writer.cc → utils/kvrocks2redis/writer.cc b/tools/kvrocks2redis/writer.cc → utils/kvrocks2redis/writer.cc
diff --git a/tools/kvrocks2redis/writer.h → utils/kvrocks2redis/writer.h b/tools/kvrocks2redis/writer.h → utils/kvrocks2redis/writer.h
diff --git a/systemd/kvrocks.service → utils/systemd/kvrocks.service b/systemd/kvrocks.service → utils/systemd/kvrocks.service
diff --git a/x.py b/x.py
@@ -142,8 +142,8 @@ def get_source_files() -> List[str]:
         *glob("src/**/*.cc", recursive=True),
         *glob("tests/cppunit/**/*.h", recursive=True),
         *glob("tests/cppunit/**/*.cc", recursive=True),
-        *glob("tools/kvrocks2redis/**/*.h", recursive=True),
-        *glob("tools/kvrocks2redis/**/*.cc", recursive=True),
+        *glob("utils/kvrocks2redis/**/*.h", recursive=True),
+        *glob("utils/kvrocks2redis/**/*.cc", recursive=True),
     ]