Skip to content

Commit 809d5f4

Browse files
author
Yingjian Wu
committed
asdsa
1 parent 044a354 commit 809d5f4

File tree

2 files changed

+57
-49
lines changed

2 files changed

+57
-49
lines changed

‎metacat-functional-tests/metacat-test-cluster/docker-compose.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ services:
7575
-Dmetacat.table.update.noUpdateOnTags=iceberg_migration_do_not_modify
7676
-Dmetacat.event.updateIcebergTablePostEventEnabled=true
7777
-Dmetacat.parentChildRelationshipProperties.createEnabled=true
78-
-Dmetacat.parentChildRelationshipProperties.getEnabled=true
7978
-Dmetacat.parentChildRelationshipProperties.renameEnabled=true
8079
-Dmetacat.parentChildRelationshipProperties.dropEnabled=true'
8180
labels:

‎metacat-functional-tests/src/functionalTest/groovy/com/netflix/metacat/MetacatSmokeSpec.groovy‎

Lines changed: 57 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ class MetacatSmokeSpec extends Specification {
143143
}
144144

145145
static void initializeParentChildRelDefinitionMetadata(TableDto tableDto,
146-
String parent,
147-
String parent_uuid,
148-
String child_uuid) {
146+
String parent,
147+
String parent_uuid,
148+
String child_uuid) {
149149
def mapper = new ObjectMapper()
150150
def innerNode = mapper.createObjectNode()
151151
innerNode.put(ParentChildRelMetadataConstants.PARENT_NAME, parent)
@@ -676,7 +676,7 @@ class MetacatSmokeSpec extends Specification {
676676
then:
677677
noExceptionThrown()
678678
when:
679-
def tableMetadataOnly = api.getTable(catalogName, databaseName, tableName, true, false, false, false, true, false)
679+
def tableMetadataOnly = api.getTable(catalogName, databaseName, tableName, true, false, false, false, true)
680680
then:
681681
tableMetadataOnly.getFields().size() == 0
682682
tableMetadataOnly.getMetadata().get('metadata_location') != null
@@ -711,7 +711,7 @@ class MetacatSmokeSpec extends Specification {
711711
updatedTable.getFields().get(1).getSource_type().equals('string')
712712
when:
713713
api.updateTable(catalogName, databaseName, tableName, tableDto)
714-
def tableWithDetails = api.getTable(catalogName, databaseName, tableName, true, false, false, true, false)
714+
def tableWithDetails = api.getTable(catalogName, databaseName, tableName, true, false, false, true)
715715
then:
716716
tableWithDetails.getMetadata().get('metadata_content') != null
717717
when:
@@ -1822,7 +1822,7 @@ class MetacatSmokeSpec extends Specification {
18221822
assert ret2_new.size() == 0
18231823
18241824
cleanup:
1825-
api.deleteMView(catalogName, databaseName, tableName, viewName)
1825+
api.deleteMView(catalogName, databaseName, tableName, viewName)
18261826
where:
18271827
catalogName | databaseName | tableName | viewName |tags
18281828
'embedded-hive-metastore' | 'smoke_db4' | 'part' | 'part_view' | ['test_tag'] as List<String>
@@ -2043,8 +2043,8 @@ class MetacatSmokeSpec extends Specification {
20432043
child11TableDto.definitionMetadata.put("random_key", "random_value")
20442044
api.createTable(catalogName, databaseName, child11, child11TableDto)
20452045
2046-
def parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false)
2047-
def child11Table = api.getTable(catalogName, databaseName, child11, true, true, false)
2046+
def parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false, false, false, true)
2047+
def child11Table = api.getTable(catalogName, databaseName, child11, true, true, false, false, false, true)
20482048
then:
20492049
// Test Parent 1 parentChildInfo
20502050
assert parent1Table.definitionMetadata.get("parentChildRelationInfo").get("isParent").booleanValue()
@@ -2071,8 +2071,8 @@ class MetacatSmokeSpec extends Specification {
20712071
assert e.message.contains("already exists")
20722072
20732073
when:
2074-
parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false)
2075-
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false)
2074+
parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false, false, false, true)
2075+
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false, false, false, true)
20762076
then:
20772077
// Test Parent 1 parentChildInfo
20782078
assert parent1Table.definitionMetadata.get("parentChildRelationInfo").get("isParent").booleanValue()
@@ -2143,8 +2143,8 @@ class MetacatSmokeSpec extends Specification {
21432143
assert e.message.contains("already exists")
21442144
21452145
when:
2146-
parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false)
2147-
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false)
2146+
parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false, false, false, true)
2147+
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false, false, false, true)
21482148
then:
21492149
// Test Parent 1 parentChildInfo
21502150
assert parent1Table.definitionMetadata.get("parentChildRelationInfo").get("isParent").booleanValue()
@@ -2169,8 +2169,8 @@ class MetacatSmokeSpec extends Specification {
21692169
def child12TableDto = PigDataDtoProvider.getTable(catalogName, databaseName, child12, 'amajumdar', child12Uri)
21702170
initializeParentChildRelDefinitionMetadata(child12TableDto, parent1FullName, parent1UUID, child12UUID)
21712171
api.createTable(catalogName, databaseName, child12, child12TableDto)
2172-
parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false)
2173-
def child12Table = api.getTable(catalogName, databaseName, child12, true, true, false)
2172+
parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false, false, false, true)
2173+
def child12Table = api.getTable(catalogName, databaseName, child12, true, true, false, false, false, true)
21742174
21752175
then:
21762176
// Test Parent 1 parentChildInfo
@@ -2227,8 +2227,8 @@ class MetacatSmokeSpec extends Specification {
22272227
def child21TableDto = PigDataDtoProvider.getTable(catalogName, databaseName, child21, 'amajumdar', child21Uri)
22282228
initializeParentChildRelDefinitionMetadata(child21TableDto, parent2FullName, parent2UUID, child21UUID)
22292229
api.createTable(catalogName, databaseName, child21, child21TableDto)
2230-
def parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false)
2231-
def child21Table = api.getTable(catalogName, databaseName, child21, true, true, false)
2230+
def parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false, false, false, true)
2231+
def child21Table = api.getTable(catalogName, databaseName, child21, true, true, false, false, false, true)
22322232
22332233
then:
22342234
// Test Parent 2 parentChildInfo
@@ -2259,9 +2259,9 @@ class MetacatSmokeSpec extends Specification {
22592259
assert e.message.contains("already exists")
22602260
22612261
when:
2262-
parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false)
2263-
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false)
2264-
child12Table = api.getTable(catalogName, databaseName, child12, true, true, false)
2262+
parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false, false, false, true)
2263+
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false, false, false, true)
2264+
child12Table = api.getTable(catalogName, databaseName, child12, true, true, false, false, false, true)
22652265
22662266
then:
22672267
// Test Parent 1 parentChildInfo
@@ -2298,11 +2298,11 @@ class MetacatSmokeSpec extends Specification {
22982298
assert e.message.contains("is already a parent table")
22992299
23002300
when:
2301-
parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false)
2302-
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false)
2303-
child12Table = api.getTable(catalogName, databaseName, child12, true, true, false)
2304-
parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false)
2305-
child21Table = api.getTable(catalogName, databaseName, child21, true, true, false)
2301+
parent1Table = api.getTable(catalogName, databaseName, parent1, true, true, false, false, false, true)
2302+
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false, false, false, true)
2303+
child12Table = api.getTable(catalogName, databaseName, child12, true, true, false, false, false, true)
2304+
parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false, false, false, true)
2305+
child21Table = api.getTable(catalogName, databaseName, child21, true, true, false, false, false, true)
23062306
then:
23072307
// Test Parent 1 parentChildInfo
23082308
assert parent1Table.definitionMetadata.get("parentChildRelationInfo").get("isParent").booleanValue()
@@ -2344,9 +2344,9 @@ class MetacatSmokeSpec extends Specification {
23442344
when:
23452345
api.deleteTable(catalogName, databaseName, renameParent1)
23462346
api.renameTable(catalogName, databaseName, parent1, renameParent1)
2347-
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false)
2348-
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false)
2349-
child12Table = api.getTable(catalogName, databaseName, child12, true, true, false)
2347+
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false, false, false, true)
2348+
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false, false, false, true)
2349+
child12Table = api.getTable(catalogName, databaseName, child12, true, true, false, false, false, true)
23502350
23512351
then:
23522352
// Test Parent 1 parentChildInfo newName
@@ -2375,7 +2375,7 @@ class MetacatSmokeSpec extends Specification {
23752375
23762376
//get the parent oldName should fail as it no longer exists
23772377
when:
2378-
api.getTable(catalogName, databaseName, parent1, true, true, false)
2378+
api.getTable(catalogName, databaseName, parent1, true, true, false, false, false, true)
23792379
then:
23802380
e = thrown(Exception)
23812381
assert e.message.contains("Unable to locate for")
@@ -2394,9 +2394,9 @@ class MetacatSmokeSpec extends Specification {
23942394
assert e.message.contains("already exists")
23952395
23962396
when:
2397-
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false)
2398-
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false)
2399-
child12Table = api.getTable(catalogName, databaseName, child12, true, true, false)
2397+
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false, false, false, true)
2398+
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false, false, false, true)
2399+
child12Table = api.getTable(catalogName, databaseName, child12, true, true, false, false, false, true)
24002400
then:
24012401
// Test Parent 1 parentChildInfo newName
24022402
assert parent1Table.definitionMetadata.get("parentChildRelationInfo").get("isParent").booleanValue()
@@ -2438,10 +2438,10 @@ class MetacatSmokeSpec extends Specification {
24382438
assert e.message.contains("is already a child table")
24392439
24402440
when:
2441-
def renameChild11Table = api.getTable(catalogName, databaseName, renameChild11, true, true, false)
2442-
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false)
2443-
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false)
2444-
child12Table = api.getTable(catalogName, databaseName, child12, true, true, false)
2441+
def renameChild11Table = api.getTable(catalogName, databaseName, renameChild11, true, true, false, false, false, true)
2442+
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false, false, false, true)
2443+
child11Table = api.getTable(catalogName, databaseName, child11, true, true, false, false, false, true)
2444+
child12Table = api.getTable(catalogName, databaseName, child12, true, true, false, false, false, true)
24452445
then:
24462446
// Test Parent 1 parentChildInfo newName
24472447
assert parent1Table.definitionMetadata.get("parentChildRelationInfo").get("isParent").booleanValue()
@@ -2481,8 +2481,8 @@ class MetacatSmokeSpec extends Specification {
24812481
when:
24822482
api.deleteTable(catalogName, databaseName, renameChild11)
24832483
api.renameTable(catalogName, databaseName, child11, renameChild11)
2484-
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false)
2485-
child11Table = api.getTable(catalogName, databaseName, renameChild11, true, true, false)
2484+
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false, false, false, true)
2485+
child11Table = api.getTable(catalogName, databaseName, renameChild11, true, true, false, false, false, true)
24862486
24872487
then:
24882488
// Test parent1Table parentChildInfo with newName
@@ -2503,7 +2503,7 @@ class MetacatSmokeSpec extends Specification {
25032503
25042504
//get the child oldName should fail as it no longer exists
25052505
when:
2506-
api.getTable(catalogName, databaseName, child11, true, true, false)
2506+
api.getTable(catalogName, databaseName, child11, true, true, false, false, false, true)
25072507
then:
25082508
e = thrown(Exception)
25092509
assert e.message.contains("Unable to locate for")
@@ -2523,7 +2523,7 @@ class MetacatSmokeSpec extends Specification {
25232523
*/
25242524
when:
25252525
api.deleteTable(catalogName, databaseName, renameChild11)
2526-
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false)
2526+
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false, false, false, true)
25272527
25282528
then:
25292529
// Test parent1 Table
@@ -2541,8 +2541,8 @@ class MetacatSmokeSpec extends Specification {
25412541
when:
25422542
child11TableDto = PigDataDtoProvider.getTable(catalogName, databaseName, renameChild11, 'amajumdar', child11Uri)
25432543
api.createTable(catalogName, databaseName, renameChild11, child11TableDto)
2544-
child11Table = api.getTable(catalogName, databaseName, renameChild11, true, true, false)
2545-
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false)
2544+
child11Table = api.getTable(catalogName, databaseName, renameChild11, true, true, false, false, false, true)
2545+
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false, false, false, true)
25462546
then:
25472547
assert !child11Table.definitionMetadata.has("parentChildRelationInfo")
25482548
assert child11Table.definitionMetadata.get("random_key").asText() == "random_value"
@@ -2560,7 +2560,7 @@ class MetacatSmokeSpec extends Specification {
25602560
*/
25612561
when:
25622562
api.deleteTable(catalogName, databaseName, child12)
2563-
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false)
2563+
parent1Table = api.getTable(catalogName, databaseName, renameParent1, true, true, false, false, false, true)
25642564
then:
25652565
assert !parent1Table.definitionMetadata.has("parentChildRelationInfo")
25662566
assert parentChildRelV1.getChildren(catalogName, databaseName, renameParent1).isEmpty()
@@ -2571,8 +2571,8 @@ class MetacatSmokeSpec extends Specification {
25712571
*/
25722572
when:
25732573
api.deleteTable(catalogName, databaseName, renameParent1)
2574-
parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false)
2575-
child21Table = api.getTable(catalogName, databaseName, child21, true, true, false)
2574+
parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false, false, false, true)
2575+
child21Table = api.getTable(catalogName, databaseName, child21, true, true, false, false, false, true)
25762576
25772577
then:
25782578
//Since renameParent1 table is dropped
@@ -2603,8 +2603,8 @@ class MetacatSmokeSpec extends Specification {
26032603
initializeParentChildRelDefinitionMetadata(updateParent2Dto, "RANDOM", "RANDOM", "RANDOM")
26042604
api.updateTable(catalogName, databaseName, parent2, updateParent2Dto)
26052605
2606-
parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false)
2607-
child21Table = api.getTable(catalogName, databaseName, child21, true, true, false)
2606+
parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false, false, false, true)
2607+
child21Table = api.getTable(catalogName, databaseName, child21, true, true, false, false, false, true)
26082608
then:
26092609
assert parent2Table.definitionMetadata.get("parentChildRelationInfo").get("isParent").booleanValue()
26102610
assert parentChildRelV1.getChildren(catalogName, databaseName, parent2) == [
@@ -2627,8 +2627,8 @@ class MetacatSmokeSpec extends Specification {
26272627
initializeParentChildRelDefinitionMetadata(updateParent2Dto, "RANDOM", "RANDOM", "RANDOM")
26282628
api.updateTable(catalogName, databaseName, child21, updateChild21Dto)
26292629
2630-
parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false)
2631-
child21Table = api.getTable(catalogName, databaseName, child21, true, true, false)
2630+
parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false, false, false, true)
2631+
child21Table = api.getTable(catalogName, databaseName, child21, true, true, false, false, false, true)
26322632
then:
26332633
// Test Parent 2 parentChildInfo
26342634
assert parent2Table.definitionMetadata.get("parentChildRelationInfo").get("isParent").booleanValue()
@@ -2644,5 +2644,14 @@ class MetacatSmokeSpec extends Specification {
26442644
false)
26452645
assert parentChildRelV1.getChildren(catalogName, databaseName, child21).isEmpty()
26462646
assert parentChildRelV1.getParents(catalogName, databaseName, child21) == [new ParentInfoDto("embedded-fast-hive-metastore/iceberg_db/parent2", "CLONE", "p2_uuid")] as Set
2647+
2648+
// Test if not included the information, nothing related to parent child relation should return
2649+
when:
2650+
parent2Table = api.getTable(catalogName, databaseName, parent2, true, true, false, false, false, false)
2651+
child21Table = api.getTable(catalogName, databaseName, child21, true, true, false, false, false, false)
2652+
2653+
then:
2654+
! parent2Table.definitionMetadata.has("parentChildRelationInfo")
2655+
! child21Table.definitionMetadata.has("parentChildRelationInfo")
26472656
}
26482657
}

0 commit comments

Comments
 (0)