Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Fix problem with libpqxx 7.3.0 upgrade #9883

Merged
merged 2 commits into from
Jan 7, 2021
Merged

Fix problem with libpqxx 7.3.0 upgrade #9883

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46e1ae0
Fix problem with libpqxx 7.3.0 upgrade
huangminghuang Jan 6, 2021
73963d6
Consolidate exception catching
huangminghuang Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions plugins/blockvault_client_plugin/postgres_backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,12 @@ bool postgres_backend::propose_constructed_block(std::pair<uint32_t, uint32_t> w
pqxx::binarystring previous_block_id_blob(previous_block_id.data(), previous_block_id.size());
w.exec_prepared0("insert_constructed_block", watermark.first, watermark.second, lib, block_id_blob,
previous_block_id_blob, obj.id(), block_content.size());
auto r = w.exec_prepared1("get_block_insertion_result", obj.id());
obj.write(block_content.data(), block_content.size());
w.commit();
return true;
auto r = w.exec_prepared("get_block_insertion_result", obj.id());
if (!r.empty()) {
obj.write(block_content.data(), block_content.size());
w.commit();
return true;
}
} catch (const pqxx::unexpected_rows&) {
} catch (const pqxx::unique_violation&) {
} catch (const pqxx::serialization_failure&) {
Expand All @@ -105,11 +107,12 @@ bool postgres_backend::append_external_block(uint32_t block_num, uint32_t lib, c
pqxx::binarystring previous_block_id_blob(previous_block_id.data(), previous_block_id.size());
w.exec_prepared0("insert_external_block", block_num, lib, block_id_blob, previous_block_id_blob, obj.id(),
block_content.size());
auto r = w.exec_prepared1("get_block_insertion_result", obj.id());
obj.write(block_content.data(), block_content.size());
w.commit();
return true;

auto r = w.exec_prepared("get_block_insertion_result", obj.id());
if (!r.empty()) {
obj.write(block_content.data(), block_content.size());
w.commit();
return true;
}
} catch (const pqxx::unexpected_rows&) {
} catch (const pqxx::unique_violation&) {
} catch (const pqxx::serialization_failure&) {
Expand Down