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

Fix JdbcCacheGenerator, null values shouldn't be allowed (#4881) 

* Fix JdbcCacheGenerator, null values shouldn't be allowed

* Add a test case for null values
This commit is contained in:
Guillaume Balaine 2017-10-06 18:31:48 +02:00 committed by Fangjin Yang
parent 4ff12e4394
commit 35944d24ae
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions-core/lookups-cached-global/src/main/java/io/druid/server/lookup/namespace/JdbcCacheGenerator.java
View File

@ -131,19 +131,21 @@ public final class JdbcCacheGenerator implements CacheGenerator<JdbcExtractionNa
{
if (Strings.isNullOrEmpty(filter)) {
return StringUtils.format(
"SELECT %s, %s FROM %s",
"SELECT %s, %s FROM %s WHERE %s IS NOT NULL",
keyColumn,
valueColumn,
table
table,
valueColumn
);
}
return StringUtils.format(
"SELECT %s, %s FROM %s WHERE %s",
"SELECT %s, %s FROM %s WHERE %s AND %s IS NOT NULL",
keyColumn,
valueColumn,
table,
filter
filter,
valueColumn
);
}

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

@ -52,6 +52,7 @@ import java.io.Closeable;
import java.io.IOException;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@ -335,19 +336,20 @@ public class JdbcExtractionNamespaceTest
throws InterruptedException
{
final String query;
final String statementVal = val != null ? "'%s'" : "%s";
if (tsColumn == null) {
handle.createStatement(
StringUtils.format("DELETE FROM %s WHERE %s='%s'", tableName, keyName, key)
).setQueryTimeout(1).execute();
query = StringUtils.format(
"INSERT INTO %s (%s, %s, %s) VALUES ('%s', '%s', '%s')",
"INSERT INTO %s (%s, %s, %s) VALUES ('%s', '%s', " + statementVal + ")",
tableName,
filterColumn, keyName, valName,
filter, key, val
);
} else {
query = StringUtils.format(
"INSERT INTO %s (%s, %s, %s, %s) VALUES ('%s', '%s', '%s', '%s')",
"INSERT INTO %s (%s, %s, %s, %s) VALUES ('%s', '%s', '%s', " + statementVal + ")",
tableName,
tsColumn, filterColumn, keyName, valName,
updateTs, filter, key, val
@ -445,6 +447,19 @@ public class JdbcExtractionNamespaceTest
}
}
@Test(timeout = 60_000L)
public void testIgnoresNullValues()
throws NoSuchFieldException, IllegalAccessException, ExecutionException, InterruptedException
{
try (final CacheScheduler.Entry entry = ensureEntry()) {
insertValues(handleRef, "fooz", null, null, "2900-01-01 00:00:00");
waitForUpdates(1_000L, 2L);
Thread.sleep(100);
Set set = entry.getCache().keySet();
Assert.assertFalse(set.contains("fooz"));
}
}
private CacheScheduler.Entry ensureEntry()
throws NoSuchFieldException, IllegalAccessException, InterruptedException
{