You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by gi...@apache.org on 2018/08/17 15:54:11 UTC
[incubator-druid] branch master updated: Serde test for
JdbcExtractionNamespace. (#6186)
This is an automated email from the ASF dual-hosted git repository.
gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new 4d2ff0f Serde test for JdbcExtractionNamespace. (#6186)
4d2ff0f is described below
commit 4d2ff0f6c74c840c647e5eabd8fc8b910a531d0d
Author: Gian Merlino <gi...@gmail.com>
AuthorDate: Fri Aug 17 11:54:06 2018 -0400
Serde test for JdbcExtractionNamespace. (#6186)
---
.../metadata/MetadataStorageConnectorConfig.java | 1 +
.../cache/JdbcExtractionNamespaceTest.java | 43 ++++++++++++++++++++--
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/common/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java b/common/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java
index 4842cef..c9d9cd2 100644
--- a/common/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java
+++ b/common/src/main/java/io/druid/metadata/MetadataStorageConnectorConfig.java
@@ -59,6 +59,7 @@ public class MetadataStorageConnectorConfig
return port;
}
+ @JsonProperty
public String getConnectURI()
{
if (connectURI == null) {
diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java
index 8104e94..007ba07 100644
--- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java
@@ -26,14 +26,16 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import io.druid.common.config.NullHandling;
-import io.druid.java.util.common.concurrent.Execs;
import io.druid.java.util.common.StringUtils;
+import io.druid.java.util.common.concurrent.Execs;
import io.druid.java.util.common.io.Closer;
import io.druid.java.util.common.lifecycle.Lifecycle;
import io.druid.java.util.common.logger.Logger;
import io.druid.metadata.TestDerbyConnector;
import io.druid.query.lookup.namespace.CacheGenerator;
+import io.druid.query.lookup.namespace.ExtractionNamespace;
import io.druid.query.lookup.namespace.JdbcExtractionNamespace;
+import io.druid.server.ServerTestHelper;
import io.druid.server.lookup.namespace.JdbcCacheGenerator;
import io.druid.server.lookup.namespace.NamespaceExtractionConfig;
import io.druid.server.metrics.NoopServiceEmitter;
@@ -225,7 +227,11 @@ public class JdbcExtractionNamespaceTest
}
}
),
- new OnHeapNamespaceExtractionCacheManager(lifecycle, noopServiceEmitter, new NamespaceExtractionConfig())
+ new OnHeapNamespaceExtractionCacheManager(
+ lifecycle,
+ noopServiceEmitter,
+ new NamespaceExtractionConfig()
+ )
);
try {
lifecycle.start();
@@ -382,7 +388,11 @@ public class JdbcExtractionNamespaceTest
String key = e.getKey();
String[] val = e.getValue();
String field = val[0];
- Assert.assertEquals("non-null check", NullHandling.emptyToNullIfNeeded(field), NullHandling.emptyToNullIfNeeded(map.get(key)));
+ Assert.assertEquals(
+ "non-null check",
+ NullHandling.emptyToNullIfNeeded(field),
+ NullHandling.emptyToNullIfNeeded(map.get(key))
+ );
}
Assert.assertEquals("null check", null, map.get("baz"));
}
@@ -412,7 +422,11 @@ public class JdbcExtractionNamespaceTest
String filterVal = val[1];
if ("1".equals(filterVal)) {
- Assert.assertEquals("non-null check", NullHandling.emptyToNullIfNeeded(field), NullHandling.emptyToNullIfNeeded(map.get(key)));
+ Assert.assertEquals(
+ "non-null check",
+ NullHandling.emptyToNullIfNeeded(field),
+ NullHandling.emptyToNullIfNeeded(map.get(key))
+ );
} else {
Assert.assertEquals("non-null check", null, NullHandling.emptyToNullIfNeeded(map.get(key)));
}
@@ -457,6 +471,27 @@ public class JdbcExtractionNamespaceTest
}
}
+ @Test
+ public void testSerde() throws IOException
+ {
+ final JdbcExtractionNamespace extractionNamespace = new JdbcExtractionNamespace(
+ derbyConnectorRule.getMetadataConnectorConfig(),
+ tableName,
+ keyName,
+ valName,
+ tsColumn,
+ "some filter",
+ new Period(10)
+ );
+
+ final ExtractionNamespace extractionNamespace2 = ServerTestHelper.MAPPER.readValue(
+ ServerTestHelper.MAPPER.writeValueAsBytes(extractionNamespace),
+ ExtractionNamespace.class
+ );
+
+ Assert.assertEquals(extractionNamespace, extractionNamespace2);
+ }
+
private CacheScheduler.Entry ensureEntry()
throws InterruptedException
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org