Skip to content

Commit 74ff7c0

Browse files
author
moke-HU
committed
[fix](paimon) adapt HMS catalog construction to Paimon 2.0 CatalogContext API
Upstream commit a08f593 wrote createHmsCatalog() against Paimon 1.3.1's HiveCatalog(FileIO, HiveConf, String, CatalogContext, String) constructor but passed the local Options variable in the CatalogContext slot. Paimon 2.0.0 (this branch's pinned paimon.version) has the same 5-arg overload signature, so the call compiled fine on paper but failed type-checking once rebased onto our 2.0.0 dependency. Use the CatalogContext already available as this method's first parameter instead of re-deriving Options from it.
1 parent c65e176 commit 74ff7c0

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • fe/fe-connector/fe-connector-paimon/src/main/java/org/apache/doris/connector/paimon

‎fe/fe-connector/fe-connector-paimon/src/main/java/org/apache/doris/connector/paimon/PaimonConnector.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,9 +673,9 @@ static Catalog createHmsCatalog(CatalogContext catalogContext, HadoopAuthenticat
673673
fileIO.checkOrMkdirs(warehousePath);
674674
String clientClass = options.get(HiveCatalogOptions.METASTORE_CLIENT_CLASS);
675675
Catalog catalog = hmsAuth == null
676-
? new HiveCatalog(fileIO, hiveConf, clientClass, options, warehousePath.toUri().toString())
676+
? new HiveCatalog(fileIO, hiveConf, clientClass, catalogContext, warehousePath.toUri().toString())
677677
: hmsAuth.doAs(() -> new HiveCatalog(
678-
fileIO, hiveConf, clientClass, options, warehousePath.toUri().toString()));
678+
fileIO, hiveConf, clientClass, catalogContext, warehousePath.toUri().toString()));
679679
catalog = PaimonHmsClientPool.install(catalog, hmsAuth);
680680
catalog = PaimonHmsCatalog.install(catalog, properties, storageHadoopConfig);
681681
catalog = CachingCatalog.tryToCreate(catalog, options);

0 commit comments

Comments
 (0)