yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-10-14 10:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add confidential and recursive column to dict_dataset_field

Browse Source
This commit is contained in:
Yi Wang 2016-08-23 15:50:30 -07:00
parent d46a9d8b8e
commit 7cbda15b5a
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
backend-service/app/models/daos/DatasetInfoDao.java
View File

@ -590,11 +590,12 @@ public class DatasetInfoDao {
String isActive = "N"; String isActive = "N";
if (ownerInfo.containsKey("app_id")) { if (ownerInfo.containsKey("app_id")) {
appId = StringUtil.toInt(ownerInfo.get("app_id")); appId = StringUtil.toInt(ownerInfo.get("app_id"));
isActive = appId == 301 ? "Y" : appId == 300 ? StringUtil.toStr(ownerInfo.get("is_active")) : "N"; isActive = appId == 301 ? "Y" : appId == 300 ? (String) ownerInfo.get("is_active") : "N";
} }
record.setAppId(appId); record.setAppId(appId);
record.setIsActive(isActive); record.setIsActive(isActive);
record.setIsGroup(record.getOwnerType().equalsIgnoreCase("group") ? "Y" : "N"); String ownerTypeString = record.getOwnerType();
record.setIsGroup(ownerTypeString != null && ownerTypeString.equalsIgnoreCase("group") ? "Y" : "N");
sortId++; sortId++;
record.setSortId(sortId); record.setSortId(sortId);
@ -612,17 +613,16 @@ public class DatasetInfoDao {
for (DatasetOwnerRecord rec : ownerList) { for (DatasetOwnerRecord rec : ownerList) {
for (Map<String, Object> old : oldOwnerList) { for (Map<String, Object> old : oldOwnerList) {
if (rec.getDatasetId().equals(StringUtil.toInt(old.get("dataset_id"))) && rec.getOwner() if (rec.getDatasetId().equals(StringUtil.toInt(old.get("dataset_id"))) && rec.getOwner()
.equals(StringUtil.toStr(old.get("owner_id"))) && rec.getAppId() .equals(old.get("owner_id")) && rec.getAppId().equals(StringUtil.toInt(old.get("app_id")))) {
.equals(StringUtil.toInt(old.get("app_id")))) { rec.setDbIds((String) old.get("db_ids"));
rec.setDbIds(StringUtil.toStr(old.get("db_ids")));
rec.setCreatedTime(StringUtil.toLong(old.get("created_time"))); rec.setCreatedTime(StringUtil.toLong(old.get("created_time")));
// take the higher priority owner category // take the higher priority owner category
rec.setOwnerCategory( rec.setOwnerCategory(
OwnerType.chooseOwnerType(rec.getOwnerCategory(), StringUtil.toStr(old.get("owner_type")))); OwnerType.chooseOwnerType(rec.getOwnerCategory(), (String) old.get("owner_type")));
// merge owner source as comma separated list // merge owner source as comma separated list
rec.setOwnerSource(mergeOwnerSource(rec.getOwnerSource(), StringUtil.toStr(old.get("owner_source")))); rec.setOwnerSource(mergeOwnerSource(rec.getOwnerSource(), (String) old.get("owner_source")));
// remove from owner source? // remove from owner source?
} }
@ -853,21 +853,18 @@ public class DatasetInfoDao {
field.setDatasetId(datasetId); field.setDatasetId(datasetId);
String fieldPath = field.getFieldPath(); String fieldPath = field.getFieldPath();
int lastIndex = fieldPath.lastIndexOf('.'); // if not found, index = -1 int lastIndex = fieldPath.lastIndexOf('.'); // if not found, index = -1
if (lastIndex >= 0) {
field.setParentPath(fieldPath.substring(0, lastIndex));
}
field.setFieldName(fieldPath.substring(lastIndex + 1)); field.setFieldName(fieldPath.substring(lastIndex + 1));
field.setParentPath(lastIndex > 0 ? fieldPath.substring(0, lastIndex) : "");
// merge old info into updated list // merge old info into updated list
for (Map<String, Object> old : oldInfo) { for (Map<String, Object> old : oldInfo) {
if (field.getDatasetId().equals(StringUtil.toInt(old.get("dataset_id"))) && field.getFieldName() if (datasetId.equals(StringUtil.toInt(old.get("dataset_id"))) && field.getFieldName()
.equals(StringUtil.toStr(old.get("field_name"))) && field.getParentPath() .equals(old.get("field_name")) && field.getParentPath().equals(old.get("parent_path"))) {
.equals(StringUtil.toStr(old.get("parent_path")))) { field.setNamespace((String) old.get("namespace"));
field.setNamespace(StringUtil.toStr(old.get("namespace"))); field.setCommentIds((String) old.get("comment_ids"));
field.setCommentIds(StringUtil.toStr(old.get("comment_ids")));
field.setDefaultCommentId(StringUtil.toInt(old.get("default_comment_id"))); field.setDefaultCommentId(StringUtil.toInt(old.get("default_comment_id")));
field.setPartitioned(StringUtil.toStr(old.get("is_partitioned")).equals("Y")); field.setPartitioned("Y".equals(old.get("is_partitioned")));
field.setPartitioned(StringUtil.toStr(old.get("is_indexed")).equals("Y")); field.setIndexed("Y".equals(old.get("is_indexed")));
} }
} }
} }

2
data-model/DDL/ETL_DDL/dataset_metadata.sql
View File

@ -180,6 +180,8 @@ CREATE TABLE `dict_field_detail` (
COMMENT 'only in RDBMS', COMMENT 'only in RDBMS',
`is_distributed` TINYINT(4) NULL `is_distributed` TINYINT(4) NULL
COMMENT 'only in RDBMS', COMMENT 'only in RDBMS',
`is_recursive` CHAR(1) NULL,
`confidential_flag` VARCHAR(200) NULL,
`default_value` VARCHAR(200) NULL, `default_value` VARCHAR(200) NULL,
`namespace` VARCHAR(200) NULL, `namespace` VARCHAR(200) NULL,
`java_data_type` VARCHAR(50) NULL `java_data_type` VARCHAR(50) NULL

6
wherehows-common/src/main/java/wherehows/common/schemas/DatasetFieldSchemaRecord.java
View File

@ -63,13 +63,15 @@ public class DatasetFieldSchemaRecord extends AbstractRecord {
public String[] getFieldDetailColumns() { public String[] getFieldDetailColumns() {
return new String[]{"dataset_id", "sort_id", "parent_sort_id", "parent_path", "field_name", "fields_layout_id", return new String[]{"dataset_id", "sort_id", "parent_sort_id", "parent_path", "field_name", "fields_layout_id",
"field_label", "data_type", "data_size", "data_precision", "data_fraction", "is_nullable", "is_indexed", "field_label", "data_type", "data_size", "data_precision", "data_fraction", "is_nullable", "is_indexed",
"is_partitioned", "default_value", "namespace", "default_comment_id", "comment_ids"}; "is_partitioned", "is_recursive", "confidential_flags", "default_value", "namespace", "default_comment_id",
"comment_ids"};
} }
public Object[] getFieldDetailValues() { public Object[] getFieldDetailValues() {
return new Object[]{datasetId, position, parentFieldPosition, parentPath, fieldName, 0, label, type, maxCharLength, return new Object[]{datasetId, position, parentFieldPosition, parentPath, fieldName, 0, label, type, maxCharLength,
precision, scale, nullable != null && nullable ? "Y" : "N", indexed != null && indexed ? "Y" : "N", precision, scale, nullable != null && nullable ? "Y" : "N", indexed != null && indexed ? "Y" : "N",
partitioned != null && partitioned ? "Y" : "N", defaultValue, namespace, defaultCommentId, commentIds}; partitioned != null && partitioned ? "Y" : "N", isRecursive != null && isRecursive ? "Y" : "N",
confidentialFlags, defaultValue, namespace, defaultCommentId, commentIds};
} }
public DatasetFieldSchemaRecord() { public DatasetFieldSchemaRecord() {