update

Author: Lanxiaozhi

dwf.conf

@@ -6,11 +6,17 @@ LOG_FILE = run.log
 LOG_LEVEL = debug
 
 [DB]
-DB_HOST = 192.168.6.106
+DB_HOST = 192.168.10.22
 DB_PORT = 5432
-DB_NAME = develop
+DB_NAME = postgres
 DB_USER = postgres
-DB_PASSWORD = xlearn123
+DB_PASSWORD = nA5&Vvkq
+
+#DB_HOST = 192.168.6.106
+#DB_PORT = 5432
+#DB_NAME = develop
+#DB_USER = postgres
+#DB_PASSWORD = xlearn123
 
 [TEST_DB]
 DB_HOST = 192.168.10.18

dwf/dataset/metadata/dataset_crud.py

@@ -8,112 +8,123 @@
 # Version 0.1
 #
 
-from dwf.ormmodels import Dataset, datetime
-from dwf.common.log import logger
 from dwf.common.exception import *
+from dwf.common.log import logger
+from dwf.ormmodels import Dataset, datetime
 from dwf.util.id import generate_primary_key
 
 
 class DatasetCRUD:
+
     def __init__(self, db_session):
         self.db_session = db_session
 
     def add_dataset(self, name, datasource_id, subid=None, creator=None, owner=None, current_process=None,
                     last_modifier=None, data_file_format=None, default_filter_string=None, description=None,
                     filter=None, patterns=None, target_entity_class=None):
-        '''
-            Register a dataset into the metadata DB.
-
-            Args:
-                name - The name of dataset.
-                datasource_id - The datasource id of datasource that the dataset belongs to.
-                data_format - The format of dataset.
-                data_filter - The filter path of dataset, used for filtering out data from datasource.
-                data_type - The type of dataset.
+        """
+        创建数据集元信息
 
-            Returns:
-                The ID of added dataset.
-        '''
+        :param name: 数据集名称
+        :param datasource_id: 数据源ID
+        :param subid:
+        :param creator:
+        :param owner:
+        :param current_process:
+        :param last_modifier:
+        :param data_file_format:
+        :param default_filter_string:
+        :param description:
+        :param filter:
+        :param patterns:
+        :param target_entity_class:
+        :return: 数据集ID
+        """
 
         id = generate_primary_key('DSET')
         create_time = datetime.now()
 
+        if creator is None:
+            creator = 'admin'
+        if owner is None:
+            owner = 'admin'
+        if last_modifier is None:
+            last_modifier = 'admin'
+
         dataset = Dataset(id=id, subid=subid, creator=creator, owner=owner, current_process=current_process,
                           last_modifier=last_modifier, create_time=create_time, name=name,
                           data_file_format=data_file_format, datasource_id=datasource_id,
                           default_filter_string=default_filter_string, description=description, filter=filter,
                           patterns=patterns, target_entity_class=target_entity_class)
         self.db_session.add(dataset)
         self.db_session.commit()
+
         return id
 
     def get_dataset(self, dataset_id):
-        '''
-            Get a dataset by ID from the metadata DB of DWF.
-
-            Args:
-                dataset_id - The ID of dataset.
+        """
+        通过ID获取数据集元信息
 
-            Returns:
-                The object of dataset.
+        :param dataset_id: 数据集ID
+        :return: 数据集元信息
+        """
 
-        '''
         dataset = self.db_session.query(Dataset).get(dataset_id)
+
         return dataset
 
     def get_all_dataset(self):
-        '''
-            Get all datasets from the metadata DB of DWF.
+        """
+        获取全部的数据集元信息
 
-            Args:
-                None
+        :return: 数据集元信息列表
+        """
 
-            Returns:
-                The list of object of dataset.
-        '''
         datasets = self.db_session.query(Dataset).all()
+
         return datasets
 
     def delete_dataset(self, dataset_id):
-        '''
-            Delete a dataset by ID from the metadata DB of DWF.
+        """
+        删除数据集元信息
 
-            Args:
-                dataset_id - The ID of dataset.
+        :param dataset_id: 数据集ID
+        :return: 无
+        """
 
-        '''
         pending = self.db_session.query(Dataset).get(dataset_id)
         self.db_session.delete(pending)
         self.db_session.commit()
-        return True
 
     def update_dataset(self, dataset_id, subid=None, creator=None, owner=None, current_process=None, last_modifier=None,
                        name=None, datasource_id=None, data_file_format=None, default_filter_string=None,
                        description=None, filter=None, patterns=None, target_entity_class=None):
         """
+        更新数据集元信息
 
-        :param dataset_id:
+        :param dataset_id: 数据集ID
         :param subid:
         :param creator:
         :param owner:
         :param current_process:
         :param last_modifier:
-        :param name:
-        :param datasource_id:
+        :param name: 数据集名称
+        :param datasource_id: 数据源ID
         :param data_file_format:
         :param default_filter_string:
         :param description:
         :param filter:
         :param patterns:
         :param target_entity_class:
-        :return:
+        :return: 无
         """
-        pending = self.db_session.query(Dataset).get(dataset_id)
 
         if dataset_id is None:
-            logger.error('dataset_id is needed')
+            logger.error('缺少数据集ID')
             raise PARAM_LACK
 
+        pending = self.db_session.query(Dataset).get(dataset_id)
+
         if subid is not None:
             pending.subid = subid
         if creator is not None:
@@ -143,4 +154,3 @@ def update_dataset(self, dataset_id, subid=None, creator=None, owner=None, curre
 
         pending.update_time = datetime.now()
         self.db_session.commit()
-        return pending

dwf/datasource/metadata/datasource_crud.py

@@ -1,37 +1,60 @@
 # -*- coding:utf-8 -*-
+#
+# DataWay Dataset SDK
+# Initial Date: 2018.06.14
+#
+# Title: methods for metadata of datasource
+#
+# Version 0.1
+#
+
+from dwf.common.exception import *
+from dwf.common.log import logger
 from dwf.ormmodels import Datasource, datetime
 from dwf.util.id import generate_primary_key
 
 
 class DataSourceCRUD:
+
     def __init__(self, db_session):
         self.db_session = db_session
 
     def add_datasource(self, name, subid=None, creator=None, owner=None, current_process=None, last_modifier=None,
                        data_file_format=None, database_name=None, datasource_type='LOCAL_FS', description=None,
                        folder_depth=None, paramone=None, password=None, server_ip=None, server_port=None, username=None,
                        workbench_url=None):
-        '''
-            Register a datasource in the metadata DB of DWF.
-            Args:
-                id -
-                create_time -
-                update_time -
-                name - Name of DB.
-                hostname - The hostname or IP of DB.
-                port - The Port of DB.
-                username - The username used for login.
-                password - The password of DB.
-                datasource_type -  The type of datasource, like HDFS.
-                view_metadata_port -
-                description - The description of datasource
-            Returns:
-                The ID of datasource.
-
-        '''
+        """
+        创建数据源元信息
+
+        :param name: 数据源名称
+        :param subid:
+        :param creator:
+        :param owner:
+        :param current_process:
+        :param last_modifier:
+        :param data_file_format:
+        :param database_name:
+        :param datasource_type:
+        :param description:
+        :param folder_depth:
+        :param paramone:
+        :param password:
+        :param server_ip:
+        :param server_port:
+        :param username:
+        :param workbench_url:
+        :return: 数据源ID
+        """
+
         id = generate_primary_key('DSOU')
         create_time = datetime.now()
 
+        if creator is None:
+            creator = 'admin'
+        if owner is None:
+            owner = 'admin'
+        if last_modifier is None:
+            last_modifier = 'admin'
         if database_name is None:
             database_name = '/'
         if folder_depth is None:
@@ -45,49 +68,53 @@ def add_datasource(self, name, subid=None, creator=None, owner=None, current_pro
                                     username=username, workbench_url=workbench_url)
         self.db_session.add(new_datasource)
         self.db_session.commit()
-        return new_datasource.id
+
+        return id
 
     def get_datasource(self, datasource_id):
-        '''
-            Get a datasource by ID from the metadata DB of DWF.
-            Args:
-                datasource_id - The ID of datasource.
-            Returns:
-                The object of datasource.
-        '''
+        """
+        根据ID获取数据源元信息
+
+        :param datasource_id: 数据源ID
+        :return: 数据源元信息
+        """
+
         datasource = self.db_session.query(Datasource).get(datasource_id)
+
         return datasource
 
     def get_all_datasource(self):
-        '''
-            Get all datasources from the metadata DB of DWF.
-            Args:
+        """
+        获取全部的数据源元信息
+
+        :return: 数据源元信息列表
+        """
 
-            Returns:
-                The list of datasources.
-        '''
         datasource_list = self.db_session.query(Datasource).all()
+
         return datasource_list
 
     def delete_datasource(self, datasource_id):
-        '''
-            Delete a datasource by ID from the metadata DB of DWF.
-            Args:
-                datasource_id - The ID of datasource.
-        '''
+        """
+        删除数据源元信息
+
+        :param datasource_id: 数据源ID
+        :return: 无
+        """
+
         pending = self.db_session.query(Datasource).get(datasource_id)
         self.db_session.delete(pending)
         self.db_session.commit()
-        return True
 
     def update_datasource(self, datasource_id, name=None, subid=None, creator=None, owner=None, current_process=None,
                           last_modifier=None, data_file_format=None, database_name=None, datasource_type=None,
                           description=None, folder_depth=None, paramone=None, password=None, server_ip=None,
                           server_port=None, username=None, workbench_url=None):
         """
+        更新数据源元信息
 
-        :param datasource_id:
-        :param name:
+        :param datasource_id: 数据源ID
+        :param name: 数据源名称
         :param subid:
         :param creator:
         :param owner:
@@ -104,8 +131,13 @@ def update_datasource(self, datasource_id, name=None, subid=None, creator=None,
         :param server_port:
         :param username:
         :param workbench_url:
-        :return:
+        :return: 无
         """
+
+        if datasource_id is None:
+            logger.error('缺少数据源ID')
+            raise PARAM_LACK
+
         pending = self.db_session.query(Datasource).get(datasource_id)
 
         if subid is not None:
@@ -145,4 +177,3 @@ def update_datasource(self, datasource_id, name=None, subid=None, creator=None,
 
         pending.update_time = datetime.now()
         self.db_session.commit()
-        return pending