Skip to content

Commit 6771470

Browse files
[fix](iceberg) disable default iceberg manifest cache and update test configurations (#60027)
relate pr: #59056
1 parent 85f39d5 commit 6771470

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergExternalCatalog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public abstract class IcebergExternalCatalog extends ExternalCatalog {
5858
public static final String ICEBERG_MANIFEST_CACHE_ENABLE = "iceberg.manifest.cache.enable";
5959
public static final String ICEBERG_MANIFEST_CACHE_CAPACITY_MB = "iceberg.manifest.cache.capacity-mb";
6060
public static final String ICEBERG_MANIFEST_CACHE_TTL_SECOND = "iceberg.manifest.cache.ttl-second";
61-
public static final boolean DEFAULT_ICEBERG_MANIFEST_CACHE_ENABLE = true;
61+
public static final boolean DEFAULT_ICEBERG_MANIFEST_CACHE_ENABLE = false;
6262
public static final long DEFAULT_ICEBERG_MANIFEST_CACHE_CAPACITY_MB = 1024;
6363
public static final long DEFAULT_ICEBERG_MANIFEST_CACHE_TTL_SECOND = 48 * 60 * 60;
6464
protected String icebergCatalogType;

regression-test/suites/external_table_p0/iceberg/test_iceberg_table_meta_cache.groovy

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ suite("test_iceberg_table_meta_cache", "p0,external,doris,external_docker,extern
2121

2222
String enabled = context.config.otherConfigs.get("enableIcebergTest")
2323
if (enabled != null && enabled.equalsIgnoreCase("true")) {
24-
for (String hivePrefix : ["hive2"]) {
24+
for (String hivePrefix : ["hive3"]) {
2525
String externalEnvIp = context.config.otherConfigs.get("externalEnvIp")
2626
String hmsPort = context.config.otherConfigs.get(hivePrefix + "HmsPort")
2727
String hdfs_port = context.config.otherConfigs.get(hivePrefix + "HdfsPort")
@@ -36,7 +36,8 @@ suite("test_iceberg_table_meta_cache", "p0,external,doris,external_docker,extern
3636
'iceberg.catalog.type'='hms',
3737
'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hmsPort}',
3838
'fs.defaultFS' = '${default_fs}',
39-
'warehouse' = '${warehouse}'
39+
'warehouse' = '${warehouse}',
40+
'iceberg.manifest.cache.enable' = 'true'
4041
);
4142
"""
4243
sql """switch ${catalog_name}"""
@@ -74,6 +75,7 @@ suite("test_iceberg_table_meta_cache", "p0,external,doris,external_docker,extern
7475
'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hmsPort}',
7576
'fs.defaultFS' = '${default_fs}',
7677
'warehouse' = '${warehouse}',
78+
'iceberg.manifest.cache.enable' = 'false',
7779
'iceberg.table.meta.cache.ttl-second' = '-2'
7880
);
7981
"""
@@ -88,6 +90,7 @@ suite("test_iceberg_table_meta_cache", "p0,external,doris,external_docker,extern
8890
'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hmsPort}',
8991
'fs.defaultFS' = '${default_fs}',
9092
'warehouse' = '${warehouse}',
93+
'iceberg.manifest.cache.enable' = 'false',
9194
'iceberg.table.meta.cache.ttl-second' = '0'
9295
);
9396
"""
@@ -122,7 +125,8 @@ suite("test_iceberg_table_meta_cache", "p0,external,doris,external_docker,extern
122125
'iceberg.catalog.type'='hms',
123126
'hive.metastore.uris' = 'thrift://${externalEnvIp}:${hmsPort}',
124127
'fs.defaultFS' = '${default_fs}',
125-
'warehouse' = '${warehouse}'
128+
'warehouse' = '${warehouse}',
129+
'iceberg.manifest.cache.enable' = 'false'
126130
);
127131
"""
128132
sql """switch ${catalog_name_no_cache}"""
@@ -165,4 +169,3 @@ suite("test_iceberg_table_meta_cache", "p0,external,doris,external_docker,extern
165169
}
166170
}
167171
}
168-

0 commit comments

Comments
 (0)