yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-12-28 07:58:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changing Tier does not replace the previously selected Tier

Browse Source
This commit is contained in:
sureshms 2021-08-11 10:49:03 -07:00
parent b780e33347
commit 1b140b37d5
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/TableRepository.java
View File

@ -75,10 +75,10 @@ import static org.openmetadata.catalog.jdbi3.Relationship.JOINED_WITH;
public abstract class TableRepository {
private static final Logger LOG = LoggerFactory.getLogger(TableRepository.class);
// Table that can be patched in a patch request
// Table fields that can be patched in a PATCH request
private static final Fields TABLE_PATCH_FIELDS = new Fields(TableResource.FIELD_LIST,
"owner,columns,database,tags,tableConstraints");
// Table fields that can be updated in a PUT request
private static final Fields TABLE_UPDATE_FIELDS = new Fields(TableResource.FIELD_LIST,
"owner,columns,database,tags, tableConstraints");
@ -385,7 +385,6 @@ public abstract class TableRepository {
// Remove previous tags. Merge tags from the update and the existing tags
EntityUtil.removeTags(tagDAO(), original.getFullyQualifiedName());
updated.setTags(EntityUtil.mergeTags(updated.getTags(), original.getTags()));
storeTable(updated, true);
updateRelationships(original, updated);

2
catalog-rest-service/src/main/java/org/openmetadata/catalog/util/JsonUtils.java
View File

@ -128,7 +128,6 @@ public final class JsonUtils {
//
// Reverse sorting the operations by "path" fields before applying the patch as a workaround.
//
patch.toJsonArray().forEach(a -> LOG.info("Unsorted operation {}", a));
JsonArray array = patch.toJsonArray();
List<JsonObject> operations = new ArrayList<>();
array.forEach(entry -> operations.add(entry.asJsonObject()));
@ -139,7 +138,6 @@ public final class JsonUtils {
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
operations.forEach(o -> arrayBuilder.add(o));
JsonPatch sortedPatch = Json.createPatch(arrayBuilder.build());
sortedPatch.toJsonArray().forEach(a -> LOG.info("Sorted operation {}", a));
// Apply sortedPatch
JsonValue patchedJson = sortedPatch.apply(targetJson);

23
catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/databases/TableResourceTest.java
View File

@ -71,6 +71,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
import static java.util.Collections.singletonList;
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
@ -102,6 +103,8 @@ public class TableResourceTest extends CatalogApplicationTest {
public static Database DATABASE;
public static final TagLabel USER_ADDRESS_TAG_LABEL = new TagLabel().withTagFQN("User.Address");
public static final TagLabel USER_BANK_ACCOUNT_TAG_LABEL = new TagLabel().withTagFQN("User.BankAccount");
public static final TagLabel TIER_1 = new TagLabel().withTagFQN("Tier.Tier1");
public static final TagLabel TIER_2 = new TagLabel().withTagFQN("Tier.Tier2");
public static List<Column> COLUMNS = Arrays.asList(
new Column().withName("c1").withColumnDataType(ColumnDataType.BIGINT)
@ -991,15 +994,18 @@ public class TableResourceTest extends CatalogApplicationTest {
if (expectedList == null) {
return;
}
assertTrue(actualList.containsAll(expectedList));
// Add derived tags to the expected list
// Make sure both expected tags and derived exist
// When tags from the expected list is added to an entity, the derived tags for those tags are automatically added
// So add to the expectedList, the derived tags before validating the tags
List<TagLabel> updatedExpectedList = new ArrayList<>();
updatedExpectedList.addAll(expectedList);
for (TagLabel expected : expectedList) {
List<TagLabel> derived = EntityUtil.getDerivedTags(expected,
TagResourceTest.getTag(expected.getTagFQN(), adminAuthHeaders()));
assertTrue(actualList.containsAll(derived));
List<TagLabel> derived = EntityUtil.getDerivedTags(expected, TagResourceTest.getTag(expected.getTagFQN(), adminAuthHeaders()));
updatedExpectedList.addAll(derived);
}
updatedExpectedList = updatedExpectedList.stream().distinct().collect(Collectors.toList());
assertTrue(actualList.containsAll(updatedExpectedList));
assertTrue(updatedExpectedList.containsAll(actualList));
}
public static Table createTable(CreateTable create, Map<String, String> authHeaders) throws HttpResponseException {
@ -1030,7 +1036,7 @@ public class TableResourceTest extends CatalogApplicationTest {
assertEquals(expectedDatabaseId, table.getDatabase().getId());
}
// Validate table contraints
// Validate table constraints
assertEquals(expectedTableConstraints, table.getTableConstraints());
validateTags(expectedTags, table.getTags());
TestUtils.validateEntityReference(table.getFollowers());
@ -1142,6 +1148,7 @@ public class TableResourceTest extends CatalogApplicationTest {
Map<String, String> authHeaders) throws JsonProcessingException, HttpResponseException {
String updateTableJson = JsonUtils.pojoToJson(updatedTable);
JsonPatch patch = JsonSchemaUtil.getJsonPatch(originalJson, updateTableJson);
LOG.info("Applying patch ", patch);
return TestUtils.patch(CatalogApplicationTest.getResource("tables/" + tableId),
patch, Table.class, authHeaders);
}