瀏覽代碼

HUE-8856 [autocomplete] Extract jison for Impala SELECT, SET, SHOW, UPDATE and USE

Johan Ahlen 6 年之前
父節點
當前提交
614c630aa6

+ 1 - 1
desktop/core/src/desktop/js/parse/jison/impala/sql.jisonlex

@@ -397,7 +397,7 @@
 'VALUES'                           { return 'VALUES'; }
 'VARBINARY'                        { return 'VARBINARY'; }
 'VARCHAR'                          { return 'VARCHAR'; }
-'VARCHAR'                          { return 'VARCHAR'; } // Not in Impala
+'VARCHAR'                          { return 'VARCHAR'; }
 'VARYING'                          { return 'VARYING'; }
 'VERSIONING'                       { return 'VERSIONING'; }
 'VIEW'                             { return 'VIEW'; }

+ 3 - 3
desktop/core/src/desktop/js/parse/jison/impala/sql_alter.jison

@@ -420,20 +420,20 @@ DropOperations_EDIT
  ;
 
 AlterTableLeftSide
- : 'ALTER' AnyTable SchemaQualifiedTableIdentifier
+ : 'ALTER' 'TABLE' SchemaQualifiedTableIdentifier
    {
      parser.addTablePrimary($3);
    }
  ;
 
 AlterTableLeftSide_EDIT
- : 'ALTER' AnyTable SchemaQualifiedTableIdentifier_EDIT
+ : 'ALTER' 'TABLE' SchemaQualifiedTableIdentifier_EDIT
    {
      if (parser.yy.result.suggestTables) {
        parser.yy.result.suggestTables.onlyTables = true;
      }
    }
- | 'ALTER' AnyTable 'CURSOR'
+ | 'ALTER' 'TABLE' 'CURSOR'
    {
      parser.suggestTables({ onlyTables: true });
      parser.suggestDatabases({ appendDot: true });

+ 75 - 75
desktop/core/src/desktop/js/parse/jison/impala/sql_create.jison

@@ -35,7 +35,7 @@ CreateStatement_EDIT
  | TableDefinition_EDIT
  | ViewDefinition_EDIT
  | FunctionDefinition_EDIT
- | AnyCreate OptionalExternal 'CURSOR'
+ | 'CREATE' 'EXTERNAL' 'CURSOR'
    {
      if ($2) {
        parser.suggestKeywords(['TABLE']);
@@ -46,33 +46,33 @@ CreateStatement_EDIT
  ;
 
 DatabaseDefinition
- : AnyCreate DatabaseOrSchema OptionalIfNotExists
- | AnyCreate DatabaseOrSchema OptionalIfNotExists RegularIdentifier DatabaseDefinitionOptionals
+ : 'CREATE' DatabaseOrSchema OptionalIfNotExists
+ | 'CREATE' DatabaseOrSchema OptionalIfNotExists RegularIdentifier DatabaseDefinitionOptionals
    {
      parser.addNewDatabaseLocation(@4, [{ name: $4 }]);
    }
  ;
 
 DatabaseDefinition_EDIT
- : AnyCreate DatabaseOrSchema OptionalIfNotExists 'CURSOR'
+ : 'CREATE' DatabaseOrSchema OptionalIfNotExists 'CURSOR'
    {
      if (!$3) {
        parser.suggestKeywords(['IF NOT EXISTS']);
      }
    }
- | AnyCreate DatabaseOrSchema OptionalIfNotExists_EDIT
- | AnyCreate DatabaseOrSchema OptionalIfNotExists 'CURSOR' RegularIdentifier
+ | 'CREATE' DatabaseOrSchema OptionalIfNotExists_EDIT
+ | 'CREATE' DatabaseOrSchema OptionalIfNotExists 'CURSOR' RegularIdentifier
    {
      if (!$3) {
        parser.suggestKeywords(['IF NOT EXISTS']);
      }
      parser.addNewDatabaseLocation(@5, [{ name: $5 }]);
    }
- | AnyCreate DatabaseOrSchema OptionalIfNotExists_EDIT RegularIdentifier
+ | 'CREATE' DatabaseOrSchema OptionalIfNotExists_EDIT RegularIdentifier
    {
      parser.addNewDatabaseLocation(@4, [{ name: $4 }]);
    }
- | AnyCreate DatabaseOrSchema OptionalIfNotExists RegularIdentifier DatabaseDefinitionOptionals 'CURSOR'
+ | 'CREATE' DatabaseOrSchema OptionalIfNotExists RegularIdentifier DatabaseDefinitionOptionals 'CURSOR'
    {
      parser.addNewDatabaseLocation(@4, [{ name: $4 }]);
    }
@@ -133,18 +133,18 @@ PropertyAssignment
  ;
 
 TableDefinition
- : AnyCreate OptionalExternal AnyTable OptionalIfNotExists TableDefinitionRightPart
+ : 'CREATE' 'EXTERNAL' 'TABLE' OptionalIfNotExists TableDefinitionRightPart
  ;
 
 TableDefinition_EDIT
- : AnyCreate OptionalExternal AnyTable OptionalIfNotExists TableDefinitionRightPart_EDIT
- | AnyCreate OptionalExternal AnyTable OptionalIfNotExists 'CURSOR'
+ : 'CREATE' 'EXTERNAL' 'TABLE' OptionalIfNotExists TableDefinitionRightPart_EDIT
+ | 'CREATE' 'EXTERNAL' 'TABLE' OptionalIfNotExists 'CURSOR'
    {
      if (!$4) {
        parser.suggestKeywords(['IF NOT EXISTS']);
      }
    }
- | AnyCreate OptionalExternal AnyTable OptionalIfNotExists_EDIT
+ | 'CREATE' 'EXTERNAL' 'TABLE' OptionalIfNotExists_EDIT
  ;
 
 TableDefinitionRightPart
@@ -248,7 +248,7 @@ TableIdentifierAndOptionalColumnSpecification_EDIT
 OptionalColumnSpecificationsOrLike
  :
  | ParenthesizedColumnSpecificationList
- | 'LIKE_PARQUET' HdfsPath          -> []
+ | 'LIKE_PARQUET' HdfsPath                  -> []
  | 'LIKE' SchemaQualifiedTableIdentifier    -> []
  ;
 
@@ -617,15 +617,15 @@ HashClause_EDIT
  ;
 
 RangeClause
- : AnyRange ParenthesizedColumnList ParenthesizedPartitionValuesList
+ : 'RANGE' ParenthesizedColumnList ParenthesizedPartitionValuesList
  ;
 
 RangeClause_EDIT
- : AnyRange 'CURSOR'
- | AnyRange ParenthesizedColumnList_EDIT
- | AnyRange ParenthesizedColumnList 'CURSOR'
- | AnyRange ParenthesizedColumnList ParenthesizedPartitionValuesList_EDIT
- | AnyRange ParenthesizedColumnList_EDIT ParenthesizedPartitionValuesList
+ : 'RANGE' 'CURSOR'
+ | 'RANGE' ParenthesizedColumnList_EDIT
+ | 'RANGE' ParenthesizedColumnList 'CURSOR'
+ | 'RANGE' ParenthesizedColumnList ParenthesizedPartitionValuesList_EDIT
+ | 'RANGE' ParenthesizedColumnList_EDIT ParenthesizedPartitionValuesList
  ;
 
 OptionalSortBy
@@ -931,26 +931,26 @@ CommitLocations
  ;
 
 ViewDefinition
- : AnyCreate 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier OptionalParenthesizedViewColumnList OptionalComment 'AS' QuerySpecification
+ : 'CREATE' 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier OptionalParenthesizedViewColumnList OptionalComment 'AS' QuerySpecification
  ;
 
 ViewDefinition_EDIT
- : AnyCreate 'VIEW' OptionalIfNotExists 'CURSOR'
+ : 'CREATE' 'VIEW' OptionalIfNotExists 'CURSOR'
    {
      if (!$3) {
        parser.suggestKeywords(['IF NOT EXISTS']);
      }
      parser.suggestDatabases({ appendDot: true });
    }
- | AnyCreate 'VIEW' OptionalIfNotExists 'CURSOR' SchemaQualifiedIdentifier OptionalParenthesizedViewColumnList OptionalComment 'AS' QuerySpecification
+ | 'CREATE' 'VIEW' OptionalIfNotExists 'CURSOR' SchemaQualifiedIdentifier OptionalParenthesizedViewColumnList OptionalComment 'AS' QuerySpecification
    {
      if (!$3) {
        parser.suggestKeywords(['IF NOT EXISTS']);
      }
    }
- | AnyCreate 'VIEW' OptionalIfNotExists_EDIT
- | AnyCreate 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedViewColumnList_EDIT OptionalComment
- | AnyCreate 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier OptionalParenthesizedViewColumnList OptionalComment 'CURSOR'
+ | 'CREATE' 'VIEW' OptionalIfNotExists_EDIT
+ | 'CREATE' 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedViewColumnList_EDIT OptionalComment
+ | 'CREATE' 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier OptionalParenthesizedViewColumnList OptionalComment 'CURSOR'
    {
      var keywords = [{value: 'AS', weight: 1 }];
      if (!$6) {
@@ -958,12 +958,12 @@ ViewDefinition_EDIT
      }
      parser.suggestKeywords(keywords);
    }
- | AnyCreate 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier OptionalParenthesizedViewColumnList OptionalComment 'AS' 'CURSOR'
+ | 'CREATE' 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier OptionalParenthesizedViewColumnList OptionalComment 'AS' 'CURSOR'
    {
      parser.suggestKeywords(['SELECT']);
    }
- | AnyCreate 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier OptionalParenthesizedViewColumnList OptionalComment 'AS' QuerySpecification_EDIT
- | AnyCreate 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier_EDIT OptionalParenthesizedViewColumnList OptionalComment 'AS' QuerySpecification
+ | 'CREATE' 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier OptionalParenthesizedViewColumnList OptionalComment 'AS' QuerySpecification_EDIT
+ | 'CREATE' 'VIEW' OptionalIfNotExists SchemaQualifiedIdentifier_EDIT OptionalParenthesizedViewColumnList OptionalComment 'AS' QuerySpecification
  ;
 
 FunctionDefinition
@@ -977,85 +977,85 @@ FunctionDefinition_EDIT
  ;
 
 GenericFunctionDefinition
- : AnyCreate 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation SymbolDefinition
+ : 'CREATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation SymbolDefinition
  ;
 
 GenericFunctionDefinition_EDIT
- : AnyCreate 'FUNCTION' OptionalIfNotExists 'CURSOR'
+ : 'CREATE' 'FUNCTION' OptionalIfNotExists 'CURSOR'
    {
      if (!$3) {
        parser.suggestKeywords(['IF NOT EXISTS']);
      }
      parser.suggestDatabases({ appendDot: true });
    }
- | AnyCreate 'FUNCTION' OptionalIfNotExists 'CURSOR' SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation SymbolDefinition
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists 'CURSOR' SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation SymbolDefinition
    {
      if (!$3) {
        parser.suggestKeywords(['IF NOT EXISTS']);
      }
    }
- | AnyCreate 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList 'CURSOR'
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList 'CURSOR'
    {
      parser.suggestKeywords(['RETURNS']);
    }
- | AnyCreate 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType 'CURSOR'
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType 'CURSOR'
    {
      parser.suggestKeywords(['LOCATION']);
    }
- | AnyCreate 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation 'CURSOR'
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation 'CURSOR'
    {
      parser.suggestKeywords(['SYMBOL']);
    }
- | AnyCreate 'FUNCTION' OptionalIfNotExists_EDIT
- | AnyCreate 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList_EDIT
- | AnyCreate 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType_EDIT
- | AnyCreate 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation_EDIT
- | AnyCreate 'FUNCTION' OptionalIfNotExists_EDIT SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation SymbolDefinition
- | AnyCreate 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList_EDIT ReturnType HdfsLocation SymbolDefinition
- | AnyCreate 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType_EDIT HdfsLocation SymbolDefinition
- | AnyCreate 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation_EDIT SymbolDefinition
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists_EDIT
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList_EDIT
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType_EDIT
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation_EDIT
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists_EDIT SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation SymbolDefinition
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList_EDIT ReturnType HdfsLocation SymbolDefinition
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType_EDIT HdfsLocation SymbolDefinition
+ | 'CREATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType HdfsLocation_EDIT SymbolDefinition
  ;
 
 AggregateFunctionDefinition
- : AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ : 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
  ;
 
 AggregateFunctionDefinition_EDIT
- : AnyCreate 'AGGREGATE' 'CURSOR'
+ : 'CREATE' 'AGGREGATE' 'CURSOR'
    {
      parser.suggestKeywords(['FUNCTION']);
    }
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists 'CURSOR' SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists 'CURSOR' SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
    {
      if (!$4) {
        parser.suggestKeywords(['IF NOT EXISTS']);
      }
    }
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists 'CURSOR'
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists 'CURSOR'
    {
      if (!$4) {
        parser.suggestKeywords(['IF NOT EXISTS']);
      }
      parser.suggestDatabases({ appendDot: true });
    }
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists_EDIT
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists_EDIT SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists_EDIT
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists_EDIT SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList_EDIT
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList_EDIT ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList_EDIT
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList_EDIT ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList 'CURSOR'
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList 'CURSOR'
    {
      parser.suggestKeywords(['RETURNS']);
    }
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    'CURSOR'
    {
      parser.suggestKeywords(['LOCATION']);
    }
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn 'CURSOR'
    {
      if (!$9) {
@@ -1064,12 +1064,12 @@ AggregateFunctionDefinition_EDIT
        parser.suggestKeywords([{value: 'UPDATE_FN', weight: 1 }]);
      }
    }
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn 'CURSOR'
    {
      parser.suggestKeywords(['MERGE_FN']);
    }
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate 'CURSOR'
    {
      if (!$12 && !$13 && !$14 && !$15 && !$16) {
@@ -1084,34 +1084,34 @@ AggregateFunctionDefinition_EDIT
        parser.suggestKeywords([{value: 'INTERMEDIATE', weight: 1 }]);
      }
    }
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType_EDIT
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType_EDIT
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation_EDIT OptionalInitFn
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn_EDIT
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn_EDIT
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn_EDIT OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn_EDIT OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn_EDIT  OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn_EDIT OptionalFinalizeFn OptionalIntermediate
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn_EDIT OptionalIntermediate
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn Intermediate_EDIT
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType_EDIT
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType_EDIT
    HdfsLocation OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation_EDIT OptionalInitFn UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn_EDIT UpdateFn MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
- | AnyCreate 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
+ | 'CREATE' 'AGGREGATE' 'FUNCTION' OptionalIfNotExists SchemaQualifiedIdentifier ParenthesizedArgumentList ReturnType
    HdfsLocation OptionalInitFn UpdateFn_EDIT MergeFn OptionalPrepareFn OptionalCloseFn OptionalSerializeFn OptionalFinalizeFn OptionalIntermediate
  ;
 
@@ -1273,12 +1273,12 @@ ViewColumnList
  ;
 
 ViewColumnList_EDIT
- : ColumnReference OptionalComment 'CURSOR'                                        --> $2
- | ColumnReference OptionalComment 'CURSOR' ',' ViewColumnList                     --> $2
- | ViewColumnList ',' ColumnReference OptionalComment 'CURSOR'                     --> $4
- | ViewColumnList ',' ColumnReference OptionalComment 'CURSOR' ',' ViewColumnList  --> $4
+ : ColumnReference OptionalComment 'CURSOR'                                        -> $2
+ | ColumnReference OptionalComment 'CURSOR' ',' ViewColumnList                     -> $2
+ | ViewColumnList ',' ColumnReference OptionalComment 'CURSOR'                     -> $4
+ | ViewColumnList ',' ColumnReference OptionalComment 'CURSOR' ',' ViewColumnList  -> $4
  ;
 
 RoleDefinition
- : AnyCreate 'ROLE' RegularIdentifier
+ : 'CREATE' 'ROLE' RegularIdentifier
  ;

+ 13 - 13
desktop/core/src/desktop/js/parse/jison/impala/sql_drop.jison

@@ -184,15 +184,15 @@ DropStatsStatement_EDIT
  ;
 
 DropTableStatement
- : 'DROP' AnyTable OptionalIfExists SchemaQualifiedTableIdentifier OptionalPurge
+ : 'DROP' 'TABLE' OptionalIfExists SchemaQualifiedTableIdentifier OptionalPurge
    {
      parser.addTablePrimary($4);
    }
  ;
 
 DropTableStatement_EDIT
- : 'DROP' AnyTable OptionalIfExists_EDIT
- | 'DROP' AnyTable OptionalIfExists 'CURSOR'
+ : 'DROP' 'TABLE' OptionalIfExists_EDIT
+ | 'DROP' 'TABLE' OptionalIfExists 'CURSOR'
    {
      if (!$3) {
        parser.suggestKeywords(['IF EXISTS']);
@@ -202,14 +202,14 @@ DropTableStatement_EDIT
        appendDot: true
      });
    }
- | 'DROP' AnyTable OptionalIfExists SchemaQualifiedTableIdentifier_EDIT OptionalPurge
+ | 'DROP' 'TABLE' OptionalIfExists SchemaQualifiedTableIdentifier_EDIT OptionalPurge
    {
      if (parser.yy.result.suggestTables) {
        parser.yy.result.suggestTables.onlyTables = true;
      }
    }
- | 'DROP' AnyTable OptionalIfExists_EDIT SchemaQualifiedTableIdentifier OptionalPurge
- | 'DROP' AnyTable OptionalIfExists SchemaQualifiedTableIdentifier OptionalPurge 'CURSOR'
+ | 'DROP' 'TABLE' OptionalIfExists_EDIT SchemaQualifiedTableIdentifier OptionalPurge
+ | 'DROP' 'TABLE' OptionalIfExists SchemaQualifiedTableIdentifier OptionalPurge 'CURSOR'
    {
      parser.addTablePrimary($4);
      if (!$5) {
@@ -260,7 +260,7 @@ DropViewStatement_EDIT
  ;
 
 TruncateTableStatement
- : 'TRUNCATE' AnyTable OptionalIfExists SchemaQualifiedTableIdentifier OptionalPartitionSpec
+ : 'TRUNCATE' 'TABLE' OptionalIfExists SchemaQualifiedTableIdentifier OptionalPartitionSpec
    {
      parser.addTablePrimary($4);
    }
@@ -271,7 +271,7 @@ TruncateTableStatement_EDIT
    {
      parser.suggestKeywords(['TABLE']);
    }
- | 'TRUNCATE' AnyTable OptionalIfExists 'CURSOR' OptionalPartitionSpec
+ | 'TRUNCATE' 'TABLE' OptionalIfExists 'CURSOR' OptionalPartitionSpec
    {
      parser.suggestTables();
      parser.suggestDatabases({ appendDot: true });
@@ -279,20 +279,20 @@ TruncateTableStatement_EDIT
        parser.suggestKeywords(['IF EXISTS']);
      }
    }
- | 'TRUNCATE' AnyTable OptionalIfExists_EDIT OptionalPartitionSpec
- | 'TRUNCATE' AnyTable OptionalIfExists SchemaQualifiedTableIdentifier_EDIT
- | 'TRUNCATE' AnyTable OptionalIfExists SchemaQualifiedTableIdentifier 'CURSOR'
+ | 'TRUNCATE' 'TABLE' OptionalIfExists_EDIT OptionalPartitionSpec
+ | 'TRUNCATE' 'TABLE' OptionalIfExists SchemaQualifiedTableIdentifier_EDIT
+ | 'TRUNCATE' 'TABLE' OptionalIfExists SchemaQualifiedTableIdentifier 'CURSOR'
    {
      parser.addTablePrimary($4);
    }
- | 'TRUNCATE' AnyTable OptionalIfExists 'CURSOR' SchemaQualifiedTableIdentifier
+ | 'TRUNCATE' 'TABLE' OptionalIfExists 'CURSOR' SchemaQualifiedTableIdentifier
    {
      parser.addTablePrimary($4);
      if (!$3) {
        parser.suggestKeywords(['IF EXISTS']);
      }
    }
- | 'TRUNCATE' AnyTable OptionalIfExists_EDIT SchemaQualifiedTableIdentifier
+ | 'TRUNCATE' 'TABLE' OptionalIfExists_EDIT SchemaQualifiedTableIdentifier
  ;
 
 DeleteStatement

+ 23 - 48
desktop/core/src/desktop/js/parse/jison/impala/sql_error.jison

@@ -93,75 +93,50 @@ OptionalSelectConditions_EDIT
  : WhereClause error 'CURSOR' OptionalGroupByClause OptionalHavingClause OptionalOrderByClause OptionalLimitClause OptionalOffsetClause
    {
      $$ = {
-       suggestKeywords: parser.getKeywordsForOptionalsLR([$4, $5, $6, $7, $8], [{ value: 'GROUP BY', weight: 8 }, { value: 'HAVING', weight: 7 }, { value: 'ORDER BY', weight: 5 }, { value: 'LIMIT', weight: 3 }, { value: 'OFFSET', weight: 2 }], [true, true, true, true, true]),
+       suggestKeywords: parser.getKeywordsForOptionalsLR([$4, $5, $6, $7, $8], [{ value: 'GROUP BY', weight: 6 }, { value: 'HAVING', weight: 5 }, { value: 'ORDER BY', weight: 4 }, { value: 'LIMIT', weight: 3 }, { value: 'OFFSET', weight: 2 }], [true, true, true, true, true]),
        cursorAtEnd: !$4 && !$5 && !$6 && !$7 && !$8
      };
    }
  | OptionalWhereClause OptionalGroupByClause HavingClause error 'CURSOR' OptionalOrderByClause OptionalLimitClause OptionalOffsetClause
    {
      $$ = {
-       suggestKeywords: parser.getKeywordsForOptionalsLR([$6, $7, $8], [{ value: 'ORDER BY', weight: 5 }, { value: 'LIMIT', weight: 3 }, { value: 'OFFSET', weight: 2 }], [true, true, true]),
+       suggestKeywords: parser.getKeywordsForOptionalsLR([$6, $7, $8], [{ value: 'ORDER BY', weight: 4 }, { value: 'LIMIT', weight: 3 }, { value: 'OFFSET', weight: 2 }], [true, true, true]),
        cursorAtEnd: !$6 && !$7 && !$8
      }
    }
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause WindowClause error 'CURSOR' OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
+ | OptionalWhereClause OptionalGroupByClause OptionalHavingClause OrderByClause error 'CURSOR' OptionalLimitClause OptionalOffsetClause
    {
      $$ = {
-       suggestKeywords: parser.getKeywordsForOptionalsLR([$7, $8, $9], [{ value: 'ORDER BY', weight: 5 }, { value: 'LIMIT', weight: 3 }, { value: 'OFFSET', weight: 2 }], [true, true, true]),
-       cursorAtEnd: !$7 && !$8 && !$9
+       suggestKeywords: parser.getKeywordsForOptionalsLR([$7, $8], [{ value: 'LIMIT', weight: 3 }, { value: 'OFFSET', weight: 2 }], [true, true]),
+       cursorAtEnd: !$7 && !$8
      }
    }
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause OptionalWindowClause OrderByClause error 'CURSOR' OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
+ | OptionalWhereClause OptionalGroupByClause OptionalHavingClause OptionalOrderByClause LimitClause error 'CURSOR' OptionalOffsetClause
    {
      $$ = {
-       suggestKeywords: parser.getKeywordsForOptionalsLR([$8, $9], [{ value: 'LIMIT', weight: 3 }, { value: 'OFFSET', weight: 2 }], [true, true]),
-       cursorAtEnd: !$8 && !$9
-     }
-   }
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause OptionalWindowClause OptionalOrderByClause ClusterOrDistributeBy error 'CURSOR' OptionalLimitClause OptionalOffsetClause
-   {
-     $$ = {
-       suggestKeywords: parser.getKeywordsForOptionalsLR([$9, $10], [{ value: 'LIMIT', weight: 3 }, { value: 'OFFSET', weight: 2 }], [true, true]),
-       cursorAtEnd: !$9 && !$10
-     }
-   }
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause OptionalWindowClause OptionalOrderByClause OptionalClusterOrDistributeBy LimitClause error 'CURSOR' OptionalOffsetClause
-   {
-     $$ = {
-       suggestKeywords: parser.getKeywordsForOptionalsLR([$10], [{ value: 'OFFSET', weight: 2 }], [true]),
-       cursorAtEnd: !$10
+       suggestKeywords: parser.getKeywordsForOptionalsLR([$8], [{ value: 'OFFSET', weight: 2 }], [true]),
+       cursorAtEnd: !$8
      }
    }
  ;
 
 OptionalSelectConditions_EDIT
- : WhereClause error GroupByClause_EDIT OptionalHavingClause OptionalWindowClause OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
- | WhereClause error OptionalGroupByClause HavingClause_EDIT OptionalWindowClause OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
- | WhereClause error OptionalGroupByClause OptionalHavingClause WindowClause_EDIT OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
- | WhereClause error OptionalGroupByClause OptionalHavingClause OptionalWindowClause OrderByClause_EDIT OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
- | WhereClause error OptionalGroupByClause OptionalHavingClause OptionalWindowClause OptionalOrderByClause ClusterOrDistributeBy_EDIT OptionalLimitClause OptionalOffsetClause
- | WhereClause error OptionalGroupByClause OptionalHavingClause OptionalWindowClause OptionalOrderByClause OptionalClusterOrDistributeBy LimitClause_EDIT OptionalOffsetClause
- | WhereClause error OptionalGroupByClause OptionalHavingClause OptionalWindowClause OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OffsetClause_EDIT
- | OptionalWhereClause GroupByClause error HavingClause_EDIT OptionalWindowClause OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
- | OptionalWhereClause GroupByClause error OptionalHavingClause WindowClause_EDIT OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
- | OptionalWhereClause GroupByClause error OptionalHavingClause OptionalWindowClause OrderByClause_EDIT OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
- | OptionalWhereClause GroupByClause error OptionalHavingClause OptionalWindowClause OptionalOrderByClause ClusterOrDistributeBy_EDIT OptionalLimitClause OptionalOffsetClause
- | OptionalWhereClause GroupByClause error OptionalHavingClause OptionalWindowClause OptionalOrderByClause OptionalClusterOrDistributeBy LimitClause_EDIT OptionalOffsetClause
- | OptionalWhereClause GroupByClause error OptionalHavingClause OptionalWindowClause OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OffsetClause_EDIT
- | OptionalWhereClause OptionalGroupByClause HavingClause error WindowClause_EDIT OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
- | OptionalWhereClause OptionalGroupByClause HavingClause error OptionalWindowClause OrderByClause_EDIT OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
- | OptionalWhereClause OptionalGroupByClause HavingClause error OptionalWindowClause OptionalOrderByClause ClusterOrDistributeBy_EDIT OptionalLimitClause OptionalOffsetClause
- | OptionalWhereClause OptionalGroupByClause HavingClause error OptionalWindowClause OptionalOrderByClause OptionalClusterOrDistributeBy LimitClause_EDIT OptionalOffsetClause
- | OptionalWhereClause OptionalGroupByClause HavingClause error OptionalWindowClause OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OffsetClause_EDIT
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause WindowClause error OrderByClause_EDIT OptionalClusterOrDistributeBy OptionalLimitClause OptionalOffsetClause
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause WindowClause error OptionalOrderByClause ClusterOrDistributeBy_EDIT OptionalLimitClause OptionalOffsetClause
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause WindowClause error OptionalOrderByClause OptionalClusterOrDistributeBy LimitClause_EDIT OptionalOffsetClause
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause WindowClause error OptionalOrderByClause OptionalClusterOrDistributeBy OptionalLimitClause OffsetClause_EDIT
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause OptionalWindowClause OrderByClause error ClusterOrDistributeBy_EDIT OptionalLimitClause OptionalOffsetClause
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause OptionalWindowClause OrderByClause error OptionalClusterOrDistributeBy LimitClause_EDIT OptionalOffsetClause
- | OptionalWhereClause OptionalGroupByClause OptionalHavingClause OptionalWindowClause OrderByClause error OptionalClusterOrDistributeBy OptionalLimitClause OffsetClause_EDIT
+ : WhereClause error GroupByClause_EDIT OptionalHavingClause OptionalOrderByClause OptionalLimitClause OptionalOffsetClause
+ | WhereClause error OptionalGroupByClause HavingClause_EDIT OptionalOrderByClause OptionalLimitClause OptionalOffsetClause
+ | WhereClause error OptionalGroupByClause OptionalHavingClause OrderByClause_EDIT OptionalLimitClause OptionalOffsetClause
+ | WhereClause error OptionalGroupByClause OptionalHavingClause OptionalOrderByClause LimitClause_EDIT OptionalOffsetClause
+ | WhereClause error OptionalGroupByClause OptionalHavingClause OptionalOrderByClause OptionalLimitClause OffsetClause_EDIT
+ | OptionalWhereClause GroupByClause error HavingClause_EDIT OptionalOrderByClause OptionalLimitClause OptionalOffsetClause
+ | OptionalWhereClause GroupByClause error OptionalHavingClause OrderByClause_EDIT OptionalLimitClause OptionalOffsetClause
+ | OptionalWhereClause GroupByClause error OptionalHavingClause OptionalOrderByClause LimitClause_EDIT OptionalOffsetClause
+ | OptionalWhereClause GroupByClause error OptionalHavingClause OptionalOrderByClause OptionalLimitClause OffsetClause_EDIT
+ | OptionalWhereClause OptionalGroupByClause HavingClause error OrderByClause_EDIT OptionalLimitClause OptionalOffsetClause
+ | OptionalWhereClause OptionalGroupByClause HavingClause error OptionalOrderByClause LimitClause_EDIT OptionalOffsetClause
+ | OptionalWhereClause OptionalGroupByClause HavingClause error OptionalOrderByClause OptionalLimitClause OffsetClause_EDIT
+ | OptionalWhereClause OptionalGroupByClause OptionalHavingClause OrderByClause error LimitClause_EDIT OptionalOffsetClause
+ | OptionalWhereClause OptionalGroupByClause OptionalHavingClause OrderByClause error OptionalLimitClause OffsetClause_EDIT
  ;
 
 DatabaseDefinition_EDIT
- : AnyCreate DatabaseOrSchema OptionalIfNotExists RegularIdentifier DatabaseDefinitionOptionals_EDIT error
+ : 'CREATE' DatabaseOrSchema OptionalIfNotExists RegularIdentifier DatabaseDefinitionOptionals_EDIT error
  ;

+ 2 - 2
desktop/core/src/desktop/js/parse/jison/impala/sql_grant.jison

@@ -114,7 +114,7 @@ ObjectSpecification_EDIT
 PrivilegeType
  : 'ALL'
  | 'ALTER'
- | 'CREATE'  --> { isCreate: true }
+ | 'CREATE'  -> { isCreate: true }
  | 'DROP'
  | 'INSERT'
  | 'REFRESH'
@@ -164,7 +164,7 @@ OptionalWithGrantOption
  ;
 
 WithGrantOption_EDIT
- : AnyWith 'CURSOR'
+ : 'WITH' 'CURSOR'
    {
      parser.suggestKeywords(['GRANT OPTION']);
    }

+ 1 - 1
desktop/core/src/desktop/js/parse/jison/impala/sql_insert.jison

@@ -283,7 +283,7 @@ ParenthesizedValueExpressionList_EDIT
  ;
 
 UpdateDeleteOrInsert
- : 'UPDATE' 'SET' SetClauseList              --> { isUpdate: true }
+ : 'UPDATE' 'SET' SetClauseList              -> { isUpdate: true }
  ;
 
 UpdateDeleteOrInsert_EDIT

+ 6 - 6
desktop/core/src/desktop/js/parse/jison/impala/sql_load.jison

@@ -23,7 +23,7 @@ DataManipulation_EDIT
  ;
 
 LoadStatement
- : 'LOAD' 'DATA' 'INPATH' HdfsPath OptionalOverwrite 'INTO' AnyTable SchemaQualifiedTableIdentifier OptionalPartitionSpec
+ : 'LOAD' 'DATA' 'INPATH' HdfsPath OptionalOverwrite 'INTO' 'TABLE' SchemaQualifiedTableIdentifier OptionalPartitionSpec
    {
      parser.addTablePrimary($8);
    }
@@ -51,24 +51,24 @@ LoadStatement_EDIT
    {
      parser.suggestKeywords([ 'TABLE' ]);
    }
- | 'LOAD' 'DATA' 'INPATH' HdfsPath OptionalOverwrite 'INTO' AnyTable 'CURSOR'
+ | 'LOAD' 'DATA' 'INPATH' HdfsPath OptionalOverwrite 'INTO' 'TABLE' 'CURSOR'
    {
      parser.suggestTables();
      parser.suggestDatabases({ appendDot: true });
    }
- | 'LOAD' 'DATA' 'INPATH' HdfsPath OptionalOverwrite 'INTO' AnyTable SchemaQualifiedTableIdentifier_EDIT OptionalPartitionSpec
- | 'LOAD' 'DATA' 'INPATH' HdfsPath OptionalOverwrite 'INTO' AnyTable SchemaQualifiedTableIdentifier OptionalPartitionSpec 'CURSOR'
+ | 'LOAD' 'DATA' 'INPATH' HdfsPath OptionalOverwrite 'INTO' 'TABLE' SchemaQualifiedTableIdentifier_EDIT OptionalPartitionSpec
+ | 'LOAD' 'DATA' 'INPATH' HdfsPath OptionalOverwrite 'INTO' 'TABLE' SchemaQualifiedTableIdentifier OptionalPartitionSpec 'CURSOR'
    {
      parser.addTablePrimary($8);
      if (!$9) {
        parser.suggestKeywords(['PARTITION']);
      }
    }
- | 'LOAD' 'DATA' 'INPATH' HdfsPath OptionalOverwrite 'INTO' AnyTable SchemaQualifiedTableIdentifier OptionalPartitionSpec_EDIT
+ | 'LOAD' 'DATA' 'INPATH' HdfsPath OptionalOverwrite 'INTO' 'TABLE' SchemaQualifiedTableIdentifier OptionalPartitionSpec_EDIT
    {
      parser.addTablePrimary($8);
    }
- | 'LOAD' 'DATA' 'INPATH' HdfsPath_EDIT OptionalOverwrite 'INTO' AnyTable SchemaQualifiedTableIdentifier OptionalPartitionSpec
+ | 'LOAD' 'DATA' 'INPATH' HdfsPath_EDIT OptionalOverwrite 'INTO' 'TABLE' SchemaQualifiedTableIdentifier OptionalPartitionSpec
    {
      parser.addTablePrimary($8);
    }

File diff suppressed because it is too large
+ 322 - 622
desktop/core/src/desktop/js/parse/jison/impala/sql_main.jison


+ 4 - 24
desktop/core/src/desktop/js/parse/jison/impala/sql_set.jison

@@ -15,21 +15,14 @@
 // limitations under the License.
 
 DataDefinition
- : SetRoleStatement
- | SetSpecification
+ : SetSpecification
  ;
 
 DataDefinition_EDIT
- : SetRoleStatement_EDIT
- | 'SET' 'CURSOR'
+ : 'SET' 'CURSOR'
    {
      parser.suggestSetOptions();
-     if (parser.isHive()) {
-       parser.suggestKeywords(['ROLE']);
-     }
-     if (parser.isImpala()) {
-       parser.suggestKeywords(['ALL']);
-     }
+     parser.suggestKeywords(['ALL']);
    }
  ;
 
@@ -40,7 +33,7 @@ SetSpecification
 
 SetOption
  : RegularIdentifier
- | SetOption AnyDot RegularIdentifier
+ | SetOption '.' RegularIdentifier
  ;
 
 SetValue
@@ -52,16 +45,3 @@ SetValue
  | 'FALSE'
  | 'NULL'
  ;
-
-SetRoleStatement
- : 'SET' '<hive>ROLE' RegularIdentifier
- | 'SET' '<hive>ROLE' '<hive>ALL'
- | 'SET' '<hive>ROLE' '<hive>NONE'
- ;
-
-SetRoleStatement_EDIT
- : 'SET' '<hive>ROLE' 'CURSOR'
-   {
-     parser.suggestKeywords(['ALL', 'NONE']);
-   }
- ;

+ 80 - 449
desktop/core/src/desktop/js/parse/jison/impala/sql_show.jison

@@ -24,171 +24,83 @@ DataDefinition_EDIT
 
 ShowStatement
  : ShowColumnStatsStatement
- | ShowColumnsStatement
- | ShowCompactionsStatement
- | ShowConfStatement
  | ShowCreateTableStatement
  | ShowCurrentRolesStatement
  | ShowDatabasesStatement
  | ShowFilesStatement
  | ShowFunctionsStatement
  | ShowGrantStatement
- | ShowIndexStatement
- | ShowLocksStatement
  | ShowPartitionsStatement
  | ShowRoleStatement
  | ShowRolesStatement
- | ShowTableStatement
+ | ShowTableStatsStatement
  | ShowTablesStatement
- | ShowTblPropertiesStatement
- | ShowTransactionsStatement
- | ShowViewsStatement
- ;
-
-AnyShow
- : 'SHOW'
- | '<hive>SHOW'
  ;
 
 ShowStatement_EDIT
- : AnyShow 'CURSOR'
+ : 'SHOW' 'CURSOR'
    {
-     if (parser.isHive()) {
-       parser.suggestKeywords(['COLUMNS', 'COMPACTIONS', 'CONF', 'CREATE TABLE', 'CURRENT ROLES', 'DATABASES', 'FORMATTED', 'FUNCTIONS', 'GRANT', 'INDEX', 'INDEXES', 'LOCKS', 'PARTITIONS', 'PRINCIPALS', 'ROLE GRANT', 'ROLES', 'SCHEMAS', 'TABLE EXTENDED', 'TABLES', 'TBLPROPERTIES', 'TRANSACTIONS', 'VIEWS']);
-     } else if (parser.isImpala()) {
-       parser.suggestKeywords(['AGGREGATE FUNCTIONS', 'ANALYTIC FUNCTIONS', 'COLUMN STATS', 'CREATE TABLE', 'CURRENT ROLES', 'CREATE VIEW', 'DATABASES', 'FILES IN', 'FUNCTIONS', 'GRANT ROLE', 'GRANT USER', 'PARTITIONS', 'RANGE PARTITIONS', 'ROLE GRANT GROUP', 'ROLES', 'SCHEMAS', 'TABLE STATS', 'TABLES']);
-     } else {
-       parser.suggestKeywords(['COLUMNS', 'DATABASES', 'TABLES']);
-     }
+     parser.suggestKeywords(['AGGREGATE FUNCTIONS', 'ANALYTIC FUNCTIONS', 'COLUMN STATS', 'CREATE TABLE', 'CURRENT ROLES', 'CREATE VIEW', 'DATABASES', 'FILES IN', 'FUNCTIONS', 'GRANT ROLE', 'GRANT USER', 'PARTITIONS', 'RANGE PARTITIONS', 'ROLE GRANT GROUP', 'ROLES', 'SCHEMAS', 'TABLE STATS', 'TABLES']);
    }
- | AnyShow 'CURSOR' RegularOrBackTickedSchemaQualifiedName
+ | 'SHOW' 'CURSOR' RegularOrBackTickedSchemaQualifiedName
    {
-     // ROLES is considered a non-reserved keywords so we can't match it in ShowCurrentRolesStatement_EDIT
-     if (!parser.isImpala() && $3.identifierChain && $3.identifierChain.length === 1 && $3.identifierChain[0].name.toLowerCase() === 'roles') {
-       parser.suggestKeywords(['CURRENT']);
-       parser.yy.locations.pop();
-     } else {
-       parser.addTablePrimary($3);
-       if (parser.isImpala()) {
-         parser.suggestKeywords(['COLUMN STATS', 'CREATE TABLE', 'CREATE VIEW', 'FILES IN', 'PARTITIONS', 'RANGE PARTITIONS', 'TABLE STATS']);
-       }
-     }
+     parser.addTablePrimary($3);
+     parser.suggestKeywords(['COLUMN STATS', 'CREATE TABLE', 'CREATE VIEW', 'FILES IN', 'PARTITIONS', 'RANGE PARTITIONS', 'TABLE STATS']);
    }
- | AnyShow 'CURSOR' LIKE SingleQuotedValue
+ | 'SHOW' 'CURSOR' 'LIKE' SingleQuotedValue
    {
-     if (parser.isImpala()) {
-       parser.suggestKeywords(['AGGREGATE FUNCTIONS', 'ANALYTIC FUNCTIONS', 'DATABASES', 'FUNCTIONS', 'SCHEMAS', 'TABLES']);
-     } else if (parser.isHive()) {
-       parser.suggestKeywords(['DATABASES', 'SCHEMAS', 'TABLE EXTENDED']);
-     }
+     parser.suggestKeywords(['AGGREGATE FUNCTIONS', 'ANALYTIC FUNCTIONS', 'DATABASES', 'FUNCTIONS', 'SCHEMAS', 'TABLES']);
    }
  | ShowColumnStatsStatement_EDIT
- | ShowColumnsStatement_EDIT
  | ShowCreateTableStatement_EDIT
  | ShowCurrentRolesStatement_EDIT
  | ShowDatabasesStatement_EDIT
  | ShowFilesStatement_EDIT
  | ShowFunctionsStatement_EDIT
  | ShowGrantStatement_EDIT
- | ShowIndexStatement_EDIT
- | ShowLocksStatement_EDIT
  | ShowPartitionsStatement_EDIT
  | ShowRoleStatement_EDIT
- | ShowTableStatement_EDIT
+ | ShowTableStatsStatement_EDIT
  | ShowTablesStatement_EDIT
- | ShowTblPropertiesStatement_EDIT
- | ShowViewsStatement_EDIT
  ;
 
 ShowColumnStatsStatement
- : AnyShow '<impala>COLUMN' '<impala>STATS' RegularOrBackTickedSchemaQualifiedName
+ : 'SHOW' 'COLUMN' 'STATS' RegularOrBackTickedSchemaQualifiedName
    {
      parser.addTablePrimary($4);
    }
  ;
 
 ShowColumnStatsStatement_EDIT
- : AnyShow '<impala>COLUMN' 'CURSOR'
+ : 'SHOW' 'COLUMN' 'CURSOR'
    {
      parser.suggestKeywords(['STATS']);
    }
- | AnyShow '<impala>COLUMN' '<impala>STATS' 'CURSOR'
+ | 'SHOW' 'COLUMN' 'STATS' 'CURSOR'
    {
      parser.suggestTables();
      parser.suggestDatabases({
        appendDot: true
      });
    }
- | AnyShow '<impala>COLUMN' '<impala>STATS' RegularOrBackTickedSchemaQualifiedName_EDIT
- ;
-
-ShowColumnsStatement
- : AnyShow '<hive>COLUMNS' AnyFromOrIn RegularOrBacktickedIdentifier
- | AnyShow '<hive>COLUMNS' AnyFromOrIn RegularOrBacktickedIdentifier AnyFromOrIn RegularOrBacktickedIdentifier
- ;
-
-ShowColumnsStatement_EDIT
- : AnyShow '<hive>COLUMNS' 'CURSOR'
-   {
-     parser.suggestKeywords(['FROM', 'IN']);
-   }
- | AnyShow '<hive>COLUMNS' 'CURSOR' RegularOrBacktickedIdentifier
-   {
-     parser.suggestKeywords(['FROM', 'IN']);
-   }
- | AnyShow '<hive>COLUMNS' AnyFromOrIn 'CURSOR'
-   {
-     parser.suggestTables();
-   }
- | AnyShow '<hive>COLUMNS' AnyFromOrIn 'CURSOR' AnyFromOrIn
-   {
-     parser.suggestTables();
-   }
- | AnyShow '<hive>COLUMNS' AnyFromOrIn 'CURSOR' AnyFromOrIn RegularOrBacktickedIdentifier
-   {
-     parser.suggestTables();
-   }
- | AnyShow '<hive>COLUMNS' AnyFromOrIn RegularOrBacktickedIdentifier 'CURSOR'
-   {
-     parser.suggestKeywords(['FROM', 'IN']);
-   }
- | AnyShow '<hive>COLUMNS' AnyFromOrIn RegularOrBacktickedIdentifier 'CURSOR' RegularOrBacktickedIdentifier
-   {
-     parser.suggestKeywords(['FROM', 'IN']);
-   }
- | AnyShow '<hive>COLUMNS' AnyFromOrIn RegularOrBacktickedIdentifier AnyFromOrIn 'CURSOR'
-   {
-     parser.suggestDatabases();
-   }
- ;
-
-ShowCompactionsStatement
- : AnyShow '<hive>COMPACTIONS'
- ;
-
-ShowConfStatement
- : AnyShow '<hive>CONF' ConfigurationName
+ | 'SHOW' 'COLUMN' 'STATS' RegularOrBackTickedSchemaQualifiedName_EDIT
  ;
 
 ShowCreateTableStatement
- : AnyShow HiveOrImpalaCreate AnyTableOrView RegularOrBackTickedSchemaQualifiedName
+ : 'SHOW' 'CREATE' AnyTableOrView RegularOrBackTickedSchemaQualifiedName
    {
      parser.addTablePrimary($4);
    }
  ;
 
 ShowCreateTableStatement_EDIT
- : AnyShow HiveOrImpalaCreate 'CURSOR'
+ : 'SHOW' 'CREATE' 'CURSOR'
    {
-     if (parser.isImpala()) {
-       parser.suggestKeywords(['TABLE', 'VIEW']);
-     } else {
-       parser.suggestKeywords(['TABLE']);
-     }
+     parser.suggestKeywords(['TABLE', 'VIEW']);
    }
- | AnyShow HiveOrImpalaCreate AnyTableOrView 'CURSOR'
+ | 'SHOW' 'CREATE' AnyTableOrView 'CURSOR'
    {
-     if ($3.isView && parser.isImpala()) {
+     if ($3.isView) {
        parser.suggestTables({ onlyViews: true });
      } else {
        parser.suggestTables();
@@ -197,89 +109,80 @@ ShowCreateTableStatement_EDIT
        appendDot: true
      });
    }
- | AnyShow HiveOrImpalaCreate AnyTableOrView RegularOrBackTickedSchemaQualifiedName_EDIT
+ | 'SHOW' 'CREATE' AnyTableOrView RegularOrBackTickedSchemaQualifiedName_EDIT
    {
      if (parser.yy.result.suggestTables && $3.isView) {
        parser.yy.result.suggestTables.onlyViews = true;
      }
    }
- | AnyShow HiveOrImpalaCreate 'CURSOR' RegularOrBackTickedSchemaQualifiedName
+ | 'SHOW' 'CREATE' 'CURSOR' RegularOrBackTickedSchemaQualifiedName
    {
      parser.addTablePrimary($4);
-     if (parser.isImpala()) {
-       parser.suggestKeywords(['TABLE', 'VIEW']);
-     } else {
-       parser.suggestKeywords(['TABLE']);
-     }
+     parser.suggestKeywords(['TABLE', 'VIEW']);
    }
  ;
 
 AnyTableOrView
- : AnyTable
+ : 'TABLE'
  | 'VIEW'   --> { isView: true }
  ;
 
 ShowCurrentRolesStatement
- : AnyShow '<hive>CURRENT' '<hive>ROLES'
- | AnyShow '<impala>CURRENT' '<impala>ROLES'
+ : 'SHOW' 'CURRENT' 'ROLES'
  ;
 
 ShowCurrentRolesStatement_EDIT
- : AnyShow '<hive>CURRENT' 'CURSOR'
+ : 'SHOW' 'CURRENT' 'CURSOR'
    {
      parser.suggestKeywords([ 'ROLES' ]);
    }
- | AnyShow '<impala>CURRENT' 'CURSOR'
-   {
-     parser.suggestKeywords([ 'ROLES' ]);
-   }
- | AnyShow 'CURSOR' '<impala>ROLES'
+ | 'SHOW' 'CURSOR' 'ROLES'
    {
      parser.suggestKeywords([ 'CURRENT' ]);
    }
  ;
 
 ShowDatabasesStatement
- : AnyShow HiveOrImpalaDatabasesOrSchemas 'LIKE' SingleQuotedValue
- | AnyShow '<impala>DATABASES' SingleQuotedValue
+ : 'SHOW' DatabasesOrSchemas 'LIKE' SingleQuotedValue
+ | 'SHOW' 'DATABASES' SingleQuotedValue
  ;
 
 ShowDatabasesStatement_EDIT
- : AnyShow HiveOrImpalaDatabasesOrSchemas 'CURSOR'
+ : 'SHOW' DatabasesOrSchemas 'CURSOR'
    {
      parser.suggestKeywords(['LIKE']);
    }
  ;
 
 ShowFilesStatement
- : AnyShow '<impala>FILES' 'IN' RegularOrBackTickedSchemaQualifiedName OptionalPartitionSpec
+ : 'SHOW' 'FILES' 'IN' RegularOrBackTickedSchemaQualifiedName OptionalPartitionSpec
    {
      parser.addTablePrimary($4);
    }
  ;
 
 ShowFilesStatement_EDIT
- : AnyShow '<impala>FILES' 'CURSOR'
+ : 'SHOW' 'FILES' 'CURSOR'
    {
      parser.suggestKeywords(['IN']);
    }
- | AnyShow '<impala>FILES' 'IN' 'CURSOR'
+ | 'SHOW' 'FILES' 'IN' 'CURSOR'
    {
      parser.suggestTables();
      parser.suggestDatabases({
        appendDot: true
      });
    }
- | AnyShow '<impala>FILES' 'IN' RegularOrBackTickedSchemaQualifiedName_EDIT OptionalPartitionSpec
- | AnyShow '<impala>FILES' 'IN' RegularOrBackTickedSchemaQualifiedName OptionalPartitionSpec 'CURSOR'
+ | 'SHOW' 'FILES' 'IN' RegularOrBackTickedSchemaQualifiedName_EDIT OptionalPartitionSpec
+ | 'SHOW' 'FILES' 'IN' RegularOrBackTickedSchemaQualifiedName OptionalPartitionSpec 'CURSOR'
    {
      parser.addTablePrimary($4);
      if (!$5) {
        parser.suggestKeywords(['PARTITION']);
      }
    }
- | AnyShow '<impala>FILES' 'IN' RegularOrBackTickedSchemaQualifiedName OptionalPartitionSpec_EDIT
- | AnyShow '<impala>FILES' 'CURSOR' RegularOrBackTickedSchemaQualifiedName OptionalPartitionSpec
+ | 'SHOW' 'FILES' 'IN' RegularOrBackTickedSchemaQualifiedName OptionalPartitionSpec_EDIT
+ | 'SHOW' 'FILES' 'CURSOR' RegularOrBackTickedSchemaQualifiedName OptionalPartitionSpec
    {
      parser.addTablePrimary($4);
      parser.suggestKeywords(['IN']);
@@ -287,22 +190,20 @@ ShowFilesStatement_EDIT
  ;
 
 ShowFunctionsStatement
- : AnyShow '<hive>FUNCTIONS'
- | AnyShow '<hive>FUNCTIONS' DoubleQuotedValue
- | AnyShow OptionalAggregateOrAnalytic '<impala>FUNCTIONS' OptionalInDatabase
- | AnyShow OptionalAggregateOrAnalytic '<impala>FUNCTIONS' OptionalInDatabase 'LIKE' QuotedValue
+ : 'SHOW' OptionalAggregateOrAnalytic 'FUNCTIONS' OptionalInDatabase
+ | 'SHOW' OptionalAggregateOrAnalytic 'FUNCTIONS' OptionalInDatabase 'LIKE' QuotedValue
  ;
 
 ShowFunctionsStatement_EDIT
- : AnyShow AggregateOrAnalytic 'CURSOR'
+ : 'SHOW' AggregateOrAnalytic 'CURSOR'
    {
      parser.suggestKeywords(['FUNCTIONS']);
    }
- | AnyShow 'CURSOR' '<impala>FUNCTIONS' OptionalInDatabase
+ | 'SHOW' 'CURSOR' 'FUNCTIONS' OptionalInDatabase
    {
      parser.suggestKeywords(['AGGREGATE', 'ANALYTICAL']);
    }
- | AnyShow OptionalAggregateOrAnalytic '<impala>FUNCTIONS' OptionalInDatabase 'CURSOR'
+ | 'SHOW' OptionalAggregateOrAnalytic 'FUNCTIONS' OptionalInDatabase 'CURSOR'
    {
      if (!$4) {
        parser.suggestKeywords(['IN', 'LIKE']);
@@ -310,15 +211,15 @@ ShowFunctionsStatement_EDIT
        parser.suggestKeywords(['LIKE']);
      }
    }
- | AnyShow AggregateOrAnalytic 'CURSOR' OptionalInDatabase 'LIKE' QuotedValue
+ | 'SHOW' AggregateOrAnalytic 'CURSOR' OptionalInDatabase 'LIKE' QuotedValue
    {
      parser.suggestKeywords(['FUNCTIONS']);
    }
- | AnyShow 'CURSOR' '<impala>FUNCTIONS' OptionalInDatabase 'LIKE' QuotedValue
+ | 'SHOW' 'CURSOR' 'FUNCTIONS' OptionalInDatabase 'LIKE' QuotedValue
    {
      parser.suggestKeywords(['AGGREGATE', 'ANALYTICAL']);
    }
- | AnyShow OptionalAggregateOrAnalytic '<impala>FUNCTIONS' OptionalInDatabase 'CURSOR' QuotedValue
+ | 'SHOW' OptionalAggregateOrAnalytic 'FUNCTIONS' OptionalInDatabase 'CURSOR' QuotedValue
    {
      if (!$4) {
        parser.suggestKeywords([{ value: 'IN', weight: 2 }, { value: 'LIKE', weight: 1 }]);
@@ -329,67 +230,43 @@ ShowFunctionsStatement_EDIT
  ;
 
 ShowGrantStatement
- : AnyShow '<hive>GRANT' OptionalPrincipalName
- | AnyShow '<hive>GRANT' OptionalPrincipalName 'ON' '<hive>ALL'
- | AnyShow '<hive>GRANT' OptionalPrincipalName 'ON' SchemaQualifiedTableIdentifier
- | AnyShow '<hive>GRANT' OptionalPrincipalName 'ON' AnyTable SchemaQualifiedTableIdentifier
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'DATABASE' RegularOrBacktickedIdentifier
+ : 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier
+ | 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'DATABASE' RegularOrBacktickedIdentifier
    {
      parser.addDatabaseLocation(@7, [ { name: $7 } ]);
    }
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' '<impala>SERVER'
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' '<impala>TABLE' SchemaQualifiedTableIdentifier
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' '<impala>URI' RegularOrBacktickedIdentifier
+ | 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'SERVER'
+ | 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'TABLE' SchemaQualifiedTableIdentifier
+ | 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'URI' RegularOrBacktickedIdentifier
  ;
 
 ShowGrantStatement_EDIT
- : AnyShow '<hive>GRANT' OptionalPrincipalName_EDIT
-   {
-     parser.suggestKeywords(['ON']);
-   }
- | AnyShow '<hive>GRANT' OptionalPrincipalName_EDIT 'ON' '<hive>ALL'
- | AnyShow '<hive>GRANT' OptionalPrincipalName 'ON' 'CURSOR'
-   {
-     parser.suggestKeywords(['ALL', 'TABLE']);
-     parser.suggestTables();
-   }
- | AnyShow '<hive>GRANT' OptionalPrincipalName 'ON' SchemaQualifiedTableIdentifier_EDIT
- | AnyShow  '<hive>GRANT' OptionalPrincipalName 'ON' AnyTable 'CURSOR'
-   {
-     parser.suggestTables();
-   }
- | AnyShow '<hive>GRANT' OptionalPrincipalName 'ON' 'CURSOR' SchemaQualifiedTableIdentifier
-   {
-     parser.suggestKeywords(['TABLE']);
-   }
- | AnyShow '<hive>GRANT' OptionalPrincipalName 'ON' 'CURSOR' SchemaQualifiedTableIdentifier_EDIT
- | AnyShow '<impala>GRANT' 'CURSOR'
+ : 'SHOW' 'GRANT' 'CURSOR'
    {
      parser.suggestKeywords(['ROLE', 'USER']);
    }
- | AnyShow '<impala>GRANT' RoleOrUser 'CURSOR'
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier 'CURSOR'
+ | 'SHOW' 'GRANT' RoleOrUser 'CURSOR'
+ | 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier 'CURSOR'
    {
      parser.suggestKeywords(['ON DATABASE', 'ON SERVER', 'ON TABLE', 'ON URI']);
    }
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'CURSOR'
+ | 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'CURSOR'
    {
      parser.suggestKeywords(['DATABASE', 'SERVER', 'TABLE', 'URI']);
    }
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'DATABASE' 'CURSOR'
+ | 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'DATABASE' 'CURSOR'
    {
      parser.suggestDatabases();
    }
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' '<impala>TABLE' 'CURSOR'
+ | 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'TABLE' 'CURSOR'
    {
      parser.suggestDatabases({
        appendDot: true
      });
      parser.suggestTables();
    }
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' '<impala>TABLE' SchemaQualifiedTableIdentifier_EDIT
- | AnyShow '<impala>GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' '<impala>URI' 'CURSOR'
+ | 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'TABLE' SchemaQualifiedTableIdentifier_EDIT
+ | 'SHOW' 'GRANT' RoleOrUser RegularOrBacktickedIdentifier 'ON' 'URI' 'CURSOR'
  ;
 
 OptionalPrincipalName
@@ -402,262 +279,89 @@ OptionalPrincipalName_EDIT
  | RegularIdentifier 'CURSOR'
  ;
 
-ShowIndexStatement
- : AnyShow OptionallyFormattedIndex 'ON' RegularOrBacktickedIdentifier
- | AnyShow OptionallyFormattedIndex 'ON' RegularOrBacktickedIdentifier AnyFromOrIn RegularOrBacktickedIdentifier
- ;
-
-ShowIndexStatement_EDIT
- : AnyShow OptionallyFormattedIndex
- | AnyShow OptionallyFormattedIndex_EDIT
- | AnyShow OptionallyFormattedIndex_EDIT 'ON' RegularOrBacktickedIdentifier
- | AnyShow OptionallyFormattedIndex_EDIT 'ON' RegularOrBacktickedIdentifier AnyFromOrIn RegularOrBacktickedIdentifier
- | AnyShow OptionallyFormattedIndex 'CURSOR'
-   {
-     parser.suggestKeywords(['ON']);
-   }
- | AnyShow OptionallyFormattedIndex 'ON' 'CURSOR'
-   {
-     parser.suggestTables();
-   }
- | AnyShow OptionallyFormattedIndex 'CURSOR' RegularOrBacktickedIdentifier
-   {
-     parser.suggestKeywords(['ON']);
-   }
- | AnyShow OptionallyFormattedIndex 'ON' RegularOrBacktickedIdentifier 'CURSOR'
-   {
-     parser.suggestKeywords(['FROM', 'IN']);
-   }
- | AnyShow OptionallyFormattedIndex 'ON' RegularOrBacktickedIdentifier 'CURSOR' RegularOrBacktickedIdentifier
-   {
-     parser.suggestKeywords(['FROM', 'IN']);
-   }
- | AnyShow OptionallyFormattedIndex 'ON' RegularOrBacktickedIdentifier AnyFromOrIn 'CURSOR'
-   {
-     parser.suggestDatabases();
-   }
- | AnyShow OptionallyFormattedIndex 'ON' 'CURSOR' AnyFromOrIn RegularOrBacktickedIdentifier
-   {
-     parser.suggestTables({identifierChain: [{name: $6}]});
-   }
- ;
-
-ShowLocksStatement
- : AnyShow '<hive>LOCKS' RegularOrBackTickedSchemaQualifiedName
-   {
-     parser.addTablePrimary($3);
-   }
- | AnyShow '<hive>LOCKS' RegularOrBackTickedSchemaQualifiedName '<hive>EXTENDED'
-   {
-     parser.addTablePrimary($3);
-   }
- | AnyShow '<hive>LOCKS' RegularOrBackTickedSchemaQualifiedName PartitionSpec
-   {
-     parser.addTablePrimary($3);
-   }
- | AnyShow '<hive>LOCKS' RegularOrBackTickedSchemaQualifiedName PartitionSpec '<hive>EXTENDED'
-   {
-     parser.addTablePrimary($3);
-   }
- | AnyShow '<hive>LOCKS' DatabaseOrSchema RegularOrBacktickedIdentifier
- ;
-
-ShowLocksStatement_EDIT
- : AnyShow '<hive>LOCKS' 'CURSOR'
-   {
-     parser.suggestTables();
-     parser.suggestDatabases({
-       appendDot: true
-     });
-     parser.suggestKeywords(['DATABASE', 'SCHEMA']);
-   }
- | AnyShow '<hive>LOCKS' RegularOrBackTickedSchemaQualifiedName_EDIT
- | AnyShow '<hive>LOCKS' RegularOrBackTickedSchemaQualifiedName 'CURSOR'
-    {
-      parser.addTablePrimary($3);
-      parser.suggestKeywords(['EXTENDED', 'PARTITION']);
-    }
- | AnyShow '<hive>LOCKS' RegularOrBackTickedSchemaQualifiedName_EDIT '<hive>EXTENDED'
- | AnyShow '<hive>LOCKS' RegularOrBackTickedSchemaQualifiedName_EDIT PartitionSpec
- | AnyShow '<hive>LOCKS' RegularOrBackTickedSchemaQualifiedName PartitionSpec 'CURSOR'
-   {
-     parser.addTablePrimary($3);
-     parser.suggestKeywords(['EXTENDED']);
-   }
- | AnyShow '<hive>LOCKS' RegularOrBackTickedSchemaQualifiedName_EDIT PartitionSpec '<hive>EXTENDED'
- | AnyShow '<hive>LOCKS' DatabaseOrSchema 'CURSOR'
-   {
-     parser.suggestDatabases();
-   }
- ;
-
 ShowPartitionsStatement
- : AnyShow '<hive>PARTITIONS' RegularOrBackTickedSchemaQualifiedName
+ : 'SHOW' 'PARTITIONS' RegularOrBackTickedSchemaQualifiedName
    {
      parser.addTablePrimary($3);
    }
- | AnyShow '<hive>PARTITIONS' RegularOrBackTickedSchemaQualifiedName PartitionSpec
-   {
-     parser.addTablePrimary($3);
-   }
- | AnyShow '<impala>PARTITIONS' RegularOrBackTickedSchemaQualifiedName
-   {
-     parser.addTablePrimary($3);
-   }
- | AnyShow '<impala>RANGE' '<impala>PARTITIONS' RegularOrBackTickedSchemaQualifiedName
+ | 'SHOW' 'RANGE' 'PARTITIONS' RegularOrBackTickedSchemaQualifiedName
    {
      parser.addTablePrimary($3);
    }
  ;
 
 ShowPartitionsStatement_EDIT
- : AnyShow '<hive>PARTITIONS' 'CURSOR'
+ : 'SHOW' 'PARTITIONS' 'CURSOR'
    {
      parser.suggestTables();
      parser.suggestDatabases({
        appendDot: true
      });
    }
- | AnyShow '<hive>PARTITIONS' RegularOrBackTickedSchemaQualifiedName_EDIT
- | AnyShow '<hive>PARTITIONS' RegularOrBackTickedSchemaQualifiedName 'CURSOR'
-   {
-     parser.addTablePrimary($3);
-     parser.suggestKeywords(['PARTITION']);
-   }
- | AnyShow '<hive>PARTITIONS' RegularOrBackTickedSchemaQualifiedName_EDIT PartitionSpec
- | AnyShow '<impala>PARTITIONS' 'CURSOR'
+ | 'SHOW' 'PARTITIONS' RegularOrBackTickedSchemaQualifiedName_EDIT
+ | 'SHOW' 'RANGE' 'PARTITIONS' 'CURSOR'
    {
      parser.suggestTables();
      parser.suggestDatabases({
        appendDot: true
      });
    }
- | AnyShow '<impala>PARTITIONS' RegularOrBackTickedSchemaQualifiedName_EDIT
- | AnyShow '<impala>RANGE' '<impala>PARTITIONS' 'CURSOR'
-   {
-     parser.suggestTables();
-     parser.suggestDatabases({
-       appendDot: true
-     });
-   }
- | AnyShow '<impala>RANGE' '<impala>PARTITIONS' RegularOrBackTickedSchemaQualifiedName_EDIT
+ | 'SHOW' 'RANGE' 'PARTITIONS' RegularOrBackTickedSchemaQualifiedName_EDIT
  ;
 
 ShowRoleStatement
- : AnyShow '<hive>ROLE' '<hive>GRANT' HiveRoleOrUser RegularIdentifier
- | AnyShow '<impala>ROLE' '<impala>GRANT' '<impala>GROUP' RegularIdentifier
+ : 'SHOW' 'ROLE' 'GRANT' 'GROUP' RegularIdentifier
  ;
 
 ShowRoleStatement_EDIT
- : AnyShow '<hive>ROLE' 'CURSOR'
-   {
-     parser.suggestKeywords(['GRANT']);
-   }
- | AnyShow '<impala>ROLE' 'CURSOR'
+ : 'SHOW' 'ROLE' 'CURSOR'
    {
      parser.suggestKeywords(['GRANT']);
    }
- | AnyShow '<hive>ROLE' 'CURSOR' HiveRoleOrUser RegularIdentifier
-   {
-     parser.suggestKeywords(['GRANT']);
-   }
- | AnyShow '<hive>ROLE' '<hive>GRANT' 'CURSOR'
-   {
-     parser.suggestKeywords(['ROLE', 'USER']);
-   }
- | AnyShow '<hive>ROLE' '<hive>GRANT' 'CURSOR' RegularIdentifier
-   {
-     parser.suggestKeywords(['ROLE', 'USER']);
-   }
- | AnyShow '<impala>ROLE' '<impala>GRANT' 'CURSOR'
+ | 'SHOW' 'ROLE' 'GRANT' 'CURSOR'
    {
      parser.suggestKeywords(['GROUP']);
    }
- | AnyShow '<impala>ROLE' '<impala>GRANT' 'CURSOR' RegularIdentifier
+ | 'SHOW' 'ROLE' 'GRANT' 'CURSOR' RegularIdentifier
    {
      parser.suggestKeywords(['GROUP']);
    }
  ;
 
 ShowRolesStatement
- : AnyShow '<impala>ROLES'
- | AnyShow '<hive>ROLES'
- ;
-
-ShowTableStatement
- : AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase 'LIKE' SingleQuotedValue
- | AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase 'LIKE' SingleQuotedValue PartitionSpec
+ : 'SHOW' 'ROLES'
  ;
 
-ShowTableStatement_EDIT
- : AnyShow '<hive>TABLE' 'CURSOR'
-   {
-     parser.suggestKeywords(['EXTENDED']);
-   }
- | AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase
- | AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase_EDIT
- | AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase 'CURSOR'
-    {
-      if ($4) {
-        parser.suggestKeywords(['LIKE']);
-      } else {
-        parser.suggestKeywords(['FROM', 'IN', 'LIKE']);
-      }
-    }
- | AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase_EDIT 'LIKE' SingleQuotedValue
- | AnyShow '<hive>TABLE' 'CURSOR' OptionalFromDatabase 'LIKE' SingleQuotedValue
-    {
-      if (parser.isHive()) {
-        parser.suggestKeywords(['EXTENDED']);
-      }
-    }
- | AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase 'CURSOR' SingleQuotedValue
-    {
-      parser.suggestKeywords(['LIKE']);
-    }
- | AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase 'LIKE' SingleQuotedValue 'CURSOR'
-    {
-      parser.suggestKeywords(['PARTITION']);
-    }
- | AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase_EDIT 'LIKE' SingleQuotedValue PartitionSpec
- | AnyShow '<hive>TABLE' 'CURSOR' OptionalFromDatabase 'LIKE' SingleQuotedValue PartitionSpec
-   {
-     parser.suggestKeywords(['EXTENDED']);
-   }
- | AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase 'CURSOR' SingleQuotedValue PartitionSpec
+ShowTableStatsStatement
+ : 'SHOW' 'TABLE' 'STATS' RegularOrBackTickedSchemaQualifiedName
    {
-     parser.suggestKeywords(['LIKE']);
-   }
- | AnyShow '<hive>TABLE' '<hive>EXTENDED' OptionalFromDatabase 'LIKE' SingleQuotedValue 'CURSOR' PartitionSpecList
-   {
-     parser.suggestKeywords(['PARTITION']);
+     parser.addTablePrimary($4);
    }
- | AnyShow '<impala>TABLE' 'CURSOR'
+ ;
+
+ShowTableStatsStatement_EDIT
+ : 'SHOW' 'TABLE' 'CURSOR'
    {
      parser.suggestKeywords(['STATS']);
    }
- | AnyShow '<impala>TABLE' '<impala>STATS' 'CURSOR'
+ | 'SHOW' 'TABLE' 'STATS' 'CURSOR'
    {
      parser.suggestTables();
      parser.suggestDatabases({
        appendDot: true
      });
    }
- | AnyShow '<impala>TABLE' '<impala>STATS' RegularOrBackTickedSchemaQualifiedName
-    {
-      parser.addTablePrimary($4);
-    }
- | AnyShow '<impala>TABLE' '<impala>STATS' RegularOrBackTickedSchemaQualifiedName_EDIT
+ | 'SHOW' 'TABLE' 'STATS' RegularOrBackTickedSchemaQualifiedName_EDIT
  ;
 
 ShowTablesStatement
- : AnyShow HiveOrImpalaTables OptionalInDatabase
- | AnyShow HiveOrImpalaTables OptionalInDatabase SingleQuotedValue
- | AnyShow HiveOrImpalaTables OptionalInDatabase 'LIKE' SingleQuotedValue
+ : 'SHOW' 'TABLES' OptionalInDatabase
+ | 'SHOW' 'TABLES' OptionalInDatabase SingleQuotedValue
+ | 'SHOW' 'TABLES' OptionalInDatabase 'LIKE' SingleQuotedValue
  ;
 
 ShowTablesStatement_EDIT
- : AnyShow HiveOrImpalaTables OptionalInDatabase 'CURSOR'
+ : 'SHOW' 'TABLES' OptionalInDatabase 'CURSOR'
    {
      if (!$3) {
        parser.suggestKeywords(['IN', 'LIKE']);
@@ -666,76 +370,3 @@ ShowTablesStatement_EDIT
      }
    }
  ;
-
-ShowTblPropertiesStatement
- : AnyShow '<hive>TBLPROPERTIES' RegularOrBackTickedSchemaQualifiedName
-   {
-     parser.addTablePrimary($3);
-   }
- | AnyShow '<hive>TBLPROPERTIES' RegularOrBackTickedSchemaQualifiedName '(' QuotedValue ')'
-   {
-     parser.addTablePrimary($3);
-   }
- ;
-
-ShowTblPropertiesStatement_EDIT
- : AnyShow '<hive>TBLPROPERTIES' RegularOrBackTickedSchemaQualifiedName_EDIT
- | AnyShow '<hive>TBLPROPERTIES' 'CURSOR'
-   {
-     parser.suggestTables();
-     parser.suggestDatabases({ prependDot: true });
-   }
- ;
-
-ShowTransactionsStatement
- : AnyShow '<hive>TRANSACTIONS'
- ;
-
-ShowViewsStatement
- : AnyShow '<hive>VIEWS' OptionalInOrFromDatabase OptionalLike
- ;
-
-ShowViewsStatement_EDIT
- : AnyShow '<hive>VIEWS' OptionalInOrFromDatabase OptionalLike 'CURSOR'
-   {
-     if (!$4 && !$3) {
-       parser.suggestKeywords([{ value: 'IN', weight: 2 }, { value: 'FROM', weight: 2 }, { value: 'LIKE', weight: 1 }]);
-     } else if (!$4) {
-       parser.suggestKeywords(['LIKE']);
-     }
-   }
- | AnyShow '<hive>VIEWS' InOrFromDatabase_EDIT OptionalLike
- | AnyShow '<hive>VIEWS' OptionalInOrFromDatabase Like_EDIT
- ;
-
-OptionalInOrFromDatabase
- :
- | 'IN' RegularOrBacktickedIdentifier
-   {
-     parser.addDatabaseLocation(@2, [ { name: $2 } ]);
-   }
- | 'FROM' RegularOrBacktickedIdentifier
-   {
-     parser.addDatabaseLocation(@2, [ { name: $2 } ]);
-   }
- ;
-
-InOrFromDatabase_EDIT
- : 'IN' 'CURSOR'
-   {
-     parser.suggestDatabases();
-   }
- | 'FROM' 'CURSOR'
-   {
-     parser.suggestDatabases();
-   }
- ;
-
-OptionalLike
- :
- | 'LIKE' SingleQuotedValue
- ;
-
-Like_EDIT
- : 'LIKE' 'CURSOR'
- ;

+ 2 - 2
desktop/core/src/desktop/js/parse/jison/impala/sql_update.jison

@@ -33,9 +33,9 @@ UpdateStatement_EDIT
  | 'UPDATE' TargetTable 'SET' SetClauseList OptionalFromJoinedTable WhereClause_EDIT
  | 'UPDATE' TargetTable 'SET' SetClauseList OptionalFromJoinedTable OptionalWhereClause 'CURSOR'
    {
-     if (parser.isImpala() && !$6 && !$5) {
+     if (!$6 && !$5) {
        parser.suggestKeywords([{ value: 'FROM', weight: 2 }, { value: 'WHERE', weight: 1 }]);
-     } else if (parser.isImpala() && !$6 && $5) {
+     } else if (!$6 && $5) {
        var keywords = [{ value: 'FULL JOIN', weight: 2 }, { value: 'FULL OUTER JOIN', weight: 2 }, { value: 'JOIN', weight: 2 }, { value: 'LEFT JOIN', weight: 2 }, { value: 'LEFT OUTER JOIN', weight: 2 }, { value: 'RIGHT JOIN', weight: 2 }, { value: 'RIGHT OUTER JOIN', weight: 2 }, { value: 'INNER JOIN', weight: 2 },  { value: 'LEFT ANTI JOIN', weight: 2 }, { value: 'LEFT SEMI JOIN', weight: 2 }, { value: 'RIGHT ANTI JOIN', weight: 2 }, { value: 'RIGHT SEMI JOIN', weight: 2 }, { value: 'WHERE', weight: 1 }];
        if ($5.suggestJoinConditions) {
          parser.suggestJoinConditions($5.suggestJoinConditions);

+ 3 - 8
desktop/core/src/desktop/js/parse/jison/impala/sql_use.jison

@@ -22,22 +22,17 @@ DataDefinition_EDIT
  : UseStatement_EDIT
  ;
 
-AnyUse
- : 'USE'
- | '<hive>USE'
- ;
-
 UseStatement
- : AnyUse RegularIdentifier
+ : 'USE' RegularIdentifier
    {
-     if (! parser.yy.cursorFound) {
+     if (!parser.yy.cursorFound) {
        parser.yy.result.useDatabase = $2;
      }
    }
  ;
 
 UseStatement_EDIT
- : AnyUse 'CURSOR'
+ : 'USE' 'CURSOR'
    {
      parser.suggestDatabases();
    }

+ 11 - 21
desktop/core/src/desktop/js/parse/jison/impala/sql_valueExpression.jison

@@ -35,7 +35,7 @@ ValueExpression
  | ValueExpression 'IS' OptionalNot 'NULL'                             -> { types: [ 'BOOLEAN' ] }
  | ValueExpression 'IS' OptionalNot 'TRUE'                             -> { types: [ 'BOOLEAN' ] }
  | ValueExpression 'IS' OptionalNot 'FALSE'                            -> { types: [ 'BOOLEAN' ] }
- | ValueExpression 'IS' OptionalNot '<impala>UNKNOWN'                  -> { types: [ 'BOOLEAN' ] }
+ | ValueExpression 'IS' OptionalNot 'UNKNOWN'                  -> { types: [ 'BOOLEAN' ] }
  | ValueExpression 'IS' OptionalNot 'DISTINCT' 'FROM' ValueExpression  -> { types: [ 'BOOLEAN' ] }
  ;
 
@@ -77,27 +77,17 @@ ValueExpression_EDIT
    }
  | ValueExpression 'IS' 'CURSOR'
    {
-     var keywords = ['FALSE', 'NOT NULL', 'NOT TRUE', 'NOT FALSE', 'NULL', 'TRUE'];
-     if (parser.isImpala()) {
-       keywords = keywords.concat(['DISTINCT FROM', 'NOT DISTINCT FROM', 'NOT UNKNOWN', 'UNKNOWN']);
-     }
-     parser.suggestKeywords(keywords);
+     parser.suggestKeywords(['FALSE', 'NOT NULL', 'NOT TRUE', 'NOT FALSE', 'NULL', 'TRUE', 'DISTINCT FROM', 'NOT DISTINCT FROM', 'NOT UNKNOWN', 'UNKNOWN']);
      $$ = { types: [ 'BOOLEAN' ] };
    }
  | ValueExpression 'IS' 'NOT' 'CURSOR'
    {
-     var keywords = ['FALSE', 'NULL', 'TRUE'];
-     if (parser.isImpala()) {
-       keywords = keywords.concat(['DISTINCT FROM', 'UNKNOWN']);
-     }
-     parser.suggestKeywords(keywords);
+     parser.suggestKeywords(['FALSE', 'NULL', 'TRUE', 'DISTINCT FROM', 'UNKNOWN']);
      $$ = { types: [ 'BOOLEAN' ] };
    }
  | ValueExpression 'IS' OptionalNot 'DISTINCT' 'CURSOR'
    {
-     if (parser.isImpala()) {
-       parser.suggestKeywords(['FROM']);
-     }
+     parser.suggestKeywords(['FROM']);
      $$ = { types: [ 'BOOLEAN' ] };
    }
  | ValueExpression 'IS' 'CURSOR' 'NULL'
@@ -592,16 +582,16 @@ ValueExpression
 
 LikeRightPart
  : 'LIKE' ValueExpression             -> { suggestKeywords: ['NOT'] }
- | '<impala>ILIKE' ValueExpression    -> { suggestKeywords: ['NOT'] }
- | '<impala>IREGEXP' ValueExpression  -> { suggestKeywords: ['NOT'] }
+ | 'ILIKE' ValueExpression    -> { suggestKeywords: ['NOT'] }
+ | 'IREGEXP' ValueExpression  -> { suggestKeywords: ['NOT'] }
  | 'RLIKE' ValueExpression            -> { suggestKeywords: ['NOT'] }
  | 'REGEXP' ValueExpression           -> { suggestKeywords: ['NOT'] }
  ;
 
 LikeRightPart_EDIT
  : 'LIKE' ValueExpression_EDIT
- | '<impala>ILIKE' ValueExpression_EDIT
- | '<impala>IREGEXP' ValueExpression_EDIT
+ | 'ILIKE' ValueExpression_EDIT
+ | 'IREGEXP' ValueExpression_EDIT
  | 'RLIKE' ValueExpression_EDIT
  | 'REGEXP' ValueExpression_EDIT
  | 'LIKE' PartialBacktickedOrCursor
@@ -610,13 +600,13 @@ LikeRightPart_EDIT
      parser.suggestColumns({ types: [ 'STRING' ] });
      $$ = { types: ['BOOLEAN'] }
    }
- | '<impala>ILIKE' PartialBacktickedOrCursor
+ | 'ILIKE' PartialBacktickedOrCursor
    {
      parser.suggestFunctions({ types: [ 'STRING' ] });
      parser.suggestColumns({ types: [ 'STRING' ] });
      $$ = { types: ['BOOLEAN'] }
    }
- | '<impala>IREGEXP' PartialBacktickedOrCursor
+ | 'IREGEXP' PartialBacktickedOrCursor
    {
      parser.suggestFunctions({ types: [ 'STRING' ] });
      parser.suggestColumns({ types: [ 'STRING' ] });
@@ -864,4 +854,4 @@ CaseWhenThenListPartTwo_EDIT
      parser.valueExpressionSuggest();
      $$ = { caseTypes: [{ types: ['T'] }] };
    }
- ;
+ ;

Some files were not shown because too many files changed in this diff