Заработало блок добавляется в файл и в статус блокчена в БД!!
Но ещё надо сделать таблицу с записями :)    2
This commit is contained in:
AidarKC
2025-12-17 19:17:10 +03:00
parent e9c11d6b75
commit 4fb6b10a97
4 changed files with 37 additions and 27 deletions
@@ -20,7 +20,7 @@ import java.sql.Statement;
* - active_sessions
* - users_params
* - ip_geo_cache
* - blockchain_state (MVP: одна таблица, линии 0..7 внутри строки)
* - blockchain_state (MVP)
*/
public class DatabaseInitializer {
@@ -160,8 +160,12 @@ public class DatabaseInitializer {
blockchain_id INTEGER NOT NULL PRIMARY KEY,
user_login TEXT NOT NULL,
public_key_base64 TEXT NOT NULL,
size_limit INTEGER NOT NULL,
size_bytes INTEGER NOT NULL,
file_size_bytes INTEGER NOT NULL,
last_global_number INTEGER NOT NULL,
last_global_hash TEXT NOT NULL,
updated_at_ms INTEGER NOT NULL,
@@ -198,4 +202,4 @@ public class DatabaseInitializer {
""");
}
}
}
}
@@ -21,7 +21,6 @@ public final class BlockchainStateDAO {
return instance;
}
// старый метод оставим
public BlockchainStateEntry getByBlockchainId(long blockchainId) throws SQLException {
try (Connection c = db.getConnection()) {
return getByBlockchainId(c, blockchainId);
@@ -36,6 +35,7 @@ public final class BlockchainStateDAO {
public_key_base64,
size_limit,
size_bytes,
file_size_bytes,
last_global_number,
last_global_hash,
line0_last_number, line0_last_hash,
@@ -60,7 +60,6 @@ public final class BlockchainStateDAO {
}
}
// старый метод оставим
public void upsert(BlockchainStateEntry e) throws SQLException {
try (Connection c = db.getConnection()) {
upsert(c, e);
@@ -75,6 +74,7 @@ public final class BlockchainStateDAO {
public_key_base64,
size_limit,
size_bytes,
file_size_bytes,
last_global_number,
last_global_hash,
line0_last_number, line0_last_hash,
@@ -104,6 +104,7 @@ public final class BlockchainStateDAO {
public_key_base64 = excluded.public_key_base64,
size_limit = excluded.size_limit,
size_bytes = excluded.size_bytes,
file_size_bytes = excluded.file_size_bytes,
last_global_number = excluded.last_global_number,
last_global_hash = excluded.last_global_hash,
line0_last_number = excluded.line0_last_number,
@@ -132,6 +133,7 @@ public final class BlockchainStateDAO {
ps.setString(i++, nn(e.getPublicKeyBase64()));
ps.setInt(i++, e.getSizeLimit());
ps.setInt(i++, e.getSizeBytes());
ps.setLong(i++, e.getFileSizeBytes());
ps.setInt(i++, e.getLastGlobalNumber());
ps.setString(i++, nn(e.getLastGlobalHash()));
@@ -153,6 +155,7 @@ public final class BlockchainStateDAO {
e.setSizeLimit(rs.getInt("size_limit"));
e.setSizeBytes(rs.getInt("size_bytes"));
e.setFileSizeBytes(rs.getLong("file_size_bytes"));
e.setLastGlobalNumber(rs.getInt("last_global_number"));
e.setLastGlobalHash(rs.getString("last_global_hash"));
@@ -16,6 +16,9 @@ public final class BlockchainStateEntry {
private int sizeLimit;
private int sizeBytes;
/** NEW: размер файла блокчейна в байтах (то, что будем сверять/чинить при старте). */
private long fileSizeBytes;
private int lastGlobalNumber;
private String lastGlobalHash; // HEX(64) либо пустая строка для "нулевого"
@@ -32,12 +35,12 @@ public final class BlockchainStateEntry {
this.lastGlobalHash = "";
}
// --- удобный конструктор (если хочешь) ---
public BlockchainStateEntry(long blockchainId,
String userLogin,
String publicKeyBase64,
int sizeLimit,
int sizeBytes,
long fileSizeBytes,
int lastGlobalNumber,
String lastGlobalHash,
int[] lastLineNumbers,
@@ -48,6 +51,7 @@ public final class BlockchainStateEntry {
this.publicKeyBase64 = publicKeyBase64;
this.sizeLimit = sizeLimit;
this.sizeBytes = sizeBytes;
this.fileSizeBytes = fileSizeBytes;
this.lastGlobalNumber = lastGlobalNumber;
this.lastGlobalHash = lastGlobalHash == null ? "" : lastGlobalHash;
@@ -65,8 +69,6 @@ public final class BlockchainStateEntry {
this.updatedAtMs = updatedAtMs;
}
// --- getters / setters ---
public long getBlockchainId() { return blockchainId; }
public void setBlockchainId(long blockchainId) { this.blockchainId = blockchainId; }
@@ -82,6 +84,9 @@ public final class BlockchainStateEntry {
public int getSizeBytes() { return sizeBytes; }
public void setSizeBytes(int sizeBytes) { this.sizeBytes = sizeBytes; }
public long getFileSizeBytes() { return fileSizeBytes; }
public void setFileSizeBytes(long fileSizeBytes) { this.fileSizeBytes = fileSizeBytes; }
public int getLastGlobalNumber() { return lastGlobalNumber; }
public void setLastGlobalNumber(int lastGlobalNumber) { this.lastGlobalNumber = lastGlobalNumber; }