Skip to content

Don't use explicit Guice binding for config class #14039

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

Closed
ksobolew wants to merge 1 commit into from
Closed

Don't use explicit Guice binding for config class #14039

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
6 changes: 3 additions & 3 deletions plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/HiveMetastoreModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.Optional;

import static io.airlift.configuration.ConditionalModule.conditionalModule;
import static io.airlift.configuration.ConfigBinder.configBinder;

public class HiveMetastoreModule
extends AbstractConfigurationAwareModule
Expand All @@ -42,9 +43,8 @@ protected void setup(Binder binder)
{
if (metastore.isPresent()) {
binder.bind(HiveMetastoreFactory.class).annotatedWith(RawHiveMetastoreFactory.class).toInstance(HiveMetastoreFactory.ofInstance(metastore.get()));
MetastoreTypeConfig metastoreTypeConfig = new MetastoreTypeConfig();
metastoreTypeConfig.setMetastoreType("provided");
binder.bind(MetastoreTypeConfig.class).toInstance(metastoreTypeConfig);
Copy link
Copy Markdown
Member

@findepi findepi Sep 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was intentionally like this

configBinder(binder).bindConfigDefaults(MetastoreTypeConfig.class, config -> config.setMetastoreType("provided"));
configBinder(binder).bindConfig(MetastoreTypeConfig.class);
Copy link
Copy Markdown
Member

@findepi findepi Sep 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is wrong. Here the code intention is not to expose any configurable properties

Copy link
Copy Markdown
Contributor Author

@ksobolew ksobolew Sep 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I talked with @homar about this and was under the impression that this was done this way because there was no better way. I kinda understand why it's like this, but the current way is wrong too :)

Here the code intention is not to expose any configurable properties

I get that. But this code path is only used when HiveQueryRunner is used, so I added an assertion there to prevent setting this property. I was hoping this would have the same effect 🤷

}
else {
bindMetastoreModule("thrift", new ThriftMetastoreModule());
Expand Down
4 changes: 4 additions & 0 deletions plugin/trino-hive/src/test/java/io/trino/plugin/hive/HiveQueryRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.Assert.assertEquals;

public final class HiveQueryRunner
Expand Down Expand Up @@ -138,6 +139,9 @@ public SELF setSkipTimezoneSetup(boolean skipTimezoneSetup)

public SELF setHiveProperties(Map<String, String> hiveProperties)
{
assertThat(hiveProperties)
.withFailMessage("Setting hive.metastore is not allowed in HiveQueryRunner")
.doesNotContainKey("hive.metastore");
this.hiveProperties = ImmutableMap.<String, String>builder()
.putAll(requireNonNull(hiveProperties, "hiveProperties is null"));
return self();
Expand Down