Przeglądaj źródła

HUE-4530 [indexer] Fix field type guessing from a table

Romain Rigaux 9 lat temu
rodzic
commit
1d42dc8

+ 12 - 0
desktop/libs/indexer/src/indexer/file_format.py

@@ -492,6 +492,18 @@ class HiveFormat(CSVFormat):
     "BINARY_TYPE": "string",
     "DECIMAL_TYPE": "double",
     "DATE_TYPE": "date",
+    "boolean": "string",
+    "tinyint": "long",
+    "samllint": "long",
+    "int": "long",
+    "bigint": "long",
+    "float": "double",
+    "double": "double",
+    "string": "string",
+    "timestamp": "date",
+    "binary": "string",
+    "decimal": "double", # Won't match decimal(16,6)
+    "date": "date",
   }
 
   @classmethod

+ 3 - 3
desktop/libs/indexer/src/indexer/templates/indexer.mako

@@ -345,9 +345,9 @@ ${ assist.assistPanel() }
       <!-- /ko -->
 
       <!-- ko if: currentStep() == 1 && createWizard.fileFormat().name().length > 0 -->
-      <button class="btn" data-bind="click: createWizard.guessFormat, visible: createWizard.fileFormat().inputFormat() == 'file', enable: createWizard.fileFormat().path() !== '' && !createWizard.isGuessingFormat()">${_('Guess File Format')} <i class="fa fa-spinner fa-spin" data-bind="visible: createWizard.isGuessingFormat"></i> </button>
-      <button class="btn" data-bind="click: createWizard.guessFormat, visible: createWizard.fileFormat().inputFormat() == 'table', enable: createWizard.fileFormat().table() !== '' && !createWizard.isGuessingFormat()">${_('Process Table')} <i class="fa fa-spinner fa-spin" data-bind="visible: createWizard.isGuessingFormat"></i></button>
-      <button class="btn" data-bind="click: createWizard.guessFormat, visible: createWizard.fileFormat().inputFormat() == 'query', enable: createWizard.fileFormat().query() !== '' && !createWizard.isGuessingFormat()">${_('Process Query')} <i class="fa fa-spinner fa-spin" data-bind="visible: createWizard.isGuessingFormat"></i></button>
+      <button class="btn" data-bind="click: createWizard.guessFormat, enable: createWizard.fileFormat().show">
+        ${_('Select fields')} <i class="fa fa-spinner fa-spin" data-bind="visible: createWizard.isGuessingFormat"></i>
+      </button>
       <!-- /ko -->
 
       <!-- ko if: currentStep() > 1 -->