Qortal/qortal
Qortal/qortal
3
0
Fork 3
mirror of https://github.com/Qortal/qortal.git synced 2025-02-14 11:15:49 +00:00
Code Issues Projects Releases Wiki Activity

Include "size" in /arbitrary/resource APIs

Browse Source 
Note that this is not always accurate - it relates to the largest transaction size for this name, not necessarily the latest or the combined size of multiple transactions. This can be made accurate as soon as we have a "Resources" table to store this info. Trying to do it before then will be too inefficient in terms of queries.
This commit is contained in:
CalDescent 2022-01-21 14:42:37 +00:00
parent f129e16878
commit 9f9b7cab99
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/data/arbitrary/ArbitraryResourceInfo.java
View File

@ -14,6 +14,8 @@ public class ArbitraryResourceInfo {
public String identifier; public String identifier;
public ArbitraryResourceStatus status; public ArbitraryResourceStatus status;
public Long size;
public ArbitraryResourceInfo() { public ArbitraryResourceInfo() {
} }

9
src/main/java/org/qortal/repository/hsqldb/HSQLDBArbitraryRepository.java
View File

@ -2,6 +2,7 @@ package org.qortal.repository.hsqldb;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.bouncycastle.util.Longs;
import org.qortal.arbitrary.misc.Service; import org.qortal.arbitrary.misc.Service;
import org.qortal.data.arbitrary.ArbitraryResourceInfo; import org.qortal.data.arbitrary.ArbitraryResourceInfo;
import org.qortal.crypto.Crypto; import org.qortal.crypto.Crypto;
@ -305,7 +306,7 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
StringBuilder sql = new StringBuilder(512); StringBuilder sql = new StringBuilder(512);
List<Object> bindParams = new ArrayList<>(); List<Object> bindParams = new ArrayList<>();
sql.append("SELECT name, service, identifier FROM ArbitraryTransactions WHERE 1=1"); sql.append("SELECT name, service, identifier, MAX(size) AS max_size FROM ArbitraryTransactions WHERE 1=1");
if (service != null) { if (service != null) {
sql.append(" AND service = "); sql.append(" AND service = ");
@ -347,6 +348,7 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
String nameResult = resultSet.getString(1); String nameResult = resultSet.getString(1);
Service serviceResult = Service.valueOf(resultSet.getInt(2)); Service serviceResult = Service.valueOf(resultSet.getInt(2));
String identifierResult = resultSet.getString(3); String identifierResult = resultSet.getString(3);
Integer sizeResult = resultSet.getInt(4);
// We should filter out resources without names // We should filter out resources without names
if (nameResult == null) { if (nameResult == null) {
@ -357,6 +359,7 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
arbitraryResourceInfo.name = nameResult; arbitraryResourceInfo.name = nameResult;
arbitraryResourceInfo.service = serviceResult; arbitraryResourceInfo.service = serviceResult;
arbitraryResourceInfo.identifier = identifierResult; arbitraryResourceInfo.identifier = identifierResult;
arbitraryResourceInfo.size = Longs.valueOf(sizeResult);
arbitraryResources.add(arbitraryResourceInfo); arbitraryResources.add(arbitraryResourceInfo);
} while (resultSet.next()); } while (resultSet.next());
@ -378,7 +381,7 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
// Longer term we probably want to copy resources to their own table anyway // Longer term we probably want to copy resources to their own table anyway
String queryWildcard = String.format("%%%s%%", query.toLowerCase()); String queryWildcard = String.format("%%%s%%", query.toLowerCase());
sql.append("SELECT name, service, identifier FROM ArbitraryTransactions WHERE 1=1"); sql.append("SELECT name, service, identifier, MAX(size) AS max_size FROM ArbitraryTransactions WHERE 1=1");
if (service != null) { if (service != null) {
sql.append(" AND service = "); sql.append(" AND service = ");
@ -416,6 +419,7 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
String nameResult = resultSet.getString(1); String nameResult = resultSet.getString(1);
Service serviceResult = Service.valueOf(resultSet.getInt(2)); Service serviceResult = Service.valueOf(resultSet.getInt(2));
String identifierResult = resultSet.getString(3); String identifierResult = resultSet.getString(3);
Integer sizeResult = resultSet.getInt(4);
// We should filter out resources without names // We should filter out resources without names
if (nameResult == null) { if (nameResult == null) {
@ -426,6 +430,7 @@ public class HSQLDBArbitraryRepository implements ArbitraryRepository {
arbitraryResourceInfo.name = nameResult; arbitraryResourceInfo.name = nameResult;
arbitraryResourceInfo.service = serviceResult; arbitraryResourceInfo.service = serviceResult;
arbitraryResourceInfo.identifier = identifierResult; arbitraryResourceInfo.identifier = identifierResult;
arbitraryResourceInfo.size = Longs.valueOf(sizeResult);
arbitraryResources.add(arbitraryResourceInfo); arbitraryResources.add(arbitraryResourceInfo);
} while (resultSet.next()); } while (resultSet.next());