Skip to content

A
atlas
Commit 09134770 by Sarath Subramanian
Options

ATLAS-2240: Update JanusGraph to version 0.2.0 - fix/enable test testConcurrentCalls()

parent 8e40ab15
Showing with 49 additions and 37 deletions
repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java
......@@ -129,8 +129,7 @@ public class GraphBackedMetadataRepositoryTest {
// AtlasGraphProvider.cleanup();
}
// Disabling this test as it fails with janus profile, will enable it once fixed.
@Test(enabled = false)
@Test
//In some cases of parallel APIs, the edge is added, but get edge by label doesn't return the edge. ATLAS-1104
public void testConcurrentCalls() throws Exception {
final HierarchicalTypeDefinition<ClassType> refType =
......@@ -798,9 +797,10 @@ public class GraphBackedMetadataRepositoryTest {
private boolean assertEdge(String id, String typeName) throws Exception {
AtlasGraph graph = TestUtils.getGraph();
Iterable<AtlasVertex> vertices = graph.query().has(Constants.GUID_PROPERTY_KEY, id).vertices();
AtlasVertex AtlasVertex = vertices.iterator().next();
Iterable<AtlasEdge> edges = AtlasVertex.getEdges(AtlasEdgeDirection.OUT, Constants.INTERNAL_PROPERTY_KEY_PREFIX + typeName + ".ref");
if (!edges.iterator().hasNext()) {
AtlasVertex vertex = vertices.iterator().next();
Iterable<AtlasEdge> edges = vertex.getEdges(AtlasEdgeDirection.OUT, Constants.INTERNAL_PROPERTY_KEY_PREFIX + typeName + ".ref");
if (edges.iterator().hasNext()) {
ITypedReferenceableInstance entity = repositoryService.getEntityDefinition(id);
assertNotNull(entity.get("ref"));
return true;
......
webapp/src/test/java/org/apache/atlas/web/integration/BaseResourceIT.java
......@@ -86,6 +86,13 @@ public abstract class BaseResourceIT {
public static final String QUALIFIED_NAME = "qualifiedName";
public static final String CLUSTER_NAME = "clusterName";
public static final String DESCRIPTION = "description";
public static final String PII_TAG = "pii_Tag";
public static final String PHI_TAG = "phi_Tag";
public static final String PCI_TAG = "pci_Tag";
public static final String SOX_TAG = "sox_Tag";
public static final String SEC_TAG = "sec_Tag";
public static final String FINANCE_TAG = "finance_Tag";
public static final String CLASSIFICATION = "classification";
// All service clients
protected AtlasClient atlasClientV1;
......@@ -334,17 +341,17 @@ public abstract class BaseResourceIT {
.createTraitTypeDef("classification", ImmutableSet.<String>of(),
TypesUtil.createRequiredAttrDef("tag", DataTypes.STRING_TYPE));
HierarchicalTypeDefinition<TraitType> piiTrait =
TypesUtil.createTraitTypeDef("pii", ImmutableSet.<String>of());
TypesUtil.createTraitTypeDef(PII_TAG, ImmutableSet.<String>of());
HierarchicalTypeDefinition<TraitType> phiTrait =
TypesUtil.createTraitTypeDef("phi", ImmutableSet.<String>of());
TypesUtil.createTraitTypeDef(PHI_TAG, ImmutableSet.<String>of());
HierarchicalTypeDefinition<TraitType> pciTrait =
TypesUtil.createTraitTypeDef("pci", ImmutableSet.<String>of());
TypesUtil.createTraitTypeDef(PCI_TAG, ImmutableSet.<String>of());
HierarchicalTypeDefinition<TraitType> soxTrait =
TypesUtil.createTraitTypeDef("sox", ImmutableSet.<String>of());
TypesUtil.createTraitTypeDef(SOX_TAG, ImmutableSet.<String>of());
HierarchicalTypeDefinition<TraitType> secTrait =
TypesUtil.createTraitTypeDef("sec", ImmutableSet.<String>of());
TypesUtil.createTraitTypeDef(SEC_TAG, ImmutableSet.<String>of());
HierarchicalTypeDefinition<TraitType> financeTrait =
TypesUtil.createTraitTypeDef("finance", ImmutableSet.<String>of());
TypesUtil.createTraitTypeDef(FINANCE_TAG, ImmutableSet.<String>of());
HierarchicalTypeDefinition<TraitType> factTrait =
TypesUtil.createTraitTypeDef("Fact" + randomString(), ImmutableSet.<String>of());
HierarchicalTypeDefinition<TraitType> etlTrait =
......@@ -434,17 +441,17 @@ public abstract class BaseResourceIT {
.createTraitTypeDef("classification",ImmutableSet.<String>of(),
AtlasTypeUtil.createRequiredAttrDef("tag", "string"));
AtlasClassificationDef piiTrait =
AtlasTypeUtil.createTraitTypeDef("pii", ImmutableSet.<String>of());
AtlasTypeUtil.createTraitTypeDef(PII_TAG, ImmutableSet.<String>of());
AtlasClassificationDef phiTrait =
AtlasTypeUtil.createTraitTypeDef("phi", ImmutableSet.<String>of());
AtlasTypeUtil.createTraitTypeDef(PHI_TAG, ImmutableSet.<String>of());
AtlasClassificationDef pciTrait =
AtlasTypeUtil.createTraitTypeDef("pci", ImmutableSet.<String>of());
AtlasTypeUtil.createTraitTypeDef(PCI_TAG, ImmutableSet.<String>of());
AtlasClassificationDef soxTrait =
AtlasTypeUtil.createTraitTypeDef("sox", ImmutableSet.<String>of());
AtlasTypeUtil.createTraitTypeDef(SOX_TAG, ImmutableSet.<String>of());
AtlasClassificationDef secTrait =
AtlasTypeUtil.createTraitTypeDef("sec", ImmutableSet.<String>of());
AtlasTypeUtil.createTraitTypeDef(SEC_TAG, ImmutableSet.<String>of());
AtlasClassificationDef financeTrait =
AtlasTypeUtil.createTraitTypeDef("finance", ImmutableSet.<String>of());
AtlasTypeUtil.createTraitTypeDef(FINANCE_TAG, ImmutableSet.<String>of());
AtlasTypesDef typesDef = new AtlasTypesDef(ImmutableList.of(enumDef),
ImmutableList.of(structTypeDef),
......@@ -485,7 +492,7 @@ public abstract class BaseResourceIT {
values.put("location", "/tmp");
Referenceable databaseInstance = new Referenceable(dbId._getId(), dbId.getTypeName(), values);
Referenceable tableInstance =
new Referenceable(HIVE_TABLE_TYPE_BUILTIN, "classification", "pii", "phi", "pci", "sox", "sec", "finance");
new Referenceable(HIVE_TABLE_TYPE_BUILTIN, CLASSIFICATION, PII_TAG, PHI_TAG, PCI_TAG, SOX_TAG, SEC_TAG, FINANCE_TAG);
tableInstance.set(NAME, tableName);
tableInstance.set(AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME, tableName);
tableInstance.set("db", databaseInstance);
......@@ -518,13 +525,13 @@ public abstract class BaseResourceIT {
protected AtlasEntity createHiveTableInstanceV2(AtlasEntity databaseInstance, String tableName) throws Exception {
AtlasEntity tableInstance = new AtlasEntity(HIVE_TABLE_TYPE_V2);
tableInstance.setClassifications(
Arrays.asList(new AtlasClassification("classification"),
new AtlasClassification("pii"),
new AtlasClassification("phi"),
new AtlasClassification("pci"),
new AtlasClassification("sox"),
new AtlasClassification("sec"),
new AtlasClassification("finance"))
Arrays.asList(new AtlasClassification(CLASSIFICATION),
new AtlasClassification(PII_TAG),
new AtlasClassification(PHI_TAG),
new AtlasClassification(PCI_TAG),
new AtlasClassification(SOX_TAG),
new AtlasClassification(SEC_TAG),
new AtlasClassification(FINANCE_TAG))
);
tableInstance.setAttribute(NAME, tableName);
......
webapp/src/test/java/org/apache/atlas/web/integration/DataSetLineageJerseyResourceIT.java
......@@ -48,6 +48,11 @@ public class DataSetLineageJerseyResourceIT extends BaseResourceIT {
private String salesFactTable;
private String salesMonthlyTable;
private String salesDBName;
private static String FACT = "Fact_Tag";
private static String ETL = "ETL_Tag";
private static String DIMENSION = "Dimension_Tag";
private static String METRIC = "Metric_Tag";
private static String PII = "pii_Tag";
@BeforeClass
public void setUp() throws Exception {
......@@ -183,13 +188,13 @@ public class DataSetLineageJerseyResourceIT extends BaseResourceIT {
private void setupInstances() throws Exception {
HierarchicalTypeDefinition<TraitType> factTrait =
TypesUtil.createTraitTypeDef("Fact", ImmutableSet.<String>of());
TypesUtil.createTraitTypeDef(FACT, ImmutableSet.<String>of());
HierarchicalTypeDefinition<TraitType> etlTrait =
TypesUtil.createTraitTypeDef("ETL", ImmutableSet.<String>of());
TypesUtil.createTraitTypeDef(ETL, ImmutableSet.<String>of());
HierarchicalTypeDefinition<TraitType> dimensionTrait =
TypesUtil.createTraitTypeDef("Dimension", ImmutableSet.<String>of());
TypesUtil.createTraitTypeDef(DIMENSION, ImmutableSet.<String>of());
HierarchicalTypeDefinition<TraitType> metricTrait =
TypesUtil.createTraitTypeDef("Metric", ImmutableSet.<String>of());
TypesUtil.createTraitTypeDef(METRIC, ImmutableSet.<String>of());
createType(getTypesDef(null, null,
ImmutableList.of(factTrait, etlTrait, dimensionTrait, metricTrait), null));
......@@ -199,11 +204,11 @@ public class DataSetLineageJerseyResourceIT extends BaseResourceIT {
List<Referenceable> salesFactColumns = ImmutableList
.of(column("time_id", "int", "time id"), column("product_id", "int", "product id"),
column("customer_id", "int", "customer id", "pii"),
column("sales", "double", "product id", "Metric"));
column("customer_id", "int", "customer id", PII),
column("sales", "double", "product id", METRIC));
salesFactTable = "sales_fact" + randomString();
Id salesFact = table(salesFactTable, "sales fact table", salesDB, "Joe", "MANAGED", salesFactColumns, "Fact");
Id salesFact = table(salesFactTable, "sales fact table", salesDB, "Joe", "MANAGED", salesFactColumns, FACT);
List<Referenceable> timeDimColumns = ImmutableList
.of(column("time_id", "int", "time id"), column("dayOfYear", "int", "day Of Year"),
......@@ -211,7 +216,7 @@ public class DataSetLineageJerseyResourceIT extends BaseResourceIT {
Id timeDim =
table("time_dim" + randomString(), "time dimension table", salesDB, "John Doe", "EXTERNAL",
timeDimColumns, "Dimension");
timeDimColumns, DIMENSION);
Id reportingDB =
database("Reporting" + randomString(), "reporting database", "Jane BI",
......@@ -219,18 +224,18 @@ public class DataSetLineageJerseyResourceIT extends BaseResourceIT {
Id salesFactDaily =
table("sales_fact_daily_mv" + randomString(), "sales fact daily materialized view", reportingDB,
"Joe BI", "MANAGED", salesFactColumns, "Metric");
"Joe BI", "MANAGED", salesFactColumns, METRIC);
loadProcess("loadSalesDaily" + randomString(), "John ETL", ImmutableList.of(salesFact, timeDim),
ImmutableList.of(salesFactDaily), "create table as select ", "plan", "id", "graph", "ETL");
ImmutableList.of(salesFactDaily), "create table as select ", "plan", "id", "graph", ETL);
salesMonthlyTable = "sales_fact_monthly_mv" + randomString();
Id salesFactMonthly =
table(salesMonthlyTable, "sales fact monthly materialized view", reportingDB, "Jane BI",
"MANAGED", salesFactColumns, "Metric");
"MANAGED", salesFactColumns, METRIC);
loadProcess("loadSalesMonthly" + randomString(), "John ETL", ImmutableList.of(salesFactDaily),
ImmutableList.of(salesFactMonthly), "create table as select ", "plan", "id", "graph", "ETL");
ImmutableList.of(salesFactMonthly), "create table as select ", "plan", "id", "graph", ETL);
}
Id database(String name, String description, String owner, String locationUri, String... traitNames)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment