Fix compilation error and test-db (ton-blockchain#1609)

SpyCheese · web-flow · commit 73751cdda6e6 · 2025-04-08T08:55:45.000+03:00
* Fix compilation error

* Fix error processing in load_cell

* Decrease verbosity of certain ADNL logs
diff --git a/adnl/adnl-ext-server.cpp b/adnl/adnl-ext-server.cpp
@@ -31,7 +31,7 @@ td::Status AdnlInboundConnection::process_packet(td::BufferSlice data) {
       td::PromiseCreator::lambda([SelfId = actor_id(this), query_id = f->query_id_](td::Result<td::BufferSlice> R) {
         if (R.is_error()) {
           auto S = R.move_as_error();
-          LOG(WARNING) << "failed ext query: " << S;
+          LOG(INFO) << "failed ext query: " << S;
         } else {
           auto B = create_tl_object<ton_api::adnl_message_answer>(query_id, R.move_as_ok());
           td::actor::send_closure(SelfId, &AdnlInboundConnection::send, serialize_tl_object(B, true));
diff --git a/adnl/adnl-peer.cpp b/adnl/adnl-peer.cpp
@@ -598,11 +598,11 @@ void AdnlPeerPairImpl::process_message(const adnlmessage::AdnlMessagePart &messa
   respond_with_nop();
   auto size = message.total_size();
   if (size > huge_packet_max_size()) {
-    VLOG(ADNL_WARNING) << this << ": dropping too big huge message: size=" << size;
+    VLOG(ADNL_INFO) << this << ": dropping too big huge message: size=" << size;
     return;
   }
   if (message.hash().is_zero()) {
-    VLOG(ADNL_WARNING) << this << ": dropping huge message with zero hash";
+    VLOG(ADNL_INFO) << this << ": dropping huge message with zero hash";
     return;
   }
   if (message.hash() != huge_message_hash_) {
diff --git a/crypto/vm/db/DynamicBagOfCellsDb.cpp b/crypto/vm/db/DynamicBagOfCellsDb.cpp
@@ -138,8 +138,18 @@ class DynamicBagOfCellsDbImpl : public DynamicBagOfCellsDb, private ExtCellCreat
     return td::Status::OK();
   }
   td::Result<Ref<DataCell>> load_cell(td::Slice hash) override {
-    TRY_RESULT(loaded_cell, get_cell_info_force(hash).cell->load_cell());
-    return std::move(loaded_cell.data_cell);
+    auto info = hash_table_.get_if_exists(hash);
+    if (info && info->sync_with_db) {
+      TRY_RESULT(loaded_cell, info->cell->load_cell());
+      return std::move(loaded_cell.data_cell);
+    }
+    TRY_RESULT(res, loader_->load(hash, true, *this));
+    if (res.status != CellLoader::LoadResult::Ok) {
+      return td::Status::Error("cell not found");
+    }
+    Ref<DataCell> cell = res.cell();
+    hash_table_.apply(hash, [&](CellInfo &info) { update_cell_info_loaded(info, hash, std::move(res)); });
+    return cell;
   }
   td::Result<Ref<DataCell>> load_root(td::Slice hash) override {
     return load_cell(hash);
@@ -195,9 +205,6 @@ class DynamicBagOfCellsDbImpl : public DynamicBagOfCellsDb, private ExtCellCreat
           promise->set_result(std::move(cell));
         });
   }
-  CellInfo &get_cell_info_force(td::Slice hash) {
-    return hash_table_.apply(hash, [&](CellInfo &info) { update_cell_info_force(info, hash); });
-  }
   CellInfo &get_cell_info_lazy(Cell::LevelMask level_mask, td::Slice hash, td::Slice depth) {
     return hash_table_.apply(hash.substr(hash.size() - Cell::hash_bytes),
                              [&](CellInfo &info) { update_cell_info_lazy(info, level_mask, hash, depth); });
diff --git a/tdnet/td/net/TcpListener.cpp b/tdnet/td/net/TcpListener.cpp
@@ -61,7 +61,7 @@ void TcpListener::loop() {
         break;
       }
       TRY_RESULT(client_socket, std::move(r_socket));
-      LOG(ERROR) << "Accept";
+      LOG(INFO) << "Accept";
       callback_->accept(std::move(client_socket));
     }
     if (td::can_close(server_socket_fd_)) {
diff --git a/validator/db/celldb.cpp b/validator/db/celldb.cpp
@@ -231,7 +231,7 @@ void CellDbIn::start_up() {
   db_options.two_level_index_and_filter = db_options.enable_bloom_filter 
                                 && opts_->state_ttl() >= 60 * 60 * 24 * 30; // 30 days
   if (db_options.two_level_index_and_filter && !opts_->get_celldb_in_memory()) {
-    o_celldb_cache_size = std::max(o_celldb_cache_size ? o_celldb_cache_size.value() : 0UL, 16UL << 30);
+    o_celldb_cache_size = std::max<td::uint64>(o_celldb_cache_size ? o_celldb_cache_size.value() : 0UL, 16UL << 30);
   }
 
   if (o_celldb_cache_size) {

Original file line number	Diff line number	Diff line change
`@@ -598,11 +598,11 @@ void AdnlPeerPairImpl::process_message(const adnlmessage::AdnlMessagePart &messa`
`598`	`598`	`respond_with_nop();`
`599`	`599`	`auto size = message.total_size();`
`600`	`600`	`if (size > huge_packet_max_size()) {`
`601`		`- VLOG(ADNL_WARNING) << this << ": dropping too big huge message: size=" << size;`
	`601`	`+ VLOG(ADNL_INFO) << this << ": dropping too big huge message: size=" << size;`
`602`	`602`	`return;`
`603`	`603`	`}`
`604`	`604`	`if (message.hash().is_zero()) {`
`605`		`- VLOG(ADNL_WARNING) << this << ": dropping huge message with zero hash";`
	`605`	`+ VLOG(ADNL_INFO) << this << ": dropping huge message with zero hash";`
`606`	`606`	`return;`
`607`	`607`	`}`
`608`	`608`	`if (message.hash() != huge_message_hash_) {`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ void TcpListener::loop() {`
`61`	`61`	`break;`
`62`	`62`	`}`
`63`	`63`	`TRY_RESULT(client_socket, std::move(r_socket));`
`64`		`- LOG(ERROR) << "Accept";`
	`64`	`+ LOG(INFO) << "Accept";`
`65`	`65`	`callback_->accept(std::move(client_socket));`
`66`	`66`	`}`
`67`	`67`	`if (td::can_close(server_socket_fd_)) {`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ void CellDbIn::start_up() {`
`231`	`231`	`db_options.two_level_index_and_filter = db_options.enable_bloom_filter`
`232`	`232`	`&& opts_->state_ttl() >= 60 * 60 * 24 * 30; // 30 days`
`233`	`233`	`if (db_options.two_level_index_and_filter && !opts_->get_celldb_in_memory()) {`
`234`		`- o_celldb_cache_size = std::max(o_celldb_cache_size ? o_celldb_cache_size.value() : 0UL, 16UL << 30);`
	`234`	`+ o_celldb_cache_size = std::max<td::uint64>(o_celldb_cache_size ? o_celldb_cache_size.value() : 0UL, 16UL << 30);`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`if (o_celldb_cache_size) {`