From c92c202512491ac677183bd625fd2d9d0809e140 Mon Sep 17 00:00:00 2001
From: malavan <malavan@eqalpha.com>
Date: Wed, 18 Aug 2021 15:18:51 +0000
Subject: [PATCH 1/5] upgrade to latest version of rocksdb

Former-commit-id: 9272e412acecc7d032c6299fb815c84c15fb0e2d
---
 deps/rocksdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/rocksdb b/deps/rocksdb
index e3169e3ea..c3034fce3 160000
--- a/deps/rocksdb
+++ b/deps/rocksdb
@@ -1 +1 @@
-Subproject commit e3169e3ea8762d2f34880742106858a23c8dc8b7
+Subproject commit c3034fce329017036c807e01261729bfc11a5d62

From 230767b8945acb26b5d4576aa6f75645bd1f9a5d Mon Sep 17 00:00:00 2001
From: malavan <malavan@eqalpha.com>
Date: Mon, 23 Aug 2021 17:04:01 +0000
Subject: [PATCH 2/5] newest version of rocksdb

Former-commit-id: e384baa62e50a5caa0cdc779f2b8554ce8d8b375
---
 deps/rocksdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/rocksdb b/deps/rocksdb
index c3034fce3..8c9e68979 160000
--- a/deps/rocksdb
+++ b/deps/rocksdb
@@ -1 +1 @@
-Subproject commit c3034fce329017036c807e01261729bfc11a5d62
+Subproject commit 8c9e689790ad2205670325378621edd13a4c7a7f

From ec75788516cef4766535e975cb87c193581efc2e Mon Sep 17 00:00:00 2001
From: malavan <malavan@eqalpha.com>
Date: Mon, 23 Aug 2021 21:30:16 +0000
Subject: [PATCH 3/5] add a few more flash tests

Former-commit-id: b19fdc23a9a39ae718580feae5049f6906caec28
---
 tests/unit/flash.tcl | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/unit/flash.tcl b/tests/unit/flash.tcl
index 1988d307a..ea3c8e9fe 100644
--- a/tests/unit/flash.tcl
+++ b/tests/unit/flash.tcl
@@ -12,6 +12,16 @@ start_server [list tags {flash} overrides [list storage-provider {flash ./rocks.
         assert_equal {0} [r dbsize] "Key count is accurate after non-existant delete"
     }
 
+    test { DEL of flushed key works } {
+        r flushall
+        r set testkey foo
+        assert_equal {1} [r dbsize] "Only one key after first insert"
+        r flushall cache
+        assert_equal {foo} [r get testkey] "Value still there after flushing cache"
+        r del testkey
+        assert_equal {0} [r dbsize] "No keys after delete"
+    }
+
    test { SET of existing but flushed key works } {
         r flushall
         r set testkey foo
@@ -99,6 +109,16 @@ start_server [list tags {flash} overrides [list storage-provider {flash ./rocks.
         assert_equal $expectedDigest [r debug digest]
     }
 
+    test { DELETE of flushed set member persists after another flush } {
+        r flushall
+        r sadd set1 val1 val2 val3
+        assert_equal {3} [r scard set1]
+        r flushall cache
+        r srem set1 val1
+        r flushall cache
+        assert_equal {2} [r scard set1]
+    }
+
     r flushall
     # If a weak storage memory model is set, wait for any pending snapshot writes to finish
     after 500 

From 66811a9fb999aa7b2cf897d9810a4ffdd44e42c4 Mon Sep 17 00:00:00 2001
From: malavan <malavan@eqalpha.com>
Date: Tue, 24 Aug 2021 22:00:52 +0000
Subject: [PATCH 4/5] use latest stable version

Former-commit-id: 792f72cb513fc6db58d824649478ee36d47631eb
---
 deps/rocksdb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/rocksdb b/deps/rocksdb
index 8c9e68979..c3034fce3 160000
--- a/deps/rocksdb
+++ b/deps/rocksdb
@@ -1 +1 @@
-Subproject commit 8c9e689790ad2205670325378621edd13a4c7a7f
+Subproject commit c3034fce329017036c807e01261729bfc11a5d62

From eaca8bff8cebd0003b9c685fada69d5f7027a2d9 Mon Sep 17 00:00:00 2001
From: malavan <malavan@eqalpha.com>
Date: Tue, 24 Aug 2021 22:07:21 +0000
Subject: [PATCH 5/5] update gitlab ci to work with facebook repo instead of
 ours

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

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