Skip to content

Commit 3ff4f01

Browse files
committed
Add unit test case for druid.hadoop.config.resources
1 parent cc6ef24 commit 3ff4f01

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

presto-druid/src/main/java/com/facebook/presto/druid/DruidConfig.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,17 @@ public List<String> getHadoopResourceConfigFiles()
9494
@Config("druid.hadoop.config.resources")
9595
public DruidConfig setHadoopResourceConfigFiles(String files)
9696
{
97-
this.hadoopResourceConfigFiles = Splitter.on(',').trimResults().omitEmptyStrings().splitToList(files);
97+
if (files != null) {
98+
this.hadoopResourceConfigFiles = Splitter.on(',').trimResults().omitEmptyStrings().splitToList(files);
99+
}
98100
return this;
99101
}
100102

101103
public DruidConfig setHadoopResourceConfigFiles(List<String> files)
102104
{
103-
this.hadoopResourceConfigFiles = ImmutableList.copyOf(files);
105+
if (files != null) {
106+
this.hadoopResourceConfigFiles = ImmutableList.copyOf(files);
107+
}
104108
return this;
105109
}
106110
}

presto-druid/src/test/java/com/facebook/presto/druid/TestDruidConfig.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package com.facebook.presto.druid;
1515

1616
import com.facebook.airlift.configuration.testing.ConfigAssertions;
17+
import com.google.common.collect.ImmutableList;
1718
import com.google.common.collect.ImmutableMap;
1819
import org.testng.annotations.Test;
1920

@@ -28,10 +29,11 @@ public class TestDruidConfig
2829
public void testDefaults()
2930
{
3031
assertRecordedDefaults(recordDefaults(DruidConfig.class)
31-
.setDruidBrokerUrl(null)
32-
.setDruidCoordinatorUrl(null)
33-
.setDruidSchema("druid")
34-
.setComputePushdownEnabled(false));
32+
.setDruidBrokerUrl(null)
33+
.setDruidCoordinatorUrl(null)
34+
.setDruidSchema("druid")
35+
.setComputePushdownEnabled(false)
36+
.setHadoopResourceConfigFiles((String) null));
3537
}
3638

3739
@Test
@@ -42,13 +44,15 @@ public void testExplicitPropertyMappings()
4244
.put("druid.coordinator-url", "http://druid.coordinator:4321")
4345
.put("druid.schema-name", "test")
4446
.put("druid.compute-pushdown-enabled", "true")
47+
.put("druid.hadoop.config.resources", "/etc/core-site.xml,/etc/hdfs-site.xml")
4548
.build();
4649

4750
DruidConfig expected = new DruidConfig()
4851
.setDruidBrokerUrl("http://druid.broker:1234")
4952
.setDruidCoordinatorUrl("http://druid.coordinator:4321")
5053
.setDruidSchema("test")
51-
.setComputePushdownEnabled(true);
54+
.setComputePushdownEnabled(true)
55+
.setHadoopResourceConfigFiles(ImmutableList.of("/etc/core-site.xml", "/etc/hdfs-site.xml"));
5256

5357
ConfigAssertions.assertFullMapping(properties, expected);
5458
}

0 commit comments

Comments
 (0)