Skip to content
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

set cluster info type to Catalog Type #569

Merged
merged 2 commits into from
Feb 8, 2024
+3 −3
Merged

set cluster info type to Catalog Type #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e281689
set cluster info type to Catalog Type
Feb 8, 2024
3dc3e20
adjust test
Feb 8, 2024
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
2 changes: 1 addition & 1 deletion ...mmon-server/src/main/java/com/netflix/metacat/common/server/spi/MetacatCatalogConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static MetacatCatalogConfig createFromMapAndRemoveProperties(
final String clusterEnv = properties.get(Keys.CLUSTER_ENV);
final String clusterRegion = properties.get(Keys.CLUSTER_REGION);
final ClusterInfo clusterInfo =
new ClusterInfo(clusterName, type, clusterAccount, clusterAccountId, clusterEnv, clusterRegion);
new ClusterInfo(clusterName, catalogType, clusterAccount, clusterAccountId, clusterEnv, clusterRegion);

return new MetacatCatalogConfig(catalogType, catalogName, clusterInfo, includeViewsWithTables, schemaWhitelist,
schemaBlacklist, thriftPort, cacheEnabled, interceptorEnabled, hasDataExternal);
Expand Down
4 changes: 2 additions & 2 deletions ...t-main/src/test/groovy/com/netflix/metacat/main/services/impl/TableServiceImplSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ class TableServiceImplSpec extends Specification {
def usermetadataService = Mock(UserMetadataService)
def eventBus = Mock(MetacatEventBus)
def converterUtil = Mock(ConverterUtil)
def catalogConfig = MetacatCatalogConfig.createFromMapAndRemoveProperties('hive', 'a', ['metacat.interceptor.enabled': 'true', 'metacat.has-data-external':'true'])
def catalogConfigFalse = MetacatCatalogConfig.createFromMapAndRemoveProperties('hive', 'a', ['metacat.interceptor.enabled': 'false', 'metacat.has-data-external':'false'])
def catalogConfig = MetacatCatalogConfig.createFromMapAndRemoveProperties('migration', 'a', ['metacat.interceptor.enabled': 'true', 'metacat.has-data-external':'true', 'metacat.type': 'hive'])
def catalogConfigFalse = MetacatCatalogConfig.createFromMapAndRemoveProperties('migration', 'a', ['metacat.interceptor.enabled': 'false', 'metacat.has-data-external':'false', 'metacat.type': 'hive'])
def registry = new NoopRegistry()
def config = Mock(Config)
def tableDto = DataDtoProvider.getTable('a', 'b', 'c', "amajumdar", "s3:/a/b")
Expand Down
Loading