Skip to content

Commit f9263a6

Browse files
committed
fix ut errors
1 parent 5676d16 commit f9263a6

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

paimon-common/src/main/java/org/apache/paimon/fs/MetricsFileIO.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ public MetricsFileIO withMetrics(InputMetrics inputMetrics, OutputMetrics output
4646
return this;
4747
}
4848

49+
public FileIO getFileIOInternal() {
50+
FileIO currentFileIO = fileIO;
51+
while (currentFileIO instanceof MetricsFileIO) {
52+
currentFileIO = ((MetricsFileIO) currentFileIO).fileIO;
53+
}
54+
return currentFileIO;
55+
}
56+
4957
@VisibleForTesting
5058
public Boolean isMetricsEnabled() {
5159
return inputMetrics != null && outputMetrics != null;

paimon-core/src/test/java/org/apache/paimon/rest/RESTCatalogTest.java

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import org.apache.paimon.function.Function;
3131
import org.apache.paimon.function.FunctionChange;
3232
import org.apache.paimon.function.FunctionDefinition;
33+
import org.apache.paimon.fs.FileIO;
34+
import org.apache.paimon.fs.MetricsFileIO;
3335
import org.apache.paimon.options.Options;
3436
import org.apache.paimon.partition.Partition;
3537
import org.apache.paimon.partition.PartitionStatistics;
@@ -979,7 +981,12 @@ void testRefreshFileIO() throws Exception {
979981
FileStoreTable fileStoreTable = (FileStoreTable) catalog.getTable(identifier);
980982
assertEquals(true, fileStoreTable.fileIO().exists(fileStoreTable.location()));
981983

982-
RESTTokenFileIO fileIO = (RESTTokenFileIO) fileStoreTable.fileIO();
984+
FileIO fileIOOrigin = fileStoreTable.fileIO();
985+
FileIO fileIOInternal =
986+
fileIOOrigin instanceof MetricsFileIO
987+
? ((MetricsFileIO) fileIOOrigin).getFileIOInternal()
988+
: fileIOOrigin;
989+
RESTTokenFileIO fileIO = (RESTTokenFileIO) fileIOInternal;
983990
RESTToken fileDataToken = fileIO.validToken();
984991
RESTToken serverDataToken = getDataTokenFromRestServer(identifier);
985992
assertEquals(serverDataToken, fileDataToken);
@@ -998,7 +1005,12 @@ void testRefreshFileIOWhenExpired() throws Exception {
9981005
setDataTokenToRestServerForMock(identifier, expiredDataToken);
9991006
createTable(identifier, Maps.newHashMap(), Lists.newArrayList("col1"));
10001007
FileStoreTable fileStoreTable = (FileStoreTable) catalog.getTable(identifier);
1001-
RESTTokenFileIO fileIO = (RESTTokenFileIO) fileStoreTable.fileIO();
1008+
FileIO fileIOOrigin = fileStoreTable.fileIO();
1009+
FileIO fileIOInternal =
1010+
fileIOOrigin instanceof MetricsFileIO
1011+
? ((MetricsFileIO) fileIOOrigin).getFileIOInternal()
1012+
: fileIOOrigin;
1013+
RESTTokenFileIO fileIO = (RESTTokenFileIO) fileIOInternal;
10021014
RESTToken fileDataToken = fileIO.validToken();
10031015
assertEquals(expiredDataToken, fileDataToken);
10041016
RESTToken newDataToken =
@@ -1126,7 +1138,13 @@ public void testDataTokenUnExistInServer() throws Exception {
11261138
Identifier.create("test_data_token", "table_for_un_exist_date_token");
11271139
createTable(identifier, Maps.newHashMap(), Lists.newArrayList("col1"));
11281140
FileStoreTable tableTestWrite = (FileStoreTable) catalog.getTable(identifier);
1129-
RESTTokenFileIO restTokenFileIO = (RESTTokenFileIO) tableTestWrite.fileIO();
1141+
FileIO fileIOOrigin = tableTestWrite.fileIO();
1142+
FileIO fileIOInternal =
1143+
fileIOOrigin instanceof MetricsFileIO
1144+
? ((MetricsFileIO) fileIOOrigin).getFileIOInternal()
1145+
: fileIOOrigin;
1146+
RESTTokenFileIO fileIO = (RESTTokenFileIO) fileIOInternal;
1147+
RESTTokenFileIO restTokenFileIO = (RESTTokenFileIO) fileIO;
11301148
List<Integer> data = Lists.newArrayList(12);
11311149
// as RESTTokenFileIO is lazy so we need to call isObjectStore() to init fileIO
11321150
restTokenFileIO.isObjectStore();

0 commit comments

Comments
 (0)