From c66b00e2f66cde08d8cf7887c42c444876584f64 Mon Sep 17 00:00:00 2001
From: SunZhaonan <sunzhaonan@gmail.com>
Date: Fri, 18 Mar 2016 15:26:55 -0700
Subject: [PATCH] Fix dataset insert API bug. Fix load sql bug.

---
 backend-service/app/actors/TreeBuilderActor.java   |  4 ++--
 backend-service/app/models/daos/DatasetDao.java    | 12 +++++++-----
 metadata-etl/src/main/resources/jython/HdfsLoad.py |  4 ++--
 metadata-etl/src/main/resources/jython/HiveLoad.py |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/backend-service/app/actors/TreeBuilderActor.java b/backend-service/app/actors/TreeBuilderActor.java
index 2e5d2d45c9..49079f11ec 100644
--- a/backend-service/app/actors/TreeBuilderActor.java
+++ b/backend-service/app/actors/TreeBuilderActor.java
@@ -56,14 +56,14 @@ public class TreeBuilderActor extends UntypedActor {
           in = EtlJob.class.getClassLoader().getResourceAsStream("jython/FlowTreeBuilder.py");
           break;
         default:
-          Logger.warn("unknown message : {}", msg);
+          Logger.error("unknown message : {}", msg);
       }
       if (in != null) {
         interpreter.execfile(in);
         in.close();
         Logger.info("Finish build {} tree", msg);
       } else {
-        Logger.warn("can not find jython script");
+        Logger.error("can not find jython script");
       }
     } else {
       throw new Exception("message type is not supported!");
diff --git a/backend-service/app/models/daos/DatasetDao.java b/backend-service/app/models/daos/DatasetDao.java
index f85c274c47..0352e0a939 100644
--- a/backend-service/app/models/daos/DatasetDao.java
+++ b/backend-service/app/models/daos/DatasetDao.java
@@ -54,13 +54,15 @@ public class DatasetDao {
     ObjectMapper om = new ObjectMapper();
     om.setPropertyNamingStrategy(PropertyNamingStrategy.CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES);
     DatasetRecord record = om.convertValue(dataset, DatasetRecord.class);
-    Map<String, Object> refDataset = getDatasetByUrn(record.getRefDatasetUrn());
-
-    // Find ref dataset id
-    if (refDataset != null) {
-      record.setRefDatasetId((int) refDataset.get("id"));
+    if (record.getRefDatasetUrn() != null) {
+      Map<String, Object> refDataset = getDatasetByUrn(record.getRefDatasetUrn());
+      // Find ref dataset id
+      if (refDataset != null) {
+        record.setRefDatasetId(((Long) refDataset.get("id")).intValue());
+      }
     }
 
+
     // Find layout id
     if (record.getSamplePartitionFullPath() != null) {
       PartitionPatternMatcher ppm = new PartitionPatternMatcher(PartitionLayoutDao.getPartitionLayouts());
diff --git a/metadata-etl/src/main/resources/jython/HdfsLoad.py b/metadata-etl/src/main/resources/jython/HdfsLoad.py
index 10896d0dd6..625701200a 100644
--- a/metadata-etl/src/main/resources/jython/HdfsLoad.py
+++ b/metadata-etl/src/main/resources/jython/HdfsLoad.py
@@ -151,9 +151,9 @@ class HdfsLoad:
            or description in ('null', 'N/A', 'nothing', 'empty', 'none'));
 
         insert into field_comments (
-          user_id, comment, created, comment_crc32_checksum
+          user_id, comment, created, modified, comment_crc32_checksum
         )
-        select 0 user_id, description, now() created, crc32(description) from
+        select 0 user_id, description, now() created, now() modified, crc32(description) from
         (
           select sf.description
           from stg_dict_field_detail sf left join field_comments fc
diff --git a/metadata-etl/src/main/resources/jython/HiveLoad.py b/metadata-etl/src/main/resources/jython/HiveLoad.py
index 229a809113..c0c50e344b 100644
--- a/metadata-etl/src/main/resources/jython/HiveLoad.py
+++ b/metadata-etl/src/main/resources/jython/HiveLoad.py
@@ -185,9 +185,9 @@ class HiveLoad:
 
 
         insert into field_comments (
-          user_id, comment, created, comment_crc32_checksum
+          user_id, comment, created, modified, comment_crc32_checksum
         )
-        select 0 user_id, description, now() created, crc32(description) from
+        select 0 user_id, description, now() created, now() modified, crc32(description) from
         (
           select sf.description
           from stg_dict_field_detail sf left join field_comments fc