HCK-12222: fix parsing of CLUSTER BY clause

reverse_engineering/grammars/HiveLexer.g4

@@ -24,6 +24,7 @@ lexer grammar HiveLexer;
 KW_TRUE : T R U E;
 KW_FALSE : F A L S E;
 KW_ALL : A L L;
+KW_AUTO : A U T O;
 KW_NONE: N O N E;
 KW_AND : A N D;
 KW_OR : O R;
@@ -521,9 +522,10 @@ An Identifier can be:
 - macro name
 - hint name
 - window name
+- _metadata
 */
 Identifier
-    : (Letter | Digit) (Letter | Digit | '_')*
+    : (Letter | Digit | '_')+
     | QuotedIdentifier  /* though at the language level we allow all Identifiers to be QuotedIdentifiers;
                                               at the API level only columns are allowed to be of this form */
     | '`' RegexComponent+ '`'

reverse_engineering/grammars/IdentifiersParser.g4

@@ -105,7 +105,7 @@ orderByClause
     ;
 
 clusterByClause
-    : KW_CLUSTER KW_BY LPAREN columnNameList RPAREN
+    : KW_CLUSTER KW_BY (LPAREN columnNameList RPAREN) | KW_AUTO | KW_NONE
     ;
 
 partitionByClause

reverse_engineering/grammars/SqlBase.g4

@@ -385,6 +385,7 @@ createTableClauses
     : (
         tableOptions
         | (PARTITIONED BY partitioning = partitionFieldList)
+        | clusterBySpec
         | skewSpec
         | bucketSpec
         | rowFormat
@@ -397,6 +398,10 @@ createTableClauses
     )*
     ;
 
+clusterBySpec
+    : CLUSTER BY ( '(' keyNameList ')' ) | AUTO | NONE
+    ;
+
 tableProperties
     : (TBLPROPERTIES tableProps=tablePropertyList)
     ;
@@ -1340,6 +1345,7 @@ nonReserved
     | AS
     | ASC
     | AT
+    | AUTO
     | AUTHORIZATION
     | BETWEEN
     | BOTH
@@ -1461,6 +1467,7 @@ nonReserved
     | NAMESPACES
     | NO
     | NOT
+    | NONE
     | NULL
     | NULLS
     | OF
@@ -1592,6 +1599,7 @@ ARRAY: A R R A Y;
 AS: A S;
 ASC: A S C;
 AT: A T;
+AUTO: A U T O;
 AUTHORIZATION: A U T H O R I Z A T I O N;
 BETWEEN: B E T W E E N;
 BINDING: B I N D I N G;
@@ -1727,6 +1735,7 @@ NAMESPACE: N A M E S P A C E;
 NAMESPACES: N A M E S P A C E S;
 NATURAL: N A T U R A L;
 NO: N O;
+NONE: N O N E;
 NOT: N O T | '!';
 NULL: N U L L;
 NULLS: N U L L S;

reverse_engineering/helpers/tableDDLHelper.js

@@ -14,12 +14,7 @@ const getTableData = async (table, data, logger) => {
 		tableData = getTableDataFromDDl(ddl);
 		tableData = applyUnityTagsToTable(data.unityTags?.tableTags, tableData);
 	} catch (e) {
-		logger.log(
-			'info',
-			data,
-			`Error parsing ddl statement below. Falling back on alternate method. \n${ddl}\n`,
-			data.hiddenKeys,
-		);
+		logger.log('info', ddl, 'Error parsing ddl statement below. Falling back on alternate method.');
 		return {};
 	}
 	const BloomIndxs = convertIndexes(indexes);