Skip to content

Prevent cache lock for long DB statement parsing #2294

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
jtduffy merged 2 commits into from
Apr 3, 2025
Merged

Prevent cache lock for long DB statement parsing #2294

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
c96682a
Prevent cache lock for long DB statement parsing
jtduffy Apr 1, 2025
dbf4a39
Merge branch 'main' into db-parser-optimization
jtduffy Apr 2, 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
11 changes: 8 additions & 3 deletions newrelic-agent/src/main/java/com/newrelic/agent/database/CachingDatabaseStatementParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,14 @@ public ParsedDatabaseStatement getParsedDatabaseStatement(final DatabaseVendor d
return UNPARSEABLE_STATEMENT;
}

return getOrCreateCache().get(
statement,
s -> databaseStatementParser.getParsedDatabaseStatement(databaseVendor, statement, resultSetMetaData));
Cache<String, ParsedDatabaseStatement> cache = getOrCreateCache();
ParsedDatabaseStatement parsedStatement = cache.getIfPresent(statement);
if (parsedStatement == null) {
parsedStatement = databaseStatementParser.getParsedDatabaseStatement(databaseVendor, statement, resultSetMetaData);
cache.put(statement, parsedStatement);
}

return parsedStatement;
} catch (RuntimeException ex) {
toLog = ex;
}
Expand Down
13 changes: 8 additions & 5 deletions ...c-agent/src/test/java/com/newrelic/agent/database/CachingDatabaseStatementParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@

import java.sql.ResultSetMetaData;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
Expand All @@ -24,8 +20,15 @@ public void getParsedDatabaseStatement_cachesSqlStatement() {
DatabaseStatementParser mockParser = mock(DatabaseStatementParser.class);
CachingDatabaseStatementParser cache = new CachingDatabaseStatementParser(mockParser);

when(mockParser.getParsedDatabaseStatement(any(), eq("sql"), any())).thenReturn(new ParsedDatabaseStatement("tablename", "select", true));

// Initial call will cache the result
ParsedDatabaseStatement statement = cache.getParsedDatabaseStatement(mock(DatabaseVendor.class), "sql", mock(ResultSetMetaData.class));
verify(mockParser, times(1)).getParsedDatabaseStatement(any(), eq("sql"), any());

// Subsequent calls will retrieve the value from the cache and not call the databaseStatementParser again
assertEquals(statement, cache.getParsedDatabaseStatement(mock(DatabaseVendor.class), "sql", mock(ResultSetMetaData.class)));
verify(mockParser, times(1)).getParsedDatabaseStatement(any(), eq("sql"), any());
}

@Test
Expand All @@ -34,4 +37,4 @@ public void getParsedDatabaseStatement_withNullStatement_returnsUnparseableState
CachingDatabaseStatementParser cache = new CachingDatabaseStatementParser(mockParser);
assertEquals(DatabaseStatementParser.UNPARSEABLE_STATEMENT, cache.getParsedDatabaseStatement(mock(DatabaseVendor.class), null, null));
}
}
}
Loading