Skip to content

Commit 1ad263b

Browse files
agrawalreetikaagrawalreetika
committed
Handle SchemaTableName for iceberg tests
1 parent a603ff8 commit 1ad263b

11 files changed

+152
-0
lines changed

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/IcebergDistributedTestBase.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@
3333
import com.facebook.presto.hive.MetastoreClientConfig;
3434
import com.facebook.presto.hive.authentication.NoHdfsAuthentication;
3535
import com.facebook.presto.iceberg.delete.DeleteFile;
36+
import com.facebook.presto.metadata.CatalogManager;
3637
import com.facebook.presto.metadata.CatalogMetadata;
3738
import com.facebook.presto.metadata.Metadata;
3839
import com.facebook.presto.metadata.MetadataUtil;
3940
import com.facebook.presto.spi.ColumnHandle;
41+
import com.facebook.presto.spi.ConnectorId;
4042
import com.facebook.presto.spi.Constraint;
4143
import com.facebook.presto.spi.PrestoException;
4244
import com.facebook.presto.spi.TableHandle;
@@ -143,6 +145,7 @@
143145
import static com.facebook.presto.iceberg.IcebergSessionProperties.PUSHDOWN_FILTER_ENABLED;
144146
import static com.facebook.presto.iceberg.IcebergSessionProperties.STATISTIC_SNAPSHOT_RECORD_DIFFERENCE_WEIGHT;
145147
import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED;
148+
import static com.facebook.presto.sql.QueryUtil.identifier;
146149
import static com.facebook.presto.sql.planner.assertions.PlanMatchPattern.anyTree;
147150
import static com.facebook.presto.sql.planner.assertions.PlanMatchPattern.exchange;
148151
import static com.facebook.presto.sql.planner.assertions.PlanMatchPattern.filter;
@@ -2513,10 +2516,23 @@ private Table updateTable(String tableName)
25132516

25142517
protected Table loadTable(String tableName)
25152518
{
2519+
tableName = normalizeIdentifier(tableName);
25162520
Catalog catalog = CatalogUtil.loadCatalog(catalogType.getCatalogImpl(), "test-hive", getProperties(), new Configuration());
25172521
return catalog.loadTable(TableIdentifier.of("tpch", tableName));
25182522
}
25192523

2524+
protected String normalizeIdentifier(String name)
2525+
{
2526+
Metadata metadata = getQueryRunner().getMetadata();
2527+
TransactionId txid = getQueryRunner().getTransactionManager().beginTransaction(false);
2528+
Session session = getSession().beginTransactionId(txid, getQueryRunner().getTransactionManager(), new AllowAllAccessControl());
2529+
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
2530+
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
2531+
2532+
return metadata.normalizeIdentifier(session, connectorId.getCatalogName(),
2533+
name, identifier(name).isDelimited());
2534+
}
2535+
25202536
protected Map<String, String> getProperties()
25212537
{
25222538
File metastoreDir = getCatalogDirectory();

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/hive/TestIcebergDistributedHive.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public void testStatisticsFileCache()
6969
@Override
7070
protected Table loadTable(String tableName)
7171
{
72+
tableName = normalizeIdentifier(tableName);
7273
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
7374
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
7475

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/hive/TestIcebergHiveStatistics.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
import static com.facebook.presto.spi.StandardErrorCode.NOT_SUPPORTED;
9393
import static com.facebook.presto.spi.statistics.ColumnStatisticType.NUMBER_OF_DISTINCT_VALUES;
9494
import static com.facebook.presto.spi.statistics.ColumnStatisticType.TOTAL_SIZE_IN_BYTES;
95+
import static com.facebook.presto.sql.QueryUtil.identifier;
9596
import static com.facebook.presto.testing.assertions.Assert.assertEquals;
9697
import static com.facebook.presto.transaction.TransactionBuilder.transaction;
9798
import static java.lang.String.format;
@@ -575,6 +576,7 @@ private void deleteTableStatistics(String tableName)
575576

576577
private Table loadTable(String tableName)
577578
{
579+
tableName = normalizeIdentifier(tableName);
578580
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
579581
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
580582

@@ -585,6 +587,18 @@ private Table loadTable(String tableName)
585587
SchemaTableName.valueOf("tpch." + tableName));
586588
}
587589

590+
private String normalizeIdentifier(String name)
591+
{
592+
Metadata metadata = getQueryRunner().getMetadata();
593+
TransactionId txid = getQueryRunner().getTransactionManager().beginTransaction(false);
594+
Session session = getSession().beginTransactionId(txid, getQueryRunner().getTransactionManager(), new AllowAllAccessControl());
595+
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
596+
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
597+
598+
return metadata.normalizeIdentifier(session, connectorId.getCatalogName(),
599+
name, identifier(name).isDelimited());
600+
}
601+
588602
protected ExtendedHiveMetastore getFileHiveMetastore()
589603
{
590604
IcebergFileHiveMetastore fileHiveMetastore = new IcebergFileHiveMetastore(getHdfsEnvironment(),

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestExpireSnapshotProcedure.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@
1515

1616
import com.facebook.presto.Session;
1717
import com.facebook.presto.Session.SessionBuilder;
18+
import com.facebook.presto.common.transaction.TransactionId;
1819
import com.facebook.presto.common.type.TimeZoneKey;
1920
import com.facebook.presto.iceberg.IcebergConfig;
2021
import com.facebook.presto.iceberg.IcebergQueryRunner;
22+
import com.facebook.presto.metadata.CatalogManager;
23+
import com.facebook.presto.metadata.Metadata;
24+
import com.facebook.presto.spi.ConnectorId;
25+
import com.facebook.presto.spi.security.AllowAllAccessControl;
2126
import com.facebook.presto.testing.QueryRunner;
2227
import com.facebook.presto.tests.AbstractTestQueryFramework;
2328
import com.google.common.collect.ImmutableMap;
@@ -42,7 +47,9 @@
4247

4348
import static com.facebook.presto.SystemSessionProperties.LEGACY_TIMESTAMP;
4449
import static com.facebook.presto.iceberg.CatalogType.HADOOP;
50+
import static com.facebook.presto.iceberg.IcebergQueryRunner.ICEBERG_CATALOG;
4551
import static com.facebook.presto.iceberg.IcebergQueryRunner.getIcebergDataDirectoryPath;
52+
import static com.facebook.presto.sql.QueryUtil.identifier;
4653
import static java.lang.String.format;
4754
import static org.testng.Assert.assertEquals;
4855
import static org.testng.Assert.assertTrue;
@@ -248,10 +255,23 @@ private String getTimestampString(long timeMillsUtc, String zoneId)
248255

249256
private Table loadTable(String tableName)
250257
{
258+
tableName = normalizeIdentifier(tableName);
251259
Catalog catalog = CatalogUtil.loadCatalog(HadoopCatalog.class.getName(), ICEBERG_CATALOG, getProperties(), new Configuration());
252260
return catalog.loadTable(TableIdentifier.of(TEST_SCHEMA, tableName));
253261
}
254262

263+
protected String normalizeIdentifier(String name)
264+
{
265+
Metadata metadata = getQueryRunner().getMetadata();
266+
TransactionId txid = getQueryRunner().getTransactionManager().beginTransaction(false);
267+
Session session = getSession().beginTransactionId(txid, getQueryRunner().getTransactionManager(), new AllowAllAccessControl());
268+
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
269+
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
270+
271+
return metadata.normalizeIdentifier(session, connectorId.getCatalogName(),
272+
name, identifier(name).isDelimited());
273+
}
274+
255275
private Map<String, String> getProperties()
256276
{
257277
File metastoreDir = getCatalogDirectory();

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestFastForwardBranchProcedure.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@
1313
*/
1414
package com.facebook.presto.iceberg.procedure;
1515

16+
import com.facebook.presto.Session;
17+
import com.facebook.presto.common.transaction.TransactionId;
1618
import com.facebook.presto.iceberg.IcebergConfig;
1719
import com.facebook.presto.iceberg.IcebergQueryRunner;
20+
import com.facebook.presto.metadata.CatalogManager;
21+
import com.facebook.presto.metadata.Metadata;
22+
import com.facebook.presto.spi.ConnectorId;
23+
import com.facebook.presto.spi.security.AllowAllAccessControl;
1824
import com.facebook.presto.testing.QueryRunner;
1925
import com.facebook.presto.tests.AbstractTestQueryFramework;
2026
import com.google.common.collect.ImmutableMap;
@@ -32,6 +38,7 @@
3238

3339
import static com.facebook.presto.iceberg.CatalogType.HADOOP;
3440
import static com.facebook.presto.iceberg.IcebergQueryRunner.getIcebergDataDirectoryPath;
41+
import static com.facebook.presto.sql.QueryUtil.identifier;
3542
import static java.lang.String.format;
3643

3744
public class TestFastForwardBranchProcedure
@@ -262,10 +269,23 @@ public void testFastForwardNonExistingBranch()
262269

263270
private Table loadTable(String tableName)
264271
{
272+
tableName = normalizeIdentifier(tableName);
265273
Catalog catalog = CatalogUtil.loadCatalog(HadoopCatalog.class.getName(), ICEBERG_CATALOG, getProperties(), new Configuration());
266274
return catalog.loadTable(TableIdentifier.of(TEST_SCHEMA, tableName));
267275
}
268276

277+
protected String normalizeIdentifier(String name)
278+
{
279+
Metadata metadata = getQueryRunner().getMetadata();
280+
TransactionId txid = getQueryRunner().getTransactionManager().beginTransaction(false);
281+
Session session = getSession().beginTransactionId(txid, getQueryRunner().getTransactionManager(), new AllowAllAccessControl());
282+
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
283+
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
284+
285+
return metadata.normalizeIdentifier(session, connectorId.getCatalogName(),
286+
name, identifier(name).isDelimited());
287+
}
288+
269289
private Map<String, String> getProperties()
270290
{
271291
File metastoreDir = getCatalogDirectory();

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestRemoveOrphanFilesProcedureBase.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import com.facebook.presto.Session;
1717
import com.facebook.presto.Session.SessionBuilder;
18+
import com.facebook.presto.common.transaction.TransactionId;
1819
import com.facebook.presto.common.type.TimeZoneKey;
1920
import com.facebook.presto.hive.HdfsConfiguration;
2021
import com.facebook.presto.hive.HdfsConfigurationInitializer;
@@ -26,8 +27,12 @@
2627
import com.facebook.presto.iceberg.CatalogType;
2728
import com.facebook.presto.iceberg.IcebergConfig;
2829
import com.facebook.presto.iceberg.IcebergQueryRunner;
30+
import com.facebook.presto.metadata.CatalogManager;
31+
import com.facebook.presto.metadata.Metadata;
32+
import com.facebook.presto.spi.ConnectorId;
2933
import com.facebook.presto.spi.ConnectorSession;
3034
import com.facebook.presto.spi.SchemaTableName;
35+
import com.facebook.presto.spi.security.AllowAllAccessControl;
3136
import com.facebook.presto.testing.QueryRunner;
3237
import com.facebook.presto.tests.AbstractTestQueryFramework;
3338
import com.google.common.collect.ImmutableMap;
@@ -49,10 +54,12 @@
4954
import java.util.Map;
5055

5156
import static com.facebook.presto.SystemSessionProperties.LEGACY_TIMESTAMP;
57+
import static com.facebook.presto.iceberg.IcebergQueryRunner.ICEBERG_CATALOG;
5258
import static com.facebook.presto.iceberg.IcebergQueryRunner.getIcebergDataDirectoryPath;
5359
import static com.facebook.presto.iceberg.IcebergUtil.dataLocation;
5460
import static com.facebook.presto.iceberg.IcebergUtil.metadataLocation;
5561
import static com.facebook.presto.iceberg.procedure.RegisterTableProcedure.getFileSystem;
62+
import static com.facebook.presto.sql.QueryUtil.identifier;
5663
import static com.google.common.io.Files.createTempDir;
5764
import static java.lang.String.format;
5865
import static java.util.Objects.requireNonNull;
@@ -295,6 +302,18 @@ private Session sessionForTimezone(String zoneId, boolean legacyTimestamp)
295302
return sessionBuilder.build();
296303
}
297304

305+
protected String normalizeIdentifier(String name)
306+
{
307+
Metadata metadata = getQueryRunner().getMetadata();
308+
TransactionId txid = getQueryRunner().getTransactionManager().beginTransaction(false);
309+
Session session = getSession().beginTransactionId(txid, getQueryRunner().getTransactionManager(), new AllowAllAccessControl());
310+
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
311+
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
312+
313+
return metadata.normalizeIdentifier(session, connectorId.getCatalogName(),
314+
name, identifier(name).isDelimited());
315+
}
316+
298317
protected File getCatalogDirectory(CatalogType type)
299318
{
300319
Path dataDirectory = getDistributedQueryRunner().getCoordinator().getDataDirectory();

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestRemoveOrphanFilesProcedureHadoop.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ Table createTable(String tableName, String targetPath, Map<String, String> table
7474
@Override
7575
Table loadTable(String tableName)
7676
{
77+
tableName = normalizeIdentifier(tableName);
7778
Catalog catalog = CatalogUtil.loadCatalog(HADOOP.getCatalogImpl(), ICEBERG_CATALOG, getProperties(), new Configuration());
7879
return catalog.loadTable(TableIdentifier.of(TEST_SCHEMA, tableName));
7980
}

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestRemoveOrphanFilesProcedureHive.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ Table createTable(String tableName, String targetPath, Map<String, String> table
8686
@Override
8787
Table loadTable(String tableName)
8888
{
89+
tableName = normalizeIdentifier(tableName);
8990
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
9091
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
9192

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestRollbackToTimestampProcedure.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@
1515

1616
import com.facebook.presto.Session;
1717
import com.facebook.presto.Session.SessionBuilder;
18+
import com.facebook.presto.common.transaction.TransactionId;
1819
import com.facebook.presto.common.type.TimeZoneKey;
1920
import com.facebook.presto.iceberg.IcebergConfig;
2021
import com.facebook.presto.iceberg.IcebergQueryRunner;
22+
import com.facebook.presto.metadata.CatalogManager;
23+
import com.facebook.presto.metadata.Metadata;
24+
import com.facebook.presto.spi.ConnectorId;
25+
import com.facebook.presto.spi.security.AllowAllAccessControl;
2126
import com.facebook.presto.testing.QueryRunner;
2227
import com.facebook.presto.tests.AbstractTestQueryFramework;
2328
import com.google.common.collect.ImmutableMap;
@@ -42,6 +47,7 @@
4247
import static com.facebook.presto.SystemSessionProperties.LEGACY_TIMESTAMP;
4348
import static com.facebook.presto.iceberg.CatalogType.HADOOP;
4449
import static com.facebook.presto.iceberg.IcebergQueryRunner.getIcebergDataDirectoryPath;
50+
import static com.facebook.presto.sql.QueryUtil.identifier;
4551
import static java.lang.String.format;
4652
import static org.testng.Assert.assertTrue;
4753

@@ -251,10 +257,23 @@ private static String getTimestampString(long timeMillsUtc, String zoneId)
251257

252258
private Table loadTable(String tableName)
253259
{
260+
tableName = normalizeIdentifier(tableName);
254261
Catalog catalog = CatalogUtil.loadCatalog(HADOOP.getCatalogImpl(), ICEBERG_CATALOG, getProperties(), new Configuration());
255262
return catalog.loadTable(TableIdentifier.of(TEST_SCHEMA, tableName));
256263
}
257264

265+
protected String normalizeIdentifier(String name)
266+
{
267+
Metadata metadata = getQueryRunner().getMetadata();
268+
TransactionId txid = getQueryRunner().getTransactionManager().beginTransaction(false);
269+
Session session = getSession().beginTransactionId(txid, getQueryRunner().getTransactionManager(), new AllowAllAccessControl());
270+
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
271+
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
272+
273+
return metadata.normalizeIdentifier(session, connectorId.getCatalogName(),
274+
name, identifier(name).isDelimited());
275+
}
276+
258277
private Map<String, String> getProperties()
259278
{
260279
File metastoreDir = getCatalogDirectory();

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestSetCurrentSnapshotProcedure.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@
1313
*/
1414
package com.facebook.presto.iceberg.procedure;
1515

16+
import com.facebook.presto.Session;
17+
import com.facebook.presto.common.transaction.TransactionId;
1618
import com.facebook.presto.iceberg.IcebergConfig;
1719
import com.facebook.presto.iceberg.IcebergQueryRunner;
20+
import com.facebook.presto.metadata.CatalogManager;
21+
import com.facebook.presto.metadata.Metadata;
22+
import com.facebook.presto.spi.ConnectorId;
23+
import com.facebook.presto.spi.security.AllowAllAccessControl;
1824
import com.facebook.presto.testing.QueryRunner;
1925
import com.facebook.presto.tests.AbstractTestQueryFramework;
2026
import com.google.common.collect.ImmutableMap;
@@ -31,7 +37,9 @@
3137
import java.util.Map;
3238

3339
import static com.facebook.presto.iceberg.CatalogType.HADOOP;
40+
import static com.facebook.presto.iceberg.IcebergQueryRunner.ICEBERG_CATALOG;
3441
import static com.facebook.presto.iceberg.IcebergQueryRunner.getIcebergDataDirectoryPath;
42+
import static com.facebook.presto.sql.QueryUtil.identifier;
3543
import static java.lang.String.format;
3644
import static java.util.regex.Pattern.quote;
3745

@@ -174,10 +182,23 @@ public void testSetCurrentSnapshotToRef()
174182

175183
private Table loadTable(String tableName)
176184
{
185+
tableName = normalizeIdentifier(tableName);
177186
Catalog catalog = CatalogUtil.loadCatalog(HadoopCatalog.class.getName(), ICEBERG_CATALOG, getProperties(), new Configuration());
178187
return catalog.loadTable(TableIdentifier.of(TEST_SCHEMA, tableName));
179188
}
180189

190+
private String normalizeIdentifier(String name)
191+
{
192+
Metadata metadata = getQueryRunner().getMetadata();
193+
TransactionId txid = getQueryRunner().getTransactionManager().beginTransaction(false);
194+
Session session = getSession().beginTransactionId(txid, getQueryRunner().getTransactionManager(), new AllowAllAccessControl());
195+
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
196+
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
197+
198+
return metadata.normalizeIdentifier(session, connectorId.getCatalogName(),
199+
name, identifier(name).isDelimited());
200+
}
201+
181202
private Map<String, String> getProperties()
182203
{
183204
File metastoreDir = getCatalogDirectory();

‎presto-iceberg/src/test/java/com/facebook/presto/iceberg/procedure/TestSetTablePropertyProcedure.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@
1313
*/
1414
package com.facebook.presto.iceberg.procedure;
1515

16+
import com.facebook.presto.Session;
17+
import com.facebook.presto.common.transaction.TransactionId;
1618
import com.facebook.presto.iceberg.IcebergConfig;
1719
import com.facebook.presto.iceberg.IcebergQueryRunner;
20+
import com.facebook.presto.metadata.CatalogManager;
21+
import com.facebook.presto.metadata.Metadata;
22+
import com.facebook.presto.spi.ConnectorId;
23+
import com.facebook.presto.spi.security.AllowAllAccessControl;
1824
import com.facebook.presto.testing.QueryRunner;
1925
import com.facebook.presto.tests.AbstractTestQueryFramework;
2026
import com.google.common.collect.ImmutableMap;
@@ -32,6 +38,7 @@
3238

3339
import static com.facebook.presto.iceberg.CatalogType.HADOOP;
3440
import static com.facebook.presto.iceberg.IcebergQueryRunner.getIcebergDataDirectoryPath;
41+
import static com.facebook.presto.sql.QueryUtil.identifier;
3542
import static java.lang.String.format;
3643
import static org.apache.iceberg.TableProperties.SPLIT_SIZE_DEFAULT;
3744
import static org.testng.Assert.assertEquals;
@@ -160,10 +167,23 @@ public void testInvalidSetTablePropertyProcedureCases()
160167

161168
private Table loadTable(String tableName)
162169
{
170+
tableName = normalizeIdentifier(tableName);
163171
Catalog catalog = CatalogUtil.loadCatalog(HadoopCatalog.class.getName(), ICEBERG_CATALOG, getProperties(), new Configuration());
164172
return catalog.loadTable(TableIdentifier.of(TEST_SCHEMA, tableName));
165173
}
166174

175+
protected String normalizeIdentifier(String name)
176+
{
177+
Metadata metadata = getQueryRunner().getMetadata();
178+
TransactionId txid = getQueryRunner().getTransactionManager().beginTransaction(false);
179+
Session session = getSession().beginTransactionId(txid, getQueryRunner().getTransactionManager(), new AllowAllAccessControl());
180+
CatalogManager catalogManager = getDistributedQueryRunner().getCoordinator().getCatalogManager();
181+
ConnectorId connectorId = catalogManager.getCatalog(ICEBERG_CATALOG).get().getConnectorId();
182+
183+
return metadata.normalizeIdentifier(session, connectorId.getCatalogName(),
184+
name, identifier(name).isDelimited());
185+
}
186+
167187
private Map<String, String> getProperties()
168188
{
169189
File metastoreDir = getCatalogDirectory();

0 commit comments

Comments
 (0)