Skip to content

Fix NPE while loading lookups from empty JDBC source #16307

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
kfaraz merged 3 commits into from
Apr 18, 2024
Merged

Fix NPE while loading lookups from empty JDBC source #16307

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
3eb2bb8
Fix NPE while loading lookups from empty JDBC source
Akshat-Jain Apr 18, 2024
b68cdca
Fix formatting
Akshat-Jain Apr 18, 2024
e3604a2
Address review comment
Akshat-Jain Apr 18, 2024
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
22 changes: 12 additions & 10 deletions ...hed-global/src/main/java/org/apache/druid/server/lookup/namespace/JdbcCacheGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,20 @@ private Long lastUpdates(CacheScheduler.EntryImpl<JdbcExtractionNamespace> key,
if (tsColumn == null) {
return null;
}
final String query = StringUtils.format(
"SELECT MAX(%s) FROM %s",
tsColumn, table
);
final Timestamp update = dbi.withHandle(
handle -> {
final String query = StringUtils.format(
"SELECT MAX(%s) FROM %s",
tsColumn, table
);
return handle
.createQuery(query)
.map(TimestampMapper.FIRST)
.first();
}
handle -> handle
.createQuery(query)
.map(TimestampMapper.FIRST)
.first()
);
if (update == null) {
LOG.info("Lookup table[%s] is empty. No rows returned for the query[%s].", table, query);
return null;
}
return update.getTime();
}
}
2 changes: 1 addition & 1 deletion ...src/test/java/org/apache/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void testNewTask() throws Exception
Assert.assertNotNull(version);
Map<String, String> map = cache.getCache();
Assert.assertEquals("bar", map.get("foo"));
Assert.assertEquals(null, map.get("baz"));
Assert.assertNull(map.get("baz"));
}

@Test
Expand Down
30 changes: 30 additions & 0 deletions ...test/java/org/apache/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,36 @@ public void testMappingWithFilter()
}
}

@Test(timeout = 60_000L)
public void testEmptyTable()
throws InterruptedException
{
// Delete existing rows from table.
final Handle handle = derbyConnectorRule.getConnector().getDBI().open();
handle.createStatement(
StringUtils.format("DELETE FROM %s", TABLE_NAME)
).setQueryTimeout(1).execute();

final JdbcExtractionNamespace extractionNamespace = new JdbcExtractionNamespace(
derbyConnectorRule.getMetadataConnectorConfig(),
TABLE_NAME,
KEY_NAME,
VAL_NAME,
tsColumn,
null,
new Period(0),
null,
0,
null,
new JdbcAccessSecurityConfig()
);
try (CacheScheduler.Entry entry = scheduler.schedule(extractionNamespace)) {
CacheSchedulerTest.waitFor(entry);
final Map<String, String> map = entry.getCache();
Assert.assertTrue(map.isEmpty());
}
}

@Test(timeout = 60_000L)
public void testSkipOld()
throws InterruptedException
Expand Down