ATLAS-1155 Errors in Eclipse when I bring in the latest code (davidrad via shwethags)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/71e0e09b Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/71e0e09b Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/71e0e09b Branch: refs/heads/master Commit: 71e0e09b9d7c9f999741a71b4e779eb89a051760 Parents: c1081a4 Author: Shwetha GS <sshivalingamur...@hortonworks.com> Authored: Mon Sep 19 11:47:22 2016 +0530 Committer: Shwetha GS <sshivalingamur...@hortonworks.com> Committed: Mon Sep 19 11:47:22 2016 +0530 ---------------------------------------------------------------------- release-log.txt | 1 + .../atlas/discovery/graph/GraphBackedDiscoveryService.java | 3 +-- .../src/main/scala/org/apache/atlas/query/GremlinEvaluator.scala | 4 ++++ .../repository/graph/GraphBackedMetadataRepositoryTest.java | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71e0e09b/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index f1ac7a7..88be4b6 100644 --- a/release-log.txt +++ b/release-log.txt @@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai) ALL CHANGES: +ATLAS-1155 Errors in Eclipse when I bring in the latest code (davidrad via shwethags) ATLAS-1098 Atlas allows creation of tag with name "isa" which causes exceptions during search (apoorvnaik via shwethags) ATLAS-1142 Lineage UI Improvement (kevalbhatt via shwethags) ATLAS-712 Support getTrait() API (svimal2106 via shwethags) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71e0e09b/repository/src/main/java/org/apache/atlas/discovery/graph/GraphBackedDiscoveryService.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/discovery/graph/GraphBackedDiscoveryService.java b/repository/src/main/java/org/apache/atlas/discovery/graph/GraphBackedDiscoveryService.java index ef426e9..0c029bb 100755 --- a/repository/src/main/java/org/apache/atlas/discovery/graph/GraphBackedDiscoveryService.java +++ b/repository/src/main/java/org/apache/atlas/discovery/graph/GraphBackedDiscoveryService.java @@ -150,8 +150,7 @@ public class GraphBackedDiscoveryService implements DiscoveryService { //If the final limit is 0, don't launch the query, return with 0 rows if (validatedExpression instanceof Expressions.LimitExpression && ((Integer)((Expressions.LimitExpression) validatedExpression).limit().rawValue()) == 0) { - return new GremlinQueryResult(dslQuery, validatedExpression.dataType(), - scala.collection.immutable.List.empty()); + return new GremlinQueryResult(dslQuery, validatedExpression.dataType()); } GremlinQuery gremlinQuery = new GremlinTranslator(validatedExpression, graphPersistenceStrategy).translate(); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71e0e09b/repository/src/main/scala/org/apache/atlas/query/GremlinEvaluator.scala ---------------------------------------------------------------------- diff --git a/repository/src/main/scala/org/apache/atlas/query/GremlinEvaluator.scala b/repository/src/main/scala/org/apache/atlas/query/GremlinEvaluator.scala index 7de03c3..10d66a9 100755 --- a/repository/src/main/scala/org/apache/atlas/query/GremlinEvaluator.scala +++ b/repository/src/main/scala/org/apache/atlas/query/GremlinEvaluator.scala @@ -33,6 +33,10 @@ import org.apache.atlas.query.Expressions._ case class GremlinQueryResult(query: String, resultDataType: IDataType[_], rows: List[_]) { + def this(query: String,resultDataType: IDataType[_]) { + this(query,resultDataType,List.empty) + } + def toJson = JsonHelper.toJson(this) } http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/71e0e09b/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java b/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java index 3ca1f78..2541541 100755 --- a/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java @@ -188,7 +188,7 @@ public class GraphBackedMetadataRepositoryTest { private boolean assertEdge(String id, String typeName) throws Exception { TitanGraph graph = graphProvider.get(); - Vertex vertex = graph.query().has(Constants.GUID_PROPERTY_KEY, id).vertices().iterator().next(); + Vertex vertex = (Vertex)graph.query().has(Constants.GUID_PROPERTY_KEY, id).vertices().iterator().next(); Iterable<Edge> edges = vertex.getEdges(Direction.OUT, Constants.INTERNAL_PROPERTY_KEY_PREFIX + typeName + ".ref"); if (!edges.iterator().hasNext()) { ITypedReferenceableInstance entity = repositoryService.getEntityDefinition(id);
