Skip to content

feat(event): optimize event service log #6223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodeNinjaEvan merged 3 commits into from
Mar 4, 2025
Merged

feat(event): optimize event service log #6223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f653cfd
feat(event): optimize event service log
zeusoo001 Mar 3, 2025
ae24ba8
fix BlockEventCacheTest unit test issue
zeusoo001 Mar 4, 2025
a75e41d
add SolidEventServiceTest unit test
zeusoo001 Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions framework/src/main/java/org/tron/core/services/event/BlockEventCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public static void init(BlockCapsule.BlockId blockId) {
}

public static void add(BlockEvent blockEvent) throws EventException {
logger.info("Add block event, {}, {}", blockEvent.getBlockId().getString(),
blockEvent.getParentId().getString());
logger.info("Add block event, {}, {}, {}", blockEvent.getBlockId().getString(),
blockEvent.getParentId().getString(), blockEvent.getSolidId().getString());
if (blockEventMap.get(blockEvent.getParentId()) == null) {
throw new EventException("unlink BlockEvent, "
+ blockEvent.getBlockId().getString() + ", "
Expand Down Expand Up @@ -83,6 +83,7 @@ public static void remove(BlockCapsule.BlockId solidId) {
}

public static List<BlockEvent> getSolidBlockEvents(BlockCapsule.BlockId solidId) {
logger.info("Get solid events {}, {}", solidNum, solidId);
List<BlockEvent> blockEvents = new ArrayList<>();
BlockCapsule.BlockId tmp = solidId;
while (tmp.getNum() > solidNum) {
Expand Down
9 changes: 8 additions & 1 deletion framework/src/main/java/org/tron/core/services/event/SolidEventService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,14 @@ public void work() {
return;
}

List<BlockEvent> blockEvents = BlockEventCache.getSolidBlockEvents(solidId);
List<BlockEvent> blockEvents;

try {
blockEvents = BlockEventCache.getSolidBlockEvents(solidId);
} catch (Exception e) {
logger.warn("Get solid events failed. {}", e.getMessage());
return;
}

blockEvents.forEach(v -> flush(v));

Expand Down
1 change: 1 addition & 0 deletions framework/src/test/java/org/tron/core/event/BlockEventCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public void test() throws Exception {
BlockCapsule.BlockId b1 = new BlockCapsule.BlockId(getBlockId(), 1);
be1.setBlockId(b1);
be1.setParentId(b1);
be1.setSolidId(b1);
try {
BlockEventCache.add(be1);
Assert.fail();
Expand Down
9 changes: 9 additions & 0 deletions framework/src/test/java/org/tron/core/event/SolidEventServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ public class SolidEventServiceTest {

@Test
public void test() throws Exception {
BlockEvent be0 = new BlockEvent();
BlockCapsule.BlockId b0 = new BlockCapsule.BlockId(BlockEventCacheTest.getBlockId(), 1);
be0.setBlockId(b0);
be0.setParentId(b0);
be0.setSolidId(new BlockCapsule.BlockId(BlockEventCacheTest.getBlockId(), 100));
BlockEventCache.init(b0);
BlockEventCache.add(be0);
solidEventService.work();

BlockEvent be1 = new BlockEvent();
BlockCapsule.BlockId b1 = new BlockCapsule.BlockId(BlockEventCacheTest.getBlockId(), 1);
be1.setBlockId(b1);
Expand Down