Skip to content

Update Thrift Hive metastore to follow new pattern established in HiveMetastoreFactory #12806

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
dain merged 5 commits into from
Jun 25, 2022
Merged

Update Thrift Hive metastore to follow new pattern established in HiveMetastoreFactory #12806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8c4daf
Add TestingThriftHiveMetastoreBuilder
dain Mar 12, 2022
f92ca3f
Move Hive metastore creation to TokenDelegationThriftMetastoreFactory
dain Mar 12, 2022
13ddb1f
Cleanup ThriftHiveMetastore
dain Mar 14, 2022
93fee32
Add ThriftMetastoreFactory
dain Jun 11, 2022
4e24f76
Move ThriftHiveMetastore identity from method parameters to constructor
dain Jun 11, 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
10 changes: 7 additions & 3 deletions ...ke/src/test/java/io/trino/plugin/deltalake/TestDeltaLakePerTransactionMetastoreCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@
import io.trino.plugin.hive.metastore.thrift.StaticMetastoreConfig;
import io.trino.plugin.hive.metastore.thrift.StaticMetastoreLocator;
import io.trino.plugin.hive.metastore.thrift.ThriftHiveMetastore;
import io.trino.plugin.hive.metastore.thrift.ThriftMetastore;
import io.trino.plugin.hive.metastore.thrift.ThriftHiveMetastoreFactory;
import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreAuthenticationModule;
import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreClientFactory;
import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreConfig;
import io.trino.plugin.hive.metastore.thrift.ThriftMetastoreFactory;
import io.trino.plugin.hive.metastore.thrift.TokenDelegationThriftMetastoreFactory;
import io.trino.spi.security.ConnectorIdentity;
import io.trino.testing.DistributedQueryRunner;
import io.trino.tpch.TpchEntity;
Expand Down Expand Up @@ -107,8 +109,10 @@ protected void setup(Binder binder)
binder.bind(MetastoreLocator.class).to(StaticMetastoreLocator.class).in(Scopes.SINGLETON);
configBinder(binder).bindConfig(StaticMetastoreConfig.class);
configBinder(binder).bindConfig(ThriftMetastoreConfig.class);
binder.bind(ThriftMetastore.class).to(ThriftHiveMetastore.class).in(Scopes.SINGLETON);
newExporter(binder).export(ThriftMetastore.class).as((generator) -> generator.generatedNameOf(ThriftHiveMetastore.class));
binder.bind(TokenDelegationThriftMetastoreFactory.class);
binder.bind(ThriftMetastoreFactory.class).to(ThriftHiveMetastoreFactory.class).in(Scopes.SINGLETON);
newExporter(binder).export(ThriftMetastoreFactory.class)
.as(generator -> generator.generatedNameOf(ThriftHiveMetastore.class));
install(new ThriftMetastoreAuthenticationModule());
binder.bind(BridgingHiveMetastoreFactory.class).in(Scopes.SINGLETON);
}
Expand Down
4 changes: 2 additions & 2 deletions plugin/trino-hive-hadoop2/src/test/java/io/trino/plugin/hive/TestHiveAlluxioMetastore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import alluxio.client.table.TableMasterClient;
import alluxio.conf.PropertyKey;
import io.trino.plugin.hive.authentication.NoHdfsAuthentication;
import io.trino.plugin.hive.metastore.HiveMetastoreConfig;
import io.trino.plugin.hive.metastore.alluxio.AlluxioHiveMetastore;
import io.trino.plugin.hive.metastore.alluxio.AlluxioHiveMetastoreConfig;
Expand All @@ -27,6 +26,7 @@

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT;

public class TestHiveAlluxioMetastore
extends AbstractTestHive
Expand Down Expand Up @@ -60,7 +60,7 @@ public void setup(String host, String port, int hiveVersionMajor, String timeZon
AlluxioHiveMetastoreConfig alluxioConfig = new AlluxioHiveMetastoreConfig();
alluxioConfig.setMasterAddress(this.alluxioAddress);
TableMasterClient client = AlluxioMetastoreModule.createCatalogMasterClient(alluxioConfig);
hdfsEnvironment = new HdfsEnvironment(createTestHdfsConfiguration(), new HdfsConfig(), new NoHdfsAuthentication());
hdfsEnvironment = HDFS_ENVIRONMENT;
setup(SCHEMA, hiveConfig, new AlluxioHiveMetastore(client, new HiveMetastoreConfig()), hdfsEnvironment);
}

Expand Down
79 changes: 0 additions & 79 deletions plugin/trino-hive/src/main/java/io/trino/plugin/hive/authentication/HiveIdentity.java
View file
Open in desktop

This file was deleted.

Loading