database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

branch-2.1: [fix](external catalog) Persisting the External Catalog comment field… (#47569)

Browse Source 
cherry-pick (#46946)
This commit is contained in:
zy-kkk
2025-02-12 09:20:30 +08:00
committed by GitHub
parent da3222e7e1
commit 3ca0fc3784
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java
View File

@ -134,6 +134,9 @@ public abstract class ExternalCatalog
protected Map<Long, ExternalDatabase<? extends ExternalTable>> idToDb = Maps.newConcurrentMap();
@SerializedName(value = "lastUpdateTime")
protected long lastUpdateTime;
@SerializedName(value = "comment")
private String comment;
// db name does not contains "default_cluster"
protected Map<String, Long> dbNameToId = Maps.newConcurrentMap();
private boolean objectCreated = false;
@ -142,7 +145,6 @@ public abstract class ExternalCatalog
protected TransactionManager transactionManager;
private ExternalSchemaCache schemaCache;
private String comment;
// A cached and being converted properties for external catalog.
// generated from catalog properties.
private byte[] propLock = new byte[0];

34
fe/fe-core/src/test/java/org/apache/doris/datasource/ExternalCatalogTest.java
View File

@ -282,4 +282,38 @@ public class ExternalCatalogTest extends TestWithFeService {
file.delete();
}
}
@Test
public void testSerializationWithComment() throws Exception {
MetaContext metaContext = new MetaContext();
metaContext.setMetaVersion(FeMetaVersion.VERSION_CURRENT);
metaContext.setThreadLocalInfo();
// 1. Write objects to file
File file = new File("./external_catalog_with_comment_test.dat");
file.createNewFile();
DataOutputStream dos = new DataOutputStream(Files.newOutputStream(file.toPath()));
TestExternalCatalog ctl = (TestExternalCatalog) mgr.getCatalog("test1");
String testComment = "This is a test comment for serialization";
ctl.setComment(testComment); // Set a custom comment value
ctl.write(dos);
dos.flush();
dos.close();
// 2. Read objects from file
DataInputStream dis = new DataInputStream(Files.newInputStream(file.toPath()));
String json = Text.readString(dis);
TestExternalCatalog ctl2 = GsonUtils.GSON.fromJson(json, TestExternalCatalog.class);
Configuration conf = ctl2.getConfiguration();
Assertions.assertNotNull(conf);
// Verify the comment is properly serialized and deserialized
Assertions.assertEquals(testComment, ctl2.getComment());
// 3. delete files
dis.close();
file.delete();
}
}