Skip to content
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

Hopefully add better timeouts and ordering to JDBCExtractionNamespaceTest #1658

Merged
merged 1 commit into from
Sep 2, 2015
+170 −177
Merged

Hopefully add better timeouts and ordering to JDBCExtractionNamespaceTest #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 24 deletions ...ookup/src/main/java/io/druid/server/namespace/JDBCExtractionNamespaceFunctionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,21 @@

import com.google.common.base.Function;
import com.google.common.base.Strings;
import com.google.inject.Inject;
import com.metamx.common.Pair;
import io.druid.common.utils.JodaUtils;
import io.druid.query.extraction.namespace.ExtractionNamespaceFunctionFactory;
import io.druid.query.extraction.namespace.JDBCExtractionNamespace;
import io.druid.server.namespace.cache.NamespaceExtractionCacheManager;
import org.skife.jdbi.v2.DBI;
import org.skife.jdbi.v2.FoldController;
import org.skife.jdbi.v2.Folder3;
import org.skife.jdbi.v2.Handle;
import org.skife.jdbi.v2.StatementContext;
import org.skife.jdbi.v2.tweak.HandleCallback;
import org.skife.jdbi.v2.tweak.ResultSetMapper;
import org.skife.jdbi.v2.util.StringMapper;
import org.skife.jdbi.v2.util.TimestampMapper;

import javax.annotation.Nullable;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
Expand Down Expand Up @@ -82,7 +76,7 @@ public Callable<String> getCachePopulator(
{
final long lastCheck = lastVersion == null ? JodaUtils.MIN_INSTANT : Long.parseLong(lastVersion);
final Long lastDBUpdate = lastUpdates(namespace);
if(lastDBUpdate != null && lastDBUpdate <= lastCheck){
if (lastDBUpdate != null && lastDBUpdate <= lastCheck) {
return new Callable<String>()
{
@Override
Expand Down Expand Up @@ -132,23 +126,7 @@ public Pair<String, String> map(
return new Pair<String, String>(r.getString(keyColumn), r.getString(valueColumn));
}
}
).fold(
new LinkedList<Pair<String, String>>(),
new Folder3<LinkedList<Pair<String, String>>, Pair<String, String>>()
{
@Override
public LinkedList<Pair<String, String>> fold(
LinkedList<Pair<String, String>> accumulator,
Pair<String, String> rs,
FoldController control,
StatementContext ctx
) throws SQLException
{
accumulator.add(rs);
return accumulator;
}
}
);
).list();
}
}
);
Expand Down
2 changes: 1 addition & 1 deletion ...lookup/src/main/java/io/druid/server/namespace/cache/NamespaceExtractionCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
})
public abstract class NamespaceExtractionCacheManager
{
private static class NamespaceImplData
protected static class NamespaceImplData
{
public NamespaceImplData(
final ListenableFuture<?> future,
Expand Down
Loading