Skip to content

Commit a37a2f6

Browse files
asiegel-jtasiegel-jt
committed
removed obsolete transaction map
1 parent a7996e6 commit a37a2f6

File tree

16 files changed

+21
-451
lines changed

16 files changed

+21
-451
lines changed

‎src/app/firedancer-dev/commands/backtest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ backtest_topo( config_t * config ) {
177177

178178
/* blockstore_obj shared by replay and backtest tiles */
179179
fd_topob_wksp( topo, "blockstore" );
180-
fd_topo_obj_t * blockstore_obj = setup_topo_blockstore( topo, "blockstore", config->firedancer.blockstore.shred_max, config->firedancer.blockstore.block_max, config->firedancer.blockstore.idx_max, config->firedancer.blockstore.txn_max, config->firedancer.blockstore.alloc_max );
180+
fd_topo_obj_t * blockstore_obj = setup_topo_blockstore( topo, "blockstore", config->firedancer.blockstore.shred_max, config->firedancer.blockstore.block_max, config->firedancer.blockstore.idx_max, config->firedancer.blockstore.alloc_max );
181181
fd_topob_tile_uses( topo, replay_tile, blockstore_obj, FD_SHMEM_JOIN_MODE_READ_WRITE );
182182
fd_topob_tile_uses( topo, backtest_tile, blockstore_obj, FD_SHMEM_JOIN_MODE_READ_WRITE );
183183
FD_TEST( fd_pod_insertf_ulong( topo->props, blockstore_obj->id, "blockstore" ) );

‎src/app/firedancer-dev/commands/sim.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ sim_topo( config_t * config ) {
128128
config->firedancer.blockstore.shred_max,
129129
config->firedancer.blockstore.block_max,
130130
config->firedancer.blockstore.idx_max,
131-
config->firedancer.blockstore.txn_max,
132131
config->firedancer.blockstore.alloc_max );
133132
fd_topo_obj_t * poh_shred_obj = fd_topob_obj( topo, "fseq", "poh_shred" );
134133
fd_topo_obj_t * root_slot_obj = fd_topob_obj( topo, "fseq", "root_slot" );

‎src/app/firedancer-dev/config/default.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
[blockstore]
1212
shred_max = 16777216
1313
block_max = 131072
14-
txn_max = 1048576
1514
idx_max = 8192
1615
alloc_max = 10737418240
1716
file = "{blockstore_path}"
@@ -32,7 +31,6 @@
3231
prometheus_listen_address = "0.0.0.0"
3332
prometheus_listen_port = 7999
3433
[consensus]
35-
vote = false
3634
expected_shred_version = 64475
3735
[paths]
3836
identity_key = "{keys}/fd-identity-keypair.json"
@@ -41,4 +39,3 @@
4139
path = "{ledger_dir}/firedancer-dev.log"
4240
level_stderr = "INFO"
4341
level_logfile = "NOTICE"
44-

‎src/app/firedancer/callbacks.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ fd_topo_obj_callbacks_t fd_obj_cb_funk = {
131131
static ulong
132132
blockstore_footprint( fd_topo_t const * topo,
133133
fd_topo_obj_t const * obj ) {
134-
return fd_blockstore_footprint( VAL("shred_max"), VAL("block_max"), VAL("idx_max"), VAL("txn_max") ) + VAL("alloc_max");
134+
return fd_blockstore_footprint( VAL("shred_max"), VAL("block_max"), VAL("idx_max") ) + VAL("alloc_max");
135135
}
136136

137137
static ulong
@@ -143,7 +143,7 @@ blockstore_align( fd_topo_t const * topo FD_FN_UNUSED,
143143
static void
144144
blockstore_new( fd_topo_t const * topo,
145145
fd_topo_obj_t const * obj ) {
146-
FD_TEST( fd_blockstore_new( fd_topo_obj_laddr( topo, obj->id ), VAL("wksp_tag"), VAL("seed"), VAL("shred_max"), VAL("block_max"), VAL("idx_max"), VAL("txn_max") ) );
146+
FD_TEST( fd_blockstore_new( fd_topo_obj_laddr( topo, obj->id ), VAL("wksp_tag"), VAL("seed"), VAL("shred_max"), VAL("block_max"), VAL("idx_max") ) );
147147
}
148148

149149
fd_topo_obj_callbacks_t fd_obj_cb_blockstore = {

‎src/app/firedancer/topology.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ setup_topo_blockstore( fd_topo_t * topo,
2525
ulong shred_max,
2626
ulong block_max,
2727
ulong idx_max,
28-
ulong txn_max,
2928
ulong alloc_max ) {
3029
fd_topo_obj_t * obj = fd_topob_obj( topo, "blockstore", wksp_name );
3130

@@ -37,12 +36,11 @@ setup_topo_blockstore( fd_topo_t * topo,
3736
FD_TEST( fd_pod_insertf_ulong( topo->props, shred_max, "obj.%lu.shred_max", obj->id ) );
3837
FD_TEST( fd_pod_insertf_ulong( topo->props, block_max, "obj.%lu.block_max", obj->id ) );
3938
FD_TEST( fd_pod_insertf_ulong( topo->props, idx_max, "obj.%lu.idx_max", obj->id ) );
40-
FD_TEST( fd_pod_insertf_ulong( topo->props, txn_max, "obj.%lu.txn_max", obj->id ) );
4139
FD_TEST( fd_pod_insertf_ulong( topo->props, alloc_max, "obj.%lu.alloc_max", obj->id ) );
4240

4341
/* DO NOT MODIFY LOOSE WITHOUT CHANGING HOW BLOCKSTORE ALLOCATES INTERNAL STRUCTURES */
4442

45-
ulong blockstore_footprint = fd_blockstore_footprint( shred_max, block_max, idx_max, txn_max ) + alloc_max;
43+
ulong blockstore_footprint = fd_blockstore_footprint( shred_max, block_max, idx_max ) + alloc_max;
4644
FD_TEST( fd_pod_insertf_ulong( topo->props, blockstore_footprint, "obj.%lu.loose", obj->id ) );
4745

4846
return obj;
@@ -480,7 +478,6 @@ fd_topo_initialize( config_t * config ) {
480478
config->firedancer.blockstore.shred_max,
481479
config->firedancer.blockstore.block_max,
482480
config->firedancer.blockstore.idx_max,
483-
config->firedancer.blockstore.txn_max,
484481
config->firedancer.blockstore.alloc_max );
485482
fd_topob_tile_uses( topo, replay_tile, blockstore_obj, FD_SHMEM_JOIN_MODE_READ_WRITE );
486483
fd_topob_tile_uses( topo, repair_tile, blockstore_obj, FD_SHMEM_JOIN_MODE_READ_ONLY );

‎src/app/firedancer/topology.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ setup_topo_blockstore( fd_topo_t * topo,
1919
ulong shred_max,
2020
ulong block_max,
2121
ulong idx_max,
22-
ulong txn_max,
2322
ulong alloc_max );
2423

2524
fd_topo_obj_t *

‎src/app/ledger/main.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ runtime_replay( fd_ledger_args_t * ledger_args ) {
227227
if( !block_exists && slot_meta.slot == slot ) {
228228
int err = fd_rocksdb_import_block_blockstore( &rocks_db,
229229
&slot_meta, blockstore,
230-
ledger_args->copy_txn_status,
231230
slot == (ledger_args->trash_hash) ? trash_hash_buf : NULL,
232231
ledger_args->valloc );
233232
if( FD_UNLIKELY( err ) ) {
@@ -550,7 +549,6 @@ ingest_rocksdb( char const * file,
550549
ulong start_slot,
551550
ulong end_slot,
552551
fd_blockstore_t * blockstore,
553-
int txn_status,
554552
ulong trash_hash,
555553
fd_valloc_t valloc ) {
556554

@@ -607,7 +605,6 @@ ingest_rocksdb( char const * file,
607605
int err = fd_rocksdb_import_block_blockstore( &rocks_db,
608606
&slot_meta,
609607
blockstore,
610-
txn_status,
611608
(slot == trash_hash) ? trash_hash_buf : NULL,
612609
valloc );
613610
if( FD_UNLIKELY( err ) ) {
@@ -727,12 +724,11 @@ init_blockstore( fd_ledger_args_t * args ) {
727724
}
728725
FD_LOG_NOTICE(( "joined blockstore" ));
729726
} else {
730-
ulong txn_max = 256UL;
731-
shmem = fd_wksp_alloc_laddr( args->wksp, fd_blockstore_align(), fd_blockstore_footprint( args->shred_max, args->slot_history_max, 16, txn_max ), blockstore_tag );
727+
shmem = fd_wksp_alloc_laddr( args->wksp, fd_blockstore_align(), fd_blockstore_footprint( args->shred_max, args->slot_history_max, 16 ), blockstore_tag );
732728
if( shmem == NULL ) {
733729
FD_LOG_ERR(( "failed to allocate a blockstore" ));
734730
}
735-
args->blockstore = fd_blockstore_join( &args->blockstore_ljoin, fd_blockstore_new( shmem, 1, args->hashseed, args->shred_max, args->slot_history_max, 16, txn_max ) );
731+
args->blockstore = fd_blockstore_join( &args->blockstore_ljoin, fd_blockstore_new( shmem, 1, args->hashseed, args->shred_max, args->slot_history_max, 16 ) );
736732
if( args->blockstore->shmem->magic != FD_BLOCKSTORE_MAGIC ) {
737733
fd_wksp_free_laddr( shmem );
738734
FD_LOG_ERR(( "failed to allocate a blockstore" ));
@@ -842,13 +838,9 @@ minify( fd_ledger_args_t * args ) {
842838
args->start_slot,
843839
args->end_slot,
844840
args->blockstore,
845-
0,
846841
ULONG_MAX,
847842
args->valloc );
848843

849-
fd_rocksdb_copy_over_txn_status_range( &big_rocksdb, &mini_rocksdb, args->blockstore,
850-
args->start_slot, args->end_slot );
851-
FD_LOG_NOTICE(( "copied over all transaction statuses" ));
852844
} else {
853845
FD_LOG_NOTICE(( "skipping copying of transaction statuses" ));
854846
}
@@ -951,7 +943,7 @@ ingest( fd_ledger_args_t * args ) {
951943
args->end_slot = slot_ctx->slot + args->slot_history_max - 1;
952944
}
953945
ingest_rocksdb( args->rocksdb_list[ 0UL ], args->start_slot, args->end_slot,
954-
blockstore, args->copy_txn_status, args->trash_hash, args->valloc );
946+
blockstore, args->trash_hash, args->valloc );
955947
}
956948

957949
#ifdef FD_FUNK_HANDHOLDING

‎src/app/shared/fd_config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ struct fd_configf {
9797
ulong shred_max;
9898
ulong block_max;
9999
ulong idx_max;
100-
ulong txn_max;
101100
ulong alloc_max;
102101
char file[PATH_MAX];
103102
char checkpt[PATH_MAX];

‎src/app/shared/fd_config_parse.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ fd_config_extract_podf( uchar * pod,
8383
CFG_POP ( ulong, blockstore.shred_max );
8484
CFG_POP ( ulong, blockstore.block_max );
8585
CFG_POP ( ulong, blockstore.idx_max );
86-
CFG_POP ( ulong, blockstore.txn_max );
8786
CFG_POP ( ulong, blockstore.alloc_max );
8887
CFG_POP ( cstr, blockstore.file );
8988
CFG_POP ( cstr, blockstore.checkpt );

‎src/app/shredcap/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ main( int argc, char ** argv ) {
8181
FD_LOG_ERR(( "failed to join a blockstore" ));
8282
}
8383
} else {
84-
shmem = fd_wksp_alloc_laddr( wksp, fd_blockstore_align(), fd_blockstore_footprint( shred_max, slot_history_max, 16, shred_max ), FD_BLOCKSTORE_MAGIC );
84+
shmem = fd_wksp_alloc_laddr( wksp, fd_blockstore_align(), fd_blockstore_footprint( shred_max, slot_history_max, 16 ), FD_BLOCKSTORE_MAGIC );
8585
if ( shmem == NULL ) {
8686
FD_LOG_ERR(( "failed to allocate a blockstore" ));
8787
}
8888

89-
blockstore = fd_blockstore_join( &blockstore_ljoin, fd_blockstore_new( shmem, 1, hashseed, shred_max, slot_history_max, 16, shred_max ) );
89+
blockstore = fd_blockstore_join( &blockstore_ljoin, fd_blockstore_new( shmem, 1, hashseed, shred_max, slot_history_max, 16 ) );
9090
if ( blockstore == NULL ) {
9191
fd_wksp_free_laddr( shmem );
9292
FD_LOG_ERR(( "failed to allocate a blockstore" ));

0 commit comments

Comments
 (0)