Explorar el Código

[oozie] Provide Hive2 action HiveServer2 URL at runtime by default

Remove search range facet min merging for now.
Romain Rigaux hace 10 años
padre
commit
35dedef8a4

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
apps/oozie/src/oozie/fixtures/initial_oozie_examples.json


+ 6 - 3
apps/oozie/src/oozie/models2.py

@@ -298,6 +298,9 @@ class Node():
     if workflow_mapping is None:
       workflow_mapping = {}
 
+    if self.data['type'] == 'hive2' and not self.data['properties']['jdbc_url']:
+      self.data['properties']['jdbc_url'] = _get_hiveserver2_url()
+
     data = {
       'node': self.data,
       'mapping': mapping,
@@ -610,9 +613,9 @@ class HiveServer2Action(Action):
      # Common
      'jdbc_url': {
           'name': 'jdbc_url',
-          'label': _('JDBC URL'),
-          'value': _get_hiveserver2_url(),
-          'help_text': _('JDBC URL for the Hive Server 2. Beeline will use this to know where to connect to.'),
+          'label': _('HiveServer2 URL'),
+          'value': "",
+          'help_text': _('e.g. jdbc:hive2://localhost:10000/default. JDBC URL for the Hive Server 2.'),
           'type': ''
      },
      'password': {

+ 2 - 2
apps/oozie/src/oozie/templates/editor2/common_workflow.mako

@@ -631,10 +631,10 @@
       <div class="tab-content">
         <div class="tab-pane active" data-bind="attr: { id: 'properties-' + id() }">
           <span data-bind="text: $root.workflow_properties.jdbc_url.label"></span>
-          <input type="text" data-bind="value: properties.jdbc_url" />
+          <input type="text" data-bind="value: properties.jdbc_url, attr: { placeholder: $root.workflow_properties.jdbc_url.help_text }" />
           <br/>
           <span data-bind="text: $root.workflow_properties.password.label"></span>
-          <input type="text" data-bind="value: properties.password" />
+          <input type="text" data-bind="value: properties.password, attr: { placeholder: $root.workflow_properties.password.help_text }" />
           <br/>
           <span data-bind="template: { name: 'common-action-properties' }"></span>
           <br/>

+ 1 - 1
apps/search/src/search/api.py

@@ -68,7 +68,7 @@ def _guess_range_facet(widget_type, solr_api, collection, facet_field, propertie
         gap = int((end - start) / SLOTS)
       if gap < 1:
         gap = 1
-      start = min(start, stats_min)
+
       end = max(end, stats_max)
     elif re.match('\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d\d?\d?)?Z', stat_facet['min']):
       is_date = True

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio