You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sa...@apache.org on 2017/09/21 23:59:13 UTC
[1/2] atlas git commit: ATLAS-2159: Incorrect createTime retrieved
for entity attributes in related entities search
Repository: atlas
Updated Branches:
refs/heads/branch-0.8 3d2f65ea7 -> a269111d3
ATLAS-2159: Incorrect createTime retrieved for entity attributes in related entities search
(cherry picked from commit 9d01689d326f938443de715a090afe26f6df1300)
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/3aeba233
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/3aeba233
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/3aeba233
Branch: refs/heads/branch-0.8
Commit: 3aeba233dc512d7a7c98c1dfdba2f6b8396c5f4b
Parents: 450ac83
Author: Sarath Subramanian <ss...@hortonworks.com>
Authored: Thu Sep 21 16:58:17 2017 -0700
Committer: Sarath Subramanian <ss...@hortonworks.com>
Committed: Thu Sep 21 16:58:59 2017 -0700
----------------------------------------------------------------------
.../atlas/repository/store/graph/v1/EntityGraphRetriever.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/3aeba233/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java
index 83c9c2b..abb0a56 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphRetriever.java
@@ -218,7 +218,7 @@ public final class EntityGraphRetriever {
Object name = getVertexAttribute(entityVertex, entityType.getAttribute(AtlasClient.NAME));
Object description = getVertexAttribute(entityVertex, entityType.getAttribute(AtlasClient.DESCRIPTION));
Object owner = getVertexAttribute(entityVertex, entityType.getAttribute(AtlasClient.OWNER));
- Object createTime = entityVertex.getProperty(Constants.TIMESTAMP_PROPERTY_KEY, Long.class);
+ Object createTime = getVertexAttribute(entityVertex, entityType.getAttribute(AtlasClient.CREATE_TIME));
Object displayText = name != null ? name : ret.getAttribute(AtlasClient.QUALIFIED_NAME);
ret.setAttribute(AtlasClient.NAME, name);
[2/2] atlas git commit: Merge branch 'branch-0.8' of
http://git-wip-us.apache.org/repos/asf/atlas into branch-0.8
Posted by sa...@apache.org.
Merge branch 'branch-0.8' of http://git-wip-us.apache.org/repos/asf/atlas into branch-0.8
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/a269111d
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/a269111d
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/a269111d
Branch: refs/heads/branch-0.8
Commit: a269111d375190bf9aa35c2ab288efbc3d1c40ff
Parents: 3aeba23 3d2f65e
Author: Sarath Subramanian <ss...@hortonworks.com>
Authored: Thu Sep 21 16:59:04 2017 -0700
Committer: Sarath Subramanian <ss...@hortonworks.com>
Committed: Thu Sep 21 16:59:04 2017 -0700
----------------------------------------------------------------------
.../org/apache/atlas/hive/hook/HiveHook.java | 93 +++++++----
addons/models/0010-base_model.json | 26 ++-
dashboardv2/public/css/scss/loader.scss | 7 +
dashboardv2/public/css/scss/tag.scss | 5 +
dashboardv2/public/css/scss/theme.scss | 18 +-
.../detail_page/DetailPageLayoutView_tmpl.html | 26 +--
.../entity/CreateEntityLayoutView_tmpl.html | 8 +-
.../profile/ProfileColumnLayoutView_tmpl.html | 2 +-
.../templates/search/SaveAsLayoutView_tmpl.html | 24 +++
.../search/SaveSearchItemView_tmpl.html | 28 ++++
.../js/templates/search/SaveSearch_tmpl.html | 29 ++++
.../templates/search/SearchLayoutView_tmpl.html | 8 +-
.../public/js/utils/CommonViewFunction.js | 164 +++++++++++++++++--
dashboardv2/public/js/utils/Enums.js | 11 ++
dashboardv2/public/js/utils/Messages.js | 12 +-
dashboardv2/public/js/utils/Overrides.js | 7 +
dashboardv2/public/js/utils/UrlLinks.js | 10 +-
.../public/js/views/search/QueryBuilderView.js | 4 +-
.../public/js/views/search/SaveAsLayoutView.js | 97 +++++++++++
.../js/views/search/SaveSearchItemView.js | 127 ++++++++++++++
.../public/js/views/search/SaveSearchView.js | 143 ++++++++++++++++
.../public/js/views/search/SearchLayoutView.js | 100 ++++++++++-
.../model/profile/AtlasUserSavedSearch.java | 35 +++-
.../atlas/discovery/AtlasDiscoveryService.java | 15 +-
.../ClassificationSearchProcessor.java | 10 +-
.../atlas/discovery/EntityDiscoveryService.java | 23 ++-
.../atlas/discovery/EntitySearchProcessor.java | 17 +-
.../atlas/repository/impexp/ImportService.java | 8 +-
.../repository/ogm/AtlasSavedSearchDTO.java | 5 +-
.../apache/atlas/repository/ogm/DataAccess.java | 2 +-
.../userprofile/UserProfileService.java | 23 ++-
.../repository/impexp/ImportServiceTest.java | 55 ++++++-
.../impexp/ZipFileResourceTestUtils.java | 10 +-
.../userprofile/UserProfileServiceTest.java | 47 ++++--
.../apache/atlas/web/rest/DiscoveryREST.java | 126 ++++++++++----
35 files changed, 1152 insertions(+), 173 deletions(-)
----------------------------------------------------------------------