Просмотр исходного кода

[sqoop2] Update client to sync with sqoop 1.99.3

Abraham Elmahrek 12 лет назад
Родитель
Сommit
18ce78f

+ 4 - 4
apps/sqoop/src/sqoop/client/base.py

@@ -107,8 +107,8 @@ class SqoopClient(object):
       connection.connector = self.get_connectors()[0].con_forms
     if not connection.framework:
       connection.framework = self.get_framework().con_forms
-    connection.created = int( round(time.time() * 1000) )
-    connection.updated = connection.created
+    connection.creation_date = int( round(time.time() * 1000) )
+    connection.update_date = connection.creation_date
     connection_dict = connection.to_dict()
     request_dict = {
       'all': [connection_dict]
@@ -155,8 +155,8 @@ class SqoopClient(object):
       job.connector = self.get_connectors()[0].job_forms[job.type.upper()]
     if not job.framework:
       job.framework = self.get_framework().job_forms[job.type.upper()]
-    job.created = int( round(time.time() * 1000) )
-    job.updated = job.created
+    job.creation_date = int( round(time.time() * 1000) )
+    job.update_date = job.creation_date
     job_dict = job.to_dict()
     request_dict = {
       'all': [job_dict]

+ 22 - 6
apps/sqoop/src/sqoop/client/connection.py

@@ -102,12 +102,14 @@ class Connection(object):
 
   @see sqoop.client.form for more information on unstructured forms in sqoop.
   """
-  SKIP = ('id', 'created', 'updated')
+  SKIP = ('id', 'creation_date', 'creation_user', 'update_date', 'update_user')
 
-  def __init__(self, name, connector_id, connector=None, framework=None, enabled=True, **kwargs):
+  def __init__(self, name, connector_id, connector=None, framework=None, enabled=True, creation_user='hue', creation_date=0, update_user='hue', update_date=0, **kwargs):
     self.id = kwargs.setdefault('id', -1)
-    self.created = kwargs.setdefault('created', 0)
-    self.updated = kwargs.setdefault('updated', 0)
+    self.creation_user = creation_user
+    self.creation_date = creation_date
+    self.update_user = update_user
+    self.update_date = update_date
     self.enabled = enabled
     self.name = name
     self.connector_id = connector_id
@@ -125,14 +127,28 @@ class Connection(object):
     if not 'connector_id' in connection_dict:
       connection_dict['connector_id'] = connection_dict.setdefault('connector-id', -1)
 
+    if not 'creation_user' in connection_dict:
+      connection_dict['creation_user'] = connection_dict.setdefault('creation-user', 'hue')
+
+    if not 'creation_date' in connection_dict:
+      connection_dict['creation_date'] = connection_dict.setdefault('creation-date', 0)
+
+    if not 'update_user' in connection_dict:
+      connection_dict['update_user'] = connection_dict.setdefault('update-user', 'hue')
+
+    if not 'update_date' in connection_dict:
+      connection_dict['update_date'] = connection_dict.setdefault('update-date', 0)
+
     return Connection(**connection_dict)
 
   def to_dict(self):
     d = {
       'id': self.id,
       'name': self.name,
-      'created': self.created,
-      'updated': self.updated,
+      'creation-user': self.creation_user,
+      'creation-date': self.creation_date,
+      'update-user': self.update_user,
+      'update-date': self.update_date,
       'connector-id': self.connector_id,
       'connector': [ connector.to_dict() for connector in self.connector ],
       'framework': [ framework.to_dict() for framework in self.framework ],

+ 22 - 6
apps/sqoop/src/sqoop/client/job.py

@@ -151,12 +151,14 @@ class Job(object):
 
   @see sqoop.client.form for more information on unstructured forms in sqoop.
   """
-  SKIP = ('id', 'created', 'updated')
+  SKIP = ('id', 'creation_date', 'creation_user', 'update_date', 'update_user')
 
-  def __init__(self, type, name, connection_id, connector_id, connector=None, framework=None, enabled=True, **kwargs):
+  def __init__(self, type, name, connection_id, connector_id, connector=None, framework=None, enabled=True, creation_user='hue', creation_date=0, update_user='hue', update_date=0, **kwargs):
     self.id = kwargs.setdefault('id', -1)
-    self.created = kwargs.setdefault('created', 0)
-    self.updated = kwargs.setdefault('updated', 0)
+    self.creation_user = creation_user
+    self.creation_date = creation_date
+    self.update_user = update_user
+    self.update_date = update_date
     self.enabled = enabled
     self.type = type
     self.name = name
@@ -179,6 +181,18 @@ class Job(object):
     if not 'connector_id' in job_dict:
       job_dict['connector_id'] = job_dict['connector-id']
 
+    if not 'creation_user' in job_dict:
+      job_dict['creation_user'] = job_dict.setdefault('creation-user', 'hue')
+
+    if not 'creation_date' in job_dict:
+      job_dict['creation_date'] = job_dict.setdefault('creation-date', 0)
+
+    if not 'update_user' in job_dict:
+      job_dict['update_user'] = job_dict.setdefault('update-user', 'hue')
+
+    if not 'update_date' in job_dict:
+      job_dict['update_date'] = job_dict.setdefault('update-date', 0)
+
     return Job(**job_dict)
 
   def to_dict(self):
@@ -186,8 +200,10 @@ class Job(object):
       'id': self.id,
       'type': self.type,
       'name': self.name,
-      'created': self.created,
-      'updated': self.updated,
+      'creation-user': self.creation_user,
+      'creation-date': self.creation_date,
+      'update-user': self.update_user,
+      'update-date': self.update_date,
       'connection-id': self.connection_id,
       'connector-id': self.connector_id,
       'connector': [ connector.to_dict() for connector in self.connector ],

+ 4 - 2
apps/sqoop/static/js/sqoop.connections.js

@@ -18,11 +18,13 @@
 var connections = (function($) {
   var ConnectionModel = koify.Model.extend({
     'id': -1,
-    'updated': null,
-    'created': null,
     'name': null,
     'connector': [],
     'connector_id': 0,
+    'creation_date': null,
+    'creation_user': null,
+    'update_date': null,
+    'update_user': null,
     'framework': [],
     'initialize': function(attrs) {
       var self = this;

+ 8 - 6
apps/sqoop/static/js/sqoop.jobs.js

@@ -27,8 +27,10 @@ var jobs = (function($) {
     'connection_id': 0,
     'connector': [],
     'framework': [],
-    'created': null,
-    'updated': null,
+    'creation_date': null,
+    'creation_user': null,
+    'update_date': null,
+    'update_user': null,
     'setImport': function(){
       this.type("IMPORT");
       // Huge hack for now
@@ -64,15 +66,15 @@ var jobs = (function($) {
       var self = this;
       self.parent.initialize.apply(self, arguments);
       self.createdFormatted = ko.computed(function() {
-        if (self.created()) {
-          return moment(self.created()).format('MM/DD/YYYY hh:mm A');
+        if (self.creation_date()) {
+          return moment(self.creation_date()).format('MM/DD/YYYY hh:mm A');
         } else {
           return 0;
         }
       });
       self.updatedFormatted = ko.computed(function() {
-        if (self.updated()) {
-          return moment(self.updated()).format('MM/DD/YYYY hh:mm A');
+        if (self.update_date()) {
+          return moment(self.update_date()).format('MM/DD/YYYY hh:mm A');
         } else {
           return 0;
         }