You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2018/03/26 20:58:10 UTC
[1/2] atlas git commit: ATLAS-2507: updated HBase hook to use : as
separator between namespace and table names
Repository: atlas
Updated Branches:
refs/heads/master 45d3872b6 -> 14d5a8e6a
ATLAS-2507: updated HBase hook to use : as separator between namespace and table names
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/c26e9bcd
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/c26e9bcd
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/c26e9bcd
Branch: refs/heads/master
Commit: c26e9bcd7427dfb0e7b14714d394de7b4667ace2
Parents: 45d3872
Author: rmani <rm...@hortonworks.com>
Authored: Mon Mar 19 18:16:42 2018 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon Mar 26 12:00:54 2018 -0700
----------------------------------------------------------------------
.../org/apache/atlas/hbase/bridge/HBaseAtlasHook.java | 10 +++++++---
.../atlas/hbase/util/ImportHBaseEntitiesBase.java | 12 +++++++-----
2 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/c26e9bcd/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
----------------------------------------------------------------------
diff --git a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
index f165e98..09998cf 100644
--- a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
+++ b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
@@ -116,6 +116,10 @@ public class HBaseAtlasHook extends AtlasHook {
public static final String ATTR_CF_EVICT_BLOCK_ONCLOSE = "evictBlocksOnClose";
public static final String ATTR_CF_PREFETCH_BLOCK_ONOPEN = "prefetchBlocksOnOpen";
+ public static final String HBASE_NAMESPACE_QUALIFIED_NAME = "%s@%s";
+ public static final String HBASE_TABLE_QUALIFIED_NAME_FORMAT = "%s:%s@%s";
+ public static final String HBASE_COLUMN_FAMILY_QUALIFIED_NAME_FORMAT = "%s:%s.%s@%s";
+
private static final String REFERENCEABLE_ATTRIBUTE_NAME = "qualifiedName";
private String clusterName = null;
@@ -377,7 +381,7 @@ public class HBaseAtlasHook extends AtlasHook {
if (clusterName == null || nameSpace == null || tableName == null || columnFamily == null) {
return null;
} else {
- return String.format("%s.%s.%s@%s", nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), columnFamily.toLowerCase(), clusterName);
+ return String.format(HBASE_COLUMN_FAMILY_QUALIFIED_NAME_FORMAT, nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), columnFamily.toLowerCase(), clusterName);
}
}
@@ -393,7 +397,7 @@ public class HBaseAtlasHook extends AtlasHook {
if (clusterName == null || nameSpace == null || tableName == null) {
return null;
} else {
- return String.format("%s.%s@%s", nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), clusterName);
+ return String.format(HBASE_TABLE_QUALIFIED_NAME_FORMAT, nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), clusterName);
}
}
@@ -408,7 +412,7 @@ public class HBaseAtlasHook extends AtlasHook {
if (clusterName == null || nameSpace == null) {
return null;
} else {
- return String.format("%s@%s", nameSpace.toLowerCase(), clusterName);
+ return String.format(HBASE_NAMESPACE_QUALIFIED_NAME, nameSpace.toLowerCase(), clusterName);
}
}
http://git-wip-us.apache.org/repos/asf/atlas/blob/c26e9bcd/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/util/ImportHBaseEntitiesBase.java
----------------------------------------------------------------------
diff --git a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/util/ImportHBaseEntitiesBase.java b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/util/ImportHBaseEntitiesBase.java
index d11a1a0..6c195b7 100644
--- a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/util/ImportHBaseEntitiesBase.java
+++ b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/util/ImportHBaseEntitiesBase.java
@@ -92,6 +92,10 @@ public class ImportHBaseEntitiesBase {
public static final String ATTR_CF_EVICT_BLOCK_ONCLOSE = "evictBlocksOnClose";
public static final String ATTR_CF_PREFETCH_BLOCK_ONOPEN = "prefetchBlocksOnOpen";
+ public static final String HBASE_NAMESPACE_QUALIFIED_NAME = "%s@%s";
+ public static final String HBASE_TABLE_QUALIFIED_NAME_FORMAT = "%s:%s@%s";
+ public static final String HBASE_COLUMN_FAMILY_QUALIFIED_NAME_FORMAT = "%s:%s.%s@%s";
+
protected final HBaseAdmin hbaseAdmin;
protected final boolean failOnError;
protected final String namespaceToImport;
@@ -380,8 +384,7 @@ public class ImportHBaseEntitiesBase {
*/
private static String getColumnFamilyQualifiedName(String clusterName, String nameSpace, String tableName, String columnFamily) {
tableName = stripNameSpace(tableName.toLowerCase());
-
- return String.format("%s.%s.%s@%s", nameSpace.toLowerCase(), tableName, columnFamily.toLowerCase(), clusterName);
+ return String.format(HBASE_COLUMN_FAMILY_QUALIFIED_NAME_FORMAT, nameSpace.toLowerCase(), tableName, columnFamily.toLowerCase(), clusterName);
}
/**
@@ -393,8 +396,7 @@ public class ImportHBaseEntitiesBase {
*/
private static String getTableQualifiedName(String clusterName, String nameSpace, String tableName) {
tableName = stripNameSpace(tableName.toLowerCase());
-
- return String.format("%s.%s@%s", nameSpace.toLowerCase(), tableName, clusterName);
+ return String.format(HBASE_TABLE_QUALIFIED_NAME_FORMAT, nameSpace.toLowerCase(), tableName, clusterName);
}
/**
@@ -404,7 +406,7 @@ public class ImportHBaseEntitiesBase {
* @return Unique qualified name to identify the HBase NameSpace instance in Atlas.
*/
private static String getNameSpaceQualifiedName(String clusterName, String nameSpace) {
- return String.format("%s@%s", nameSpace.toLowerCase(), clusterName);
+ return String.format(HBASE_NAMESPACE_QUALIFIED_NAME, nameSpace.toLowerCase(), clusterName);
}
private static String stripNameSpace(String tableName){
[2/2] atlas git commit: ATLAS-2508: when adding validityPeriod,
default value shown in UI is not included in POST request
Posted by ma...@apache.org.
ATLAS-2508: when adding validityPeriod, default value shown in UI is not included in POST request
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/14d5a8e6
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/14d5a8e6
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/14d5a8e6
Branch: refs/heads/master
Commit: 14d5a8e6ad7f0dd7edb4f8d95866916abbc6a99d
Parents: c26e9bc
Author: pratik24mac <pr...@gmail.com>
Authored: Wed Mar 21 19:02:02 2018 +0530
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Mon Mar 26 12:02:31 2018 -0700
----------------------------------------------------------------------
.../public/js/views/tag/AddTimezoneItemView.js | 44 ++++++--------------
1 file changed, 13 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/14d5a8e6/dashboardv2/public/js/views/tag/AddTimezoneItemView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/tag/AddTimezoneItemView.js b/dashboardv2/public/js/views/tag/AddTimezoneItemView.js
index 420303f..36616e6 100644
--- a/dashboardv2/public/js/views/tag/AddTimezoneItemView.js
+++ b/dashboardv2/public/js/views/tag/AddTimezoneItemView.js
@@ -63,7 +63,6 @@ define(['require',
},
onRender: function() {
var that = this,
- minDate = new Date(),
dateObj = {
"showDropdowns": true,
"timePicker": true,
@@ -75,41 +74,24 @@ define(['require',
"alwaysShowCalendars": true
},
tzstr = '<option selected="selected" disabled="disabled">-- Select Timezone --</option>';
-
+ this.ui.timeZone.select2({
+ allowClear: true,
+ data: moment.tz.names()
+ });
if (this.model.get('startTime') !== "") {
- this.ui.timeInterval.daterangepicker({
- "showDropdowns": true,
- "timePicker": true,
- "timePicker24Hour": true,
- "startDate": this.model.get('startTime'),
- "endDate": this.model.get('endTime'),
- "locale": {
- format: 'YYYY/MM/DD h:mm A'
- },
- "alwaysShowCalendars": true
- }).on('apply.daterangepicker', function(fullDate) {
- var val = fullDate.currentTarget.value.split(' - ');
- that.model.set('startTime', val[0]);
- that.model.set('endTime', val[1]);
- });
- this.ui.timeZone.select2({
- data: moment.tz.names()
- });
+ dateObj["startDate"] = this.model.get('startTime');
+ dateObj["endDate"] = this.model.get('endTime');
this.ui.timeZone.val(this.model.get('timeZone')).trigger("change", { 'manual': true });
} else {
- this.ui.timeInterval.daterangepicker(dateObj).on('apply.daterangepicker', function(fullDate) {
- var val = fullDate.currentTarget.value.split(' - ');
- that.model.set('startTime', val[0]);
- that.model.set('endTime', val[1]);
- });
this.ui.timeZone.html(tzstr);
- this.ui.timeZone.select2({
- placeholder: "Select TimeZone",
- allowClear: true,
- data: moment.tz.names()
- });
+ this.model.set('startTime', moment(dateObj.startDate).format('YYYY/MM/DD h:mm A'));
+ this.model.set('endTime', moment(dateObj.startDate).format('YYYY/MM/DD h:mm A'));
}
- $('[name="daterangepicker_start"]').attr('readonly', true); +
+ this.ui.timeInterval.daterangepicker(dateObj).on('apply.daterangepicker', function(ev, picker) {
+ that.model.set('startTime', picker.startDate.format('YYYY/MM/DD h:mm A'));
+ that.model.set('endTime', picker.endDate.format('YYYY/MM/DD h:mm A'));
+ });
+ $('[name="daterangepicker_start"]').attr('readonly', true);
$('[name="daterangepicker_end"]').attr('readonly', true);
},
buttonActive: function(option) {