Update submodule terark-zip & minor fix

mm304321141 · mm304321141 · commit a0990552eaaf · 2021-06-10T17:42:55.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1019,7 +1019,6 @@ if(WITH_TESTS)
         monitoring/histogram_test.cc
         monitoring/iostats_context_test.cc
         monitoring/statistics_test.cc
-        monitoring/stats_history_test.cc
         options/options_settable_test.cc
         options/options_test.cc
         table/block_based_filter_block_test.cc
diff --git a/TARGETS b/TARGETS
@@ -1285,18 +1285,6 @@ ROCKS_TESTS = [
         [],
         [],
     ],
-    [
-        "stats_history_test",
-        "monitoring/stats_history_test.cc",
-        "serial",
-        [],
-        [],
-    ],
-    [
-        "stats_history_test",
-        "monitoring/stats_history_test.cc",
-        "serial",
-    ],
     [
         "stringappend_test",
         "utilities/merge_operators/string_append/stringappend_test.cc",
diff --git a/build.sh b/build.sh
@@ -26,5 +26,5 @@ fi
 
 git submodule update --init --recursive
 
-cd $BASE/$OUTPUT && cmake ../ -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=${WITH_TESTS} -DWITH_TOOLS=ON -DWITH_TERARK_ZIP=ON
+cd $BASE/$OUTPUT && cmake ../ -DCMAKE_INSTALL_PREFIX=$OUTPUT -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=${WITH_TESTS} -DWITH_TOOLS=ON -DWITH_TERARK_ZIP=ON
 cd $BASE/$OUTPUT && make -j $(nproc) && make install
diff --git a/db/external_sst_file_ingestion_job.cc b/db/external_sst_file_ingestion_job.cc
@@ -320,7 +320,7 @@ Status ExternalSstFileIngestionJob::GetIngestedFileInfo(
       std::move(sst_file_reader), file_to_ingest->file_size, &table_reader);
   if (status.IsInvalidArgument() && status.subcode() == Status::kRequireMmap) {
     // this table requires mmap open, make it happy
-    assert(!env_options.use_mmap_reads);
+    assert(!env_options_.use_mmap_reads);
     EnvOptions mmap_env_options = env_options_;
     mmap_env_options.use_mmap_reads = true;
     mmap_env_options.use_direct_reads = false;
diff --git a/src.mk b/src.mk
@@ -376,7 +376,6 @@ MAIN_SOURCES =                                                          \
   monitoring/histogram_test.cc                                          \
   monitoring/iostats_context_test.cc                                    \
   monitoring/statistics_test.cc                                         \
-  monitoring/stats_history_test.cc                                      \
   options/options_settable_test.cc                                      \
   options/options_test.cc                                               \
   table/block_based_filter_block_test.cc                                \
diff --git a/terark-tools/terark-test/chaos_test.cc b/terark-tools/terark-test/chaos_test.cc
@@ -57,7 +57,7 @@ class ChaosTest {
       auto info = dcache->DumpLRUCacheStatistics();
       std::cout << info << std::endl;
       using namespace std::chrono;
-      std::this_thread::sleep_for(60s);
+      std::this_thread::sleep_for(seconds(60));
     }
   }
 
@@ -820,8 +820,9 @@ class ChaosTest {
       options.compaction_style = TERARKDB_NAMESPACE::kCompactionStyleLevel;
       options.write_buffer_size = size_t(file_size_base / 1.1);
       options.enable_lazy_compaction = true;
-      //bbto.block_cache = NewLRUCache(4ULL << 30, 6, false);
-      options.table_factory.reset(TERARKDB_NAMESPACE::NewBlockBasedTableFactory(bbto));
+      // bbto.block_cache = NewLRUCache(4ULL << 30, 6, false);
+      options.table_factory.reset(
+          TERARKDB_NAMESPACE::NewBlockBasedTableFactory(bbto));
       cfDescriptors.emplace_back("level" + std::to_string(i), options);
     }
     if (flags_ & TestWorker) {
diff --git a/third-party/terark-zip b/third-party/terark-zip
@@ -1 +1 @@
-Subproject commit 1d1090144085fd2337c705fb767e756d41e896ef
+Subproject commit 239f320c581f3ebcae5297096329474fdb10b7a9

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class ChaosTest {`
`57`	`57`	`auto info = dcache->DumpLRUCacheStatistics();`
`58`	`58`	`std::cout << info << std::endl;`
`59`	`59`	`using namespace std::chrono;`
`60`		`- std::this_thread::sleep_for(60s);`
	`60`	`+ std::this_thread::sleep_for(seconds(60));`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`@@ -820,8 +820,9 @@ class ChaosTest {`
`820`	`820`	`options.compaction_style = TERARKDB_NAMESPACE::kCompactionStyleLevel;`
`821`	`821`	`options.write_buffer_size = size_t(file_size_base / 1.1);`
`822`	`822`	`options.enable_lazy_compaction = true;`
`823`		`- //bbto.block_cache = NewLRUCache(4ULL << 30, 6, false);`
`824`		`- options.table_factory.reset(TERARKDB_NAMESPACE::NewBlockBasedTableFactory(bbto));`
	`823`	`+ // bbto.block_cache = NewLRUCache(4ULL << 30, 6, false);`
	`824`	`+ options.table_factory.reset(`
	`825`	`+ TERARKDB_NAMESPACE::NewBlockBasedTableFactory(bbto));`
`825`	`826`	`cfDescriptors.emplace_back("level" + std::to_string(i), options);`
`826`	`827`	`}`
`827`	`828`	`if (flags_ & TestWorker) {`