Skip to content

Optimizations for TypeSafeDriverConfig #1616

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

Merged
merged 4 commits into from
Nov 18, 2022
Merged

Optimizations for TypeSafeDriverConfig #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68d6d4c
TypesafeDriverConfig: getProfile can avoid calling containsKey
chibenwa Nov 8, 2022
3f821d9
TypesafeDriverConfig: optimize getDefaultProfile
chibenwa Nov 8, 2022
da376d1
Merge branch '4.x' into default-conf
chibenwa Nov 8, 2022
45b77dc
fixup! TypesafeDriverConfig: optimize getDefaultProfile
chibenwa Nov 16, 2022
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
19 changes: 14 additions & 5 deletions ...main/java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import edu.umd.cs.findbugs.annotations.NonNull;
import java.net.URL;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import net.jcip.annotations.ThreadSafe;
import org.slf4j.Logger;
Expand All @@ -50,6 +51,8 @@ public class TypesafeDriverConfig implements DriverConfig {

private final Map<DriverOption, Object> defaultOverrides = new ConcurrentHashMap<>();

private final TypesafeDriverExecutionProfile.Base defaultProfile;

public TypesafeDriverConfig(Config config) {
this.lastLoadedConfig = config;
Map<String, Config> profileConfigs = extractProfiles(config);
Expand All @@ -62,6 +65,7 @@ public TypesafeDriverConfig(Config config) {
new TypesafeDriverExecutionProfile.Base(entry.getKey(), entry.getValue()));
}
this.profiles = builder.build();
this.defaultProfile = profiles.get(DriverExecutionProfile.DEFAULT_NAME);
}

/** @return whether the configuration changed */
Expand Down Expand Up @@ -136,14 +140,19 @@ private Map<String, Config> extractProfiles(Config sourceConfig) {
return result.build();
}

@Override
public DriverExecutionProfile getDefaultProfile() {
return defaultProfile;
}

@NonNull
@Override
public DriverExecutionProfile getProfile(@NonNull String profileName) {
Preconditions.checkArgument(
profiles.containsKey(profileName),
"Unknown profile '%s'. Check your configuration.",
profileName);
return profiles.get(profileName);
if (profileName.equals(DriverExecutionProfile.DEFAULT_NAME)) {
return defaultProfile;
}
return Optional.ofNullable(profiles.get(profileName))
.orElseThrow(() -> new IllegalArgumentException(String.format("Unknown profile '%s'. Check your configuration.", profileName)));
}

@NonNull
Expand Down
8 changes: 8 additions & 0 deletions .../java/com/datastax/oss/driver/internal/core/config/typesafe/TypesafeDriverConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,14 @@ public void should_enumerate_options() {
entry("int1", 45));
}

@Test
public void should_update_default_profile_on_reload() {
TypesafeDriverConfig config = parse("int1 = 42\n profiles { profile1 { int1 = 43 } }");
assertThat(config.getDefaultProfile().getInt(MockOptions.INT1)).isEqualTo(42);
config.reload(ConfigFactory.parseString("int1 = 44\n profiles { profile1 { int1 = 45 } }"));
assertThat(config.getDefaultProfile().getInt(MockOptions.INT1)).isEqualTo(44);
}

private TypesafeDriverConfig parse(String configString) {
Config config = ConfigFactory.parseString(configString);
return new TypesafeDriverConfig(config);
Expand Down