Skip to content

fix: MemoryLoggerBackend#asRowBinary #470

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 2 commits into from
Mar 18, 2026
Merged

fix: MemoryLoggerBackend#asRowBinary #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a99ab17
fix: MemoryLoggerBackend#asRowBinary
nofateg Mar 18, 2026
a8be034
fix: MemoryLoggerBackend#asRowBinary
nofateg Mar 18, 2026
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
26 changes: 20 additions & 6 deletions oap-formats/oap-logstream/oap-logstream/src/main/java/oap/logstream/MemoryLoggerBackend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

package oap.logstream;

import com.google.common.base.Preconditions;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import lombok.SneakyThrows;
import oap.io.Closeables;
import oap.logstream.LogStreamProtocol.ProtocolVersion;
Expand All @@ -48,7 +50,7 @@ public class MemoryLoggerBackend extends AbstractLoggerBackend {

@Override
public synchronized String log( ProtocolVersion version, String hostName, String filePreffix, Map<String, String> properties, String logType,
String[] headers, byte[][] types, byte[] buffer, int offset, int length ) {
String[] headers, byte[][] types, byte[] buffer, int offset, int length ) {
LogId logId = new LogId( filePreffix, logType, hostName, properties, headers, types );
outputs
.computeIfAbsent( logId, fn -> new ByteArrayOutputStream() )
Expand Down Expand Up @@ -133,19 +135,31 @@ public List<List<Object>> asRowBinary( Predicate<LogId> filter, String... header

for( LogId id : outputs.keySet() ) {
if( filter.test( id ) ) {
IntArrayList rows = new IntArrayList();
if( headers.length == 0 ) {
for( int i = 0; i < id.headers.length; i++ ) {
rows.add( i );
}
} else {
for( String header : headers ) {
int index = ArrayUtils.indexOf( id.headers, header );

Preconditions.checkArgument( index >= 0, "header " + header + " not found" );

rows.add( index );
}
}

ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream( outputs.getOrDefault( id, new ByteArrayOutputStream() ).toByteArray() );
RowBinaryInputStream rowBinaryInputStream = new RowBinaryInputStream( byteArrayInputStream, id.headers, id.types );

List<Object> objects;
while( ( objects = rowBinaryInputStream.readRow() ) != null ) {
ArrayList<Object> filtered = new ArrayList<>();
for( int i = 0; i < id.headers.length; i++ ) {
if( headers.length == 0 || ArrayUtils.contains( headers, id.headers[i] ) ) {
filtered.add( objects.get( i ) );
}
for( int i : rows ) {
filtered.add( objects.get( i ) );
}


ret.add( filtered );
}
}
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 @@ -57,7 +57,7 @@
</distributionManagement>

<properties>
<oap.project.version>25.4.7</oap.project.version>
<oap.project.version>25.4.8</oap.project.version>

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