Skip to content

CE-122 storage: fix notifications #451

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
nofateg merged 3 commits into from
Dec 8, 2025
Merged

CE-122 storage: fix notifications #451

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
232955a
CE-122 storage: fix notifications
nofateg Dec 8, 2025
a388770
CE-122 storage: fix notifications
nofateg Dec 8, 2025
c196c17
CE-122 storage: fix notifications
nofateg Dec 8, 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
12 changes: 6 additions & 6 deletions oap-storage/oap-storage/src/main/java/oap/storage/MemoryStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,43 +228,43 @@ public long size() {

protected void fireAdded( Id id, Metadata<Data> medatada ) {
for( DataListener<Id, Data> dataListener : this.dataListeners ) {
dataListener.added( List.of( IdObject.__io( id, medatada ) ) );
dataListener.changed( List.of( IdObject.__io( id, medatada ) ), List.of(), List.of() );
}
}

protected void fireAdded( List<IdObject<Id, Data>> objects ) {
if( !objects.isEmpty() ) {
for( DataListener<Id, Data> dataListener : this.dataListeners ) {
dataListener.added( objects );
dataListener.changed( objects, List.of(), List.of() );
}
}
}

protected void fireUpdated( Id id, Metadata<Data> metadata ) {
for( DataListener<Id, Data> dataListener : this.dataListeners ) {
dataListener.updated( List.of( IdObject.__io( id, metadata ) ) );
dataListener.changed( List.of(), List.of( IdObject.__io( id, metadata ) ), List.of() );
}
}

protected void fireUpdated( List<IdObject<Id, Data>> objects ) {
if( !objects.isEmpty() ) {
for( DataListener<Id, Data> dataListener : this.dataListeners ) {
dataListener.updated( objects );
dataListener.changed( List.of(), objects, List.of() );
}
}
}

protected void fireDeleted( List<IdObject<Id, Data>> objects ) {
if( !objects.isEmpty() ) {
for( DataListener<Id, Data> dataListener : this.dataListeners ) {
dataListener.deleted( objects );
dataListener.changed( List.of(), List.of(), objects );
}
}
}

protected void fireDeleted( Id id, Metadata<Data> object ) {
for( DataListener<Id, Data> dataListener : this.dataListeners ) {
dataListener.deleted( List.of( IdObject.__io( id, object ) ) );
dataListener.changed( List.of(), List.of(), List.of( IdObject.__io( id, object ) ) );
}
}

Expand Down
8 changes: 3 additions & 5 deletions oap-storage/oap-storage/src/main/java/oap/storage/Replicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ public synchronized Pair<Long, String> replicate( Pair<Long, String> last ) {
if( slave.memory.put( id, Metadata.from( metadata ) ) ) added.add( __io( id, metadata ) );
else updated.add( __io( id, metadata ) );
}
slave.fireAdded( added );
slave.fireUpdated( updated );

stored.addAndGet( newUpdates.size() );
}
Expand All @@ -167,13 +165,13 @@ public synchronized Pair<Long, String> replicate( Pair<Long, String> last ) {
.map( Optional::get )
.toList();
log.trace( "[{}] deleted {}", uniqueName, deleted );
slave.fireDeleted( deleted );

Replicator.deleted.addAndGet( deleted.size() );

if( !added.isEmpty() || !updated.isEmpty() || !deleted.isEmpty() ) {
slave.fireChanged( added, updated, deleted );
}

Replicator.deleted.addAndGet( deleted.size() );

return __( lastUpdate, hash );
}

Expand Down
12 changes: 11 additions & 1 deletion oap-storage/oap-storage/src/main/java/oap/storage/Storage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,17 @@ default void permanentlyDeleted( IdObject<DI, D> object ) {}
*/
default void changed( List<DataListener.IdObject<DI, D>> added,
List<DataListener.IdObject<DI, D>> updated,
List<DataListener.IdObject<DI, D>> deleted ) {}
List<DataListener.IdObject<DI, D>> deleted ) {
if( !added.isEmpty() ) {
added( added );
}
if( !updated.isEmpty() ) {
updated( updated );
}
if( !deleted.isEmpty() ) {
deleted( deleted );
}
}

@ToString
@EqualsAndHashCode
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</distributionManagement>

<properties>
<oap.project.version>25.0.15</oap.project.version>
<oap.project.version>25.0.16</oap.project.version>

<oap.deps.config.version>22.0.1</oap.deps.config.version>
<oap.deps.oap-teamcity.version>25.0.0</oap.deps.oap-teamcity.version>
Expand Down