Skip to content

Commit e44b3b5

Browse files
authored
chore: 19316 Delete MerkleMap and FCHashMap (#22468)
Signed-off-by: Ivan Malygin <[email protected]>
1 parent d39c83f commit e44b3b5

File tree

66 files changed

+14
-9191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+14
-9191
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
/platform-sdk/swirlds-common/ @hiero-ledger/hiero-consensus-node-consensus-codeowners @hiero-ledger/hiero-consensus-node-foundation-codeowners
7272
/platform-sdk/swirlds-component-framework/ @hiero-ledger/hiero-consensus-node-consensus-codeowners
7373
/platform-sdk/swirlds-config-*/ @hiero-ledger/hiero-consensus-node-foundation-codeowners
74-
/platform-sdk/swirlds-fchashmap/ @hiero-ledger/hiero-consensus-node-foundation-codeowners
7574
/platform-sdk/swirlds-fcqueue/ @hiero-ledger/hiero-consensus-node-foundation-codeowners
7675
/platform-sdk/swirlds-logging/ @hiero-ledger/hiero-consensus-node-foundation-codeowners
7776
/platform-sdk/swirlds-logging-*/ @hiero-ledger/hiero-consensus-node-foundation-codeowners

hedera-node/docs/design/app/states.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ state between nodes.
99
The state of the system is, ultimately, stored in a Merkle tree using an API defined by the hashgraph platform. However,
1010
this implementation reality is not a detail that any of the service implementations need to be aware of! Instead, all
1111
state stored in the system can ultimately be broken down into simple singleton or key/value data structures. Indeed,
12-
the hashgraph platform makes this easy with an API for in-memory k/v storage (MerkleMap) and on-disk k/v storage
13-
(VirtualMap).
12+
the hashgraph platform makes this easy with an API for k/v storage (VirtualMap).
1413

1514
The `com.hedera.node.app.spi.state` package contains APIs for a service module to interact with state. It was our
1615
objective to eliminate the need for a service module to interact directly with the merkle tree. This was done for four
@@ -87,9 +86,7 @@ or mutable and immutable states. It is simply given, by the application, the `Re
8786

8887
There are two "state" interfaces for k/v maps: `ReadableKVState` and `WritableKVState`. `WritableKVState` extends from
8988
`ReadableKVState`, so a `WritableKVState` is read/write. The application module implements these interfaces on top of
90-
`MerkleMap`s or `VirtualMap`s, depending on whether the application's `Schema` declares the state to be in-memory
91-
or on-disk (more on this later). The service module only declares whether the state should be in-memory or on-disk,
92-
it does not ever get exposed to either the `MerkleMap` or `VirtualMap` directly.
89+
a `VirtualMap`. The service module does not ever get exposed to `VirtualMap` directly.
9390

9491
Each state is scoped to a particular service implementation. They are never shared across service implementations.
9592
In fact, the state of a service **MUST NOT** be exposed as public API by any service API. The state of a service

hedera-node/hedera-app/src/test/resources/signedState/MHS/settingsUsed.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ data/threadDump = threadDumpLogDir
101101
10 = reconnect.maxAckDelayMilliseconds
102102
10 = reconnect.maximumReconnectFailuresBeforeShutdown
103103
PT10M = reconnect.minimumTimeBetweenReconnects
104-
200 = fcHashMap.maximumGCQueueSize
105-
PT1M = fcHashMap.gcQueueThresholdPeriod
106-
true = fcHashMap.archiveEnabled
107-
7 = fcHashMap.rebuildSplitFactor
108-
10 = fcHashMap.rebuildThreadCount
109104
-1 = virtualMap.numHashThreads
110105
50.0 = virtualMap.percentHashThreads
111106
-1 = virtualMap.numCleanerThreads

platform-sdk/docs/platformWiki.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ This code is maintained by the "Platform Data" team.
7171
- Data Structures
7272
- VirtualMap
7373
- MerkleDB
74-
- MerkleMap
75-
- FCHashMap
7674
- FCQueue
7775
- Reconnect
7876

platform-sdk/swirlds-benchmarks/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jmhModuleInfo {
1818
requires("com.swirlds.config.api")
1919
requires("com.swirlds.metrics.api")
2020
requires("com.swirlds.config.extensions")
21-
requires("com.swirlds.fchashmap")
2221
requires("com.swirlds.merkledb")
2322
requires("com.swirlds.virtualmap")
2423
requires("com.swirlds.platform.core")

platform-sdk/swirlds-benchmarks/src/jmh/java/com/swirlds/benchmark/FCHashMapBench.java

Lines changed: 0 additions & 191 deletions
This file was deleted.

platform-sdk/swirlds-fchashmap/build.gradle.kts

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)