From 1ad621db0f05d8bcae4a737c9c71f9161a23cf04 Mon Sep 17 00:00:00 2001
From: malavan <malavan@eqalpha.com>
Date: Thu, 19 Aug 2021 17:22:09 +0000
Subject: [PATCH 1/4] public copy of rocksdb

Former-commit-id: 50bbadcab6d2911fb9cbe15aef03c9762aa91280
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 10f6aca73..4c6d6c2fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "deps/rocksdb"]
 	path = deps/rocksdb
-	url = https://gitlab.eqalpha.com/keydb-dev/rocksdb.git
+	url = https://gitlab.eqalpha.com/submodules/rocksdb.git
 [submodule "deps/depot_tools"]
 	path = deps/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git

From 76ce7ae47a30374b9347282036709ee52b060079 Mon Sep 17 00:00:00 2001
From: malavan <malavan@eqalpha.com>
Date: Thu, 19 Aug 2021 17:42:52 +0000
Subject: [PATCH 2/4] add branch for git submodule

Former-commit-id: b4471308f1cf99b0a5a4c8c8da8ccf9546123e3f
---
 .gitmodules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmodules b/.gitmodules
index 4c6d6c2fc..26782f10f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "deps/rocksdb"]
 	path = deps/rocksdb
 	url = https://gitlab.eqalpha.com/submodules/rocksdb.git
+	branch = keydb_v6
 [submodule "deps/depot_tools"]
 	path = deps/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git

From 9192272cd86423f7cb462dbf65b964c68f430dad Mon Sep 17 00:00:00 2001
From: malavan <malavan@eqalpha.com>
Date: Thu, 19 Aug 2021 17:45:37 +0000
Subject: [PATCH 3/4] use --init instead of git submodule init

Former-commit-id: e5582ddf313a6bdd2ae0cb68da980954caf83e1b
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8742a73b2..db776c60f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build:
     - docker
   stage: build
   script:
-    - git submodule init && git submodule update
+    - git submodule update --remote --init
     - make distclean
     - make -j
   artifacts:
@@ -113,7 +113,7 @@ endurance-test:
     - docker
   stage: test
   script:
-    - git submodule init && git submodule update
+    - git submodule update --remote --init
     - make distclean
     - make -j
     - ./runtest --config server-threads 3 --loop --stop
@@ -125,7 +125,7 @@ coverage-test:
     - docker
   stage: test
   script:
-    - git submodule init && git submodule update
+    - git submodule update --remote --init
     - make distclean
     - make gcov -j
     - make install

From 4d7266804572bbd6f49fb9529d0e09b6321a0530 Mon Sep 17 00:00:00 2001
From: malavan <malavan@eqalpha.com>
Date: Thu, 19 Aug 2021 17:47:23 +0000
Subject: [PATCH 4/4] use --init instead of git submodule init

Former-commit-id: 967866c56c9d4590d72c63169d0e3c32c21b24e0
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db776c60f..4f704245e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build:
     - docker
   stage: build
   script:
-    - git submodule update --remote --init
+    - git submodule update --init --remote
     - make distclean
     - make -j
   artifacts:
@@ -113,7 +113,7 @@ endurance-test:
     - docker
   stage: test
   script:
-    - git submodule update --remote --init
+    - git submodule update --init --remote
     - make distclean
     - make -j
     - ./runtest --config server-threads 3 --loop --stop
@@ -125,7 +125,7 @@ coverage-test:
     - docker
   stage: test
   script:
-    - git submodule update --remote --init
+    - git submodule update --init --remote
     - make distclean
     - make gcov -j
     - make install