Prechádzať zdrojové kódy

Lithium upgrade (#5934)

* Lithium update.

* Lithium: update.
Matthieu Garrigues 5 rokov pred
rodič
commit
2814e8d7f3

+ 1 - 1
frameworks/C++/lithium/compile_and_start_clang.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 DB_FLAG=$1
-COMMIT=36e7b46fc3d191ba9d56ef9adf00b59c058fe4d8
+COMMIT=8564c2286d0ae9508fe7d3c8dbf65b7f299f40af
 
 if [ $DB_FLAG = "TFB_MYSQL" ]; then
   CXX_FLAGS="-I /usr/include/mariadb  -lmariadbclient "

+ 1 - 1
frameworks/C++/lithium/compile_and_start_gcc.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 DB_FLAG=$1
-COMMIT=36e7b46fc3d191ba9d56ef9adf00b59c058fe4d8
+COMMIT=8564c2286d0ae9508fe7d3c8dbf65b7f299f40af
 
 if [ $DB_FLAG = "TFB_MYSQL" ]; then
   CXX_FLAGS="-I /usr/include/mariadb  -lmariadbclient "

+ 1 - 1
frameworks/C++/lithium/compile_clang-pipeline.sh

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 DB_FLAG=$1
-COMMIT=2d409878031f9c6ee7e7ef25535b8197fdd7d90c
+COMMIT=c01c26a4b7f3aa2bb21c3f5c7cb65e1b37f8c429
 MONOTHREAD=$2
 
 if [ $DB_FLAG = "TFB_MYSQL" ]; then

+ 7 - 14
frameworks/C++/lithium/lithium.cc

@@ -131,21 +131,14 @@ int main(int argc, char* argv[]) {
     
     N = std::max(1, std::min(N, 500));
     
-    std::vector<decltype(random_numbers.all_fields())> numbers(N);
-    {
-      auto c = random_numbers.connect(request.fiber);
+    if (world_cache.size() == 0)
+      random_numbers.connect(request.fiber).forall([&] (const auto& number) {
+        world_cache(number.id, [&] { return metamap_clone(number); });
+      });
 
-      if (world_cache.size() == 0)
-        c.forall([&] (const auto& number) {
-          world_cache(number.id, [&] { return metamap_clone(number); });
-        });
-
-      for (int i = 0; i < N; i++)
-      {
-        int id = 1 + rand() % 10000;
-        numbers[i] = world_cache(id, [&] { return *c.find_one(s::id = id); });
-      }
-    }
+    std::vector<decltype(random_numbers.all_fields())> numbers(N);
+    for (int i = 0; i < N; i++)
+      numbers[i] = world_cache(1 + rand() % 10000);
 
     response.write_json(numbers);
   };