ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2026-04-29 15:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

try to filter out empty objects from ledger_data call

Browse Source
This commit is contained in:
CJ Cobb
2021-01-15 10:46:59 -05:00
parent e8332b17dc
commit 5dd5c06a70
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
reporting/ReportingBackend.h
View File

@@ -550,9 +550,9 @@ public:
cass_future_free(prepare_future);
query = {};
query << "SELECT key, object FROM " << tableName << "flat "
query << "SELECT filterEmpty(key, object) FROM " << tableName
<< "flat "
<< " WHERE TOKEN(key) >= ? and sequence <= ?"
<< " and object > 0x"
<< " PER PARTITION LIMIT 1 LIMIT ?"
<< " ALLOW FILTERING";
@@ -877,6 +877,7 @@ public:
ripple::uint256 key;
std::vector<unsigned char> blob;
};
std::pair<std::vector<LedgerObject>, std::optional<int64_t>>
doUpperBound(
std::optional<int64_t> marker,
@@ -942,34 +943,40 @@ public:
while (cass_iterator_next(iter))
{
CassRow const* row = cass_iterator_get_row(iter);
CassValue const* item = cass_row_get_column(row, 0);
CassIterator* tuple_iter = cass_iterator_from_tuple(item);
if (!cass_iterator_next(tuple_iter))
{
cass_iterator_free(tuple_iter);
continue;
}
cass_byte_t const* outData;
std::size_t outSize;
CassValue const* hash = cass_row_get_column(row, 0);
rc = cass_value_get_bytes(hash, &outData, &outSize);
CassValue const* key = cass_iterator_get_value(tuple_iter);
rc = cass_value_get_bytes(key, &outData, &outSize);
if (rc != CASS_OK)
{
cass_iterator_free(iter);
std::stringstream ss;
ss << "Cassandra fetch error";
ss << "Cassandra doUpperBound error";
ss << ": " << cass_error_desc(rc);
BOOST_LOG_TRIVIAL(warning) << ss.str();
}
ripple::uint256 resultHash = ripple::uint256::fromVoid(outData);
CassValue const* entry = cass_row_get_column(row, 1);
rc = cass_value_get_bytes(entry, &outData, &outSize);
cass_iterator_next(tuple_iter);
CassValue const* object = cass_iterator_get_value(tuple_iter);
rc = cass_value_get_bytes(object, &outData, &outSize);
if (rc != CASS_OK)
{
cass_iterator_free(iter);
std::stringstream ss;
ss << "Cassandra fetch error";
ss << "Cassandra doUpperBound error";
ss << ": " << cass_error_desc(rc);
BOOST_LOG_TRIVIAL(warning) << ss.str();
}
if (outSize > 0)
{
std::vector<unsigned char> resultBlob{
@@ -977,7 +984,9 @@ public:
result.push_back({resultHash, resultBlob});
}
cass_iterator_free(tuple_iter);
}
cass_iterator_free(iter);
if (result.size())
{
auto token = getToken(result[result.size() - 1].key.data());