Publisher db improvments

brave · Apr 22, 2020 · 3edeea2 · 3edeea2
1 parent 02d2146
commit 3edeea2
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_server_publisher_info.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_server_publisher_info.cc
@@ -129,26 +129,42 @@ void DatabaseServerPublisherInfo::InsertOrUpdatePartialList(
     return;
   }
 
-  const std::string query = base::StringPrintf(
-      "INSERT OR REPLACE INTO %s "
-      "(publisher_key, status, excluded, address) "
-      "VALUES (?, ?, ?, ?)",
+  const std::string base_query = base::StringPrintf(
+      "INSERT OR REPLACE INTO %s VALUES ",
       kTableName);
 
-  auto transaction = ledger::DBTransaction::New();
+  size_t i = 0;
+  std::string main_query = base_query;
   for (const auto& info : list) {
-    auto command = ledger::DBCommand::New();
-    command->type = ledger::DBCommand::Type::RUN;
-    command->command = query;
+    if (i == kBatchLimit) {
+      main_query += base_query;
+      i = 0;
+    }
 
-    BindString(command.get(), 0, info.publisher_key);
-    BindInt(command.get(), 1, static_cast<int>(info.status));
-    BindBool(command.get(), 2, info.excluded);
-    BindString(command.get(), 3, info.address);
+    main_query += base::StringPrintf(
+        R"(("%s",%d,%d,"%s"))",
+        info.publisher_key.c_str(),
+        static_cast<int>(info.status),
+        info.excluded,
+        info.address.c_str());
+    main_query += (i == kBatchLimit - 1) ? ";" : ",";
+    i++;
+  }
 
-    transaction->commands.push_back(std::move(command));
+  if (main_query.empty()) {
+    callback(ledger::Result::LEDGER_ERROR);
+    return;
   }
 
+  main_query.pop_back();
+
+  auto transaction = ledger::DBTransaction::New();
+  auto command = ledger::DBCommand::New();
+  command->type = ledger::DBCommand::Type::EXECUTE;
+  command->command = main_query;
+
+  transaction->commands.push_back(std::move(command));
+
   auto transaction_callback = std::bind(&OnResultCallback,
       _1,
       callback);

diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_util.h b/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_util.h
@@ -15,6 +15,8 @@
 
 namespace braveledger_database {
 
+const size_t kBatchLimit = 999;
+
 bool DropTable(
     ledger::DBTransaction* transaction,
     const std::string& table_name);