Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NPE while loading lookups from empty JDBC source (#16307)

This commit is contained in:
Akshat Jain 2024-04-18 21:52:02 +05:30 committed by GitHub
parent 960a674442
commit 79e48c6b45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/JdbcCacheGenerator.java
View File

@ -204,18 +204,20 @@ public final class JdbcCacheGenerator implements CacheGenerator<JdbcExtractionNa
if (tsColumn == null) {
return null;
}
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();
}
final String query = StringUtils.format(
"SELECT MAX(%s) FROM %s",
tsColumn, table
);
final Timestamp update = dbi.withHandle(
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
extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java
View File

@ -121,7 +121,7 @@ public class NamespacedExtractorModuleTest
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

30
extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java vendored
View File

@ -390,6 +390,36 @@ public class JdbcExtractionNamespaceTest
}
}
@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