Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ATLAS-1879 update types again, after updateGraphStore #39

Open
wants to merge 2 commits into
base: 0.8-incubating
Choose a base branch
from
Open

ATLAS-1879 update types again, after updateGraphStore #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3578843
ATLAS-1879 update types again, after updateGraphStore
bpgergo Jul 26, 2017
158f1ce
ATLAS-1879 call updateTypes instead of updateTypesWithNoRefResolve
bpgergo Jul 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions repository/src/main/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,12 @@ public AtlasTypesDef updateTypesDef(AtlasTypesDef typesDef) throws AtlasBaseExce

AtlasTypesDef ret = updateGraphStore(typesDef, ttr);

try {
ttr.updateTypes(ret);
} catch (AtlasBaseException e) { // this shouldn't happen, as the types were already validated
LOG.error("failed to update the registry after updating the store", e);
}

if (LOG.isDebugEnabled()) {
LOG.debug("<== AtlasTypeDefGraphStore.updateTypesDef(enums={}, structs={}, classfications={}, entities={})",
CollectionUtils.size(typesDef.getEnumDefs()),
Expand Down
65 changes: 65 additions & 0 deletions ...ory/src/test/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.atlas.model.typedef.AtlasStructDef.AtlasAttributeDef;
import org.apache.atlas.model.typedef.AtlasTypesDef;
import org.apache.atlas.store.AtlasTypeDefStore;
import org.apache.atlas.type.AtlasType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
Expand All @@ -38,6 +39,7 @@

import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;

import static org.testng.Assert.*;
Expand Down Expand Up @@ -432,4 +434,67 @@ public void testTypeDeletionAndRecreate() {
}
}

@Test
public void testTypeRegistryIsUpdatedAfterGraphStorage() throws AtlasBaseException {
String classificationDef = "{"
+ "\"name\":\"test_classification_11\","
+ "\"description\":\"\","
+ "\"createdBy\":\"admin\","
+ "\"superTypes\":[],"
+ "\"attributeDefs\":[{"
+ "\"name\":\"test_class_11\","
+ "\"typeName\":\"string\","
+ "\"isOptional\":true,"
+ "\"isUnique\":true,"
+ "\"isIndexable\":true,"
+ "\"cardinality\":\"SINGLE\","
+ "\"valuesMinCount\":0,"
+ "\"valuesMaxCount\":1}]}";

String jsonStr = "{"
+ "\"classificationDefs\":[" + classificationDef + "],"
+ "\"entityDefs\":[],"
+ "\"enumDefs\":[],"
+ "\"structDefs\":[]}";

// create type from json string
AtlasTypesDef testTypesDefFromJson = AtlasType.fromJson(jsonStr, AtlasTypesDef.class);
AtlasTypesDef createdTypesDef = typeDefStore.createTypesDef(testTypesDefFromJson);
// check returned type
assertEquals("test_classification_11", createdTypesDef.getClassificationDefs().get(0).getName());
assertTrue(createdTypesDef.getClassificationDefs().get(0).getAttributeDefs().get(0).getIsIndexable());
// save guid
String guid = createdTypesDef.getClassificationDefs().get(0).getGuid();
Date createdTime = createdTypesDef.getClassificationDefs().get(0).getCreateTime();

// get created type and check again
AtlasClassificationDef getBackFromCache = typeDefStore.getClassificationDefByName("test_classification_11");
assertEquals("test_classification_11", getBackFromCache.getName());
assertTrue(getBackFromCache.getAttributeDefs().get(0).getIsIndexable());
assertEquals(guid, getBackFromCache.getGuid());
assertNotNull(getBackFromCache.getCreatedBy());
assertEquals(createdTime, getBackFromCache.getCreateTime());

// update type, change isIndexable, check the update result
testTypesDefFromJson = AtlasType.fromJson(jsonStr, AtlasTypesDef.class);
testTypesDefFromJson.getClassificationDefs().get(0).getAttributeDefs().get(0).setIsIndexable(false);
AtlasTypesDef updatedTypesDef = typeDefStore.updateTypesDef(testTypesDefFromJson);
assertEquals("test_classification_11", updatedTypesDef.getClassificationDefs().get(0).getName());
assertFalse(updatedTypesDef.getClassificationDefs().get(0).getAttributeDefs().get(0).getIsIndexable());
assertEquals(guid, updatedTypesDef.getClassificationDefs().get(0).getGuid());
assertEquals(createdTime, updatedTypesDef.getClassificationDefs().get(0).getCreateTime());

// get updated type (both by name and guid) and check again
getBackFromCache = typeDefStore.getClassificationDefByName("test_classification_11");
assertEquals("test_classification_11", getBackFromCache.getName());
assertFalse(getBackFromCache.getAttributeDefs().get(0).getIsIndexable());
assertEquals(guid, getBackFromCache.getGuid());
assertEquals(createdTime, getBackFromCache.getCreateTime());
getBackFromCache = typeDefStore.getClassificationDefByGuid(guid);
assertEquals("test_classification_11", getBackFromCache.getName());
assertFalse(getBackFromCache.getAttributeDefs().get(0).getIsIndexable());
assertEquals(guid, getBackFromCache.getGuid());
assertEquals(createdTime, getBackFromCache.getCreateTime());
}

}