Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
8c136a86
Commit
8c136a86
authored
5 years ago
by
Ashutosh Mestry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3379: Relationship API inadvertently uses getQualifiedName.
parent
d1109efe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
EntityDiscoveryService.java
...va/org/apache/atlas/discovery/EntityDiscoveryService.java
+4
-3
No files found.
repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
View file @
8c136a86
...
@@ -77,6 +77,7 @@ import static org.apache.atlas.util.AtlasGremlinQueryProvider.AtlasGremlinQuery.
...
@@ -77,6 +77,7 @@ import static org.apache.atlas.util.AtlasGremlinQueryProvider.AtlasGremlinQuery.
public
class
EntityDiscoveryService
implements
AtlasDiscoveryService
{
public
class
EntityDiscoveryService
implements
AtlasDiscoveryService
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
EntityDiscoveryService
.
class
);
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
EntityDiscoveryService
.
class
);
private
static
final
String
DEFAULT_SORT_ATTRIBUTE_NAME
=
"name"
;
private
static
final
String
DEFAULT_SORT_ATTRIBUTE_NAME
=
"name"
;
private
static
final
String
SORT_ATTRIBUTE_NAME
=
"sortAttributeName"
;
private
final
AtlasGraph
graph
;
private
final
AtlasGraph
graph
;
private
final
EntityGraphRetriever
entityRetriever
;
private
final
EntityGraphRetriever
entityRetriever
;
...
@@ -594,7 +595,7 @@ public class EntityDiscoveryService implements AtlasDiscoveryService {
...
@@ -594,7 +595,7 @@ public class EntityDiscoveryService implements AtlasDiscoveryService {
sortByAttributeName
=
null
;
sortByAttributeName
=
null
;
sortOrder
=
null
;
sortOrder
=
null
;
}
else
{
}
else
{
sortByAttributeName
=
sortByAttribute
.
get
Qualified
Name
();
sortByAttributeName
=
sortByAttribute
.
get
VertexProperty
Name
();
if
(
sortOrder
==
null
)
{
if
(
sortOrder
==
null
)
{
sortOrder
=
ASCENDING
;
sortOrder
=
ASCENDING
;
...
@@ -613,11 +614,11 @@ public class EntityDiscoveryService implements AtlasDiscoveryService {
...
@@ -613,11 +614,11 @@ public class EntityDiscoveryService implements AtlasDiscoveryService {
if
(
sortOrder
==
ASCENDING
)
{
if
(
sortOrder
==
ASCENDING
)
{
relatedEntitiesQuery
+=
gremlinQueryProvider
.
getQuery
(
RELATIONSHIP_SEARCH_ASCENDING_SORT
);
relatedEntitiesQuery
+=
gremlinQueryProvider
.
getQuery
(
RELATIONSHIP_SEARCH_ASCENDING_SORT
);
bindings
.
put
(
"sortAttributeName"
,
sortByAttributeName
);
bindings
.
put
(
SORT_ATTRIBUTE_NAME
,
sortByAttributeName
);
}
else
if
(
sortOrder
==
DESCENDING
)
{
}
else
if
(
sortOrder
==
DESCENDING
)
{
relatedEntitiesQuery
+=
gremlinQueryProvider
.
getQuery
(
RELATIONSHIP_SEARCH_DESCENDING_SORT
);
relatedEntitiesQuery
+=
gremlinQueryProvider
.
getQuery
(
RELATIONSHIP_SEARCH_DESCENDING_SORT
);
bindings
.
put
(
"sortAttributeName"
,
sortByAttributeName
);
bindings
.
put
(
SORT_ATTRIBUTE_NAME
,
sortByAttributeName
);
}
}
relatedEntitiesQuery
+=
gremlinQueryProvider
.
getQuery
(
TO_RANGE_LIST
);
relatedEntitiesQuery
+=
gremlinQueryProvider
.
getQuery
(
TO_RANGE_LIST
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment