Merge pull request #105 from lenchvolodymyr/fix/HCK-2760-re-udt

HCK-2760: fix RE of udt from instance when there is empty array with …

Author: mtseluiko

reverse_engineering/cassandraHelper.js

@@ -788,7 +788,7 @@ module.exports = (_) => {
 
 			return {
 				...schema,
-				...handleUdts(nestedUdts) || {}
+				...(handleUdts(nestedUdts) || {})
 			};
 		} else {
 			return null;

reverse_engineering/grammars/CqlLexer.g4

@@ -785,6 +785,10 @@ K_SASI_INDEX
    : SQUOTE O R G DOT A P A C H E DOT C A S S A N D R A DOT I N D E X DOT S A S I DOT S A S I I N D E X SQUOTE
    ;
 
+K_SOLR_INDEX
+   : SQUOTE C O M DOT D A T A S T A X DOT B D P DOT S E A R C H DOT S O L R DOT C Q L '3' S O L R S E C O N D A R Y I N D E X SQUOTE
+   ;
+
 K_SPACE_SAVING_NO_JOIN
    : S P A C E S A V I N G N O J O I N
    ;

reverse_engineering/grammars/CqlParser.g4

@@ -509,7 +509,7 @@ truncate
 
 createIndex
    : kwCreate kwIndex ifNotExist? indexName? kwOn (keyspace DOT)? table syntaxBracketLr indexColumnSpec syntaxBracketRr #secondaryIndex
-   | kwCreate kwCustom kwIndex ifNotExist? indexName? kwOn (keyspace DOT)? table syntaxBracketLr indexColumnSpec syntaxBracketRr kwUsing (kwStorageAttachedIndex | kwSASIIndex) (kwWith kwOptions OPERATOR_EQ LC_BRACKET customIndexOption+ RC_BRACKET)? #customIndex
+   | kwCreate kwCustom kwIndex ifNotExist? indexName? kwOn (keyspace DOT)? table syntaxBracketLr indexColumnSpec syntaxBracketRr kwUsing (kwStorageAttachedIndex | kwSASIIndex | kwSolrIndex) (kwWith kwOptions OPERATOR_EQ LC_BRACKET customIndexOption+ RC_BRACKET)? #customIndex
    ;
 
 customIndexOption
@@ -869,7 +869,7 @@ dataType
    ;
 
 dataTypeName
-   : id
+   : (keyspace DOT)? type
    | STRING_LITERAL
    | K_TIMESTAMP
    | K_SET
@@ -1182,6 +1182,10 @@ kwStorageAttachedIndex
    : K_STORAGE_ATTACHED_INDEX
    ;
 
+kwSolrIndex
+   : K_SOLR_INDEX
+   ;
+
 kwSASIIndex
    : K_SASI_INDEX
    ;

reverse_engineering/parser/CqlLexer.interp

@@ -159,68 +159,69 @@ K_MODE=158
 K_ANALYZER_CLASS=159
 K_STORAGE_ATTACHED_INDEX=160
 K_SASI_INDEX=161
-K_SPACE_SAVING_NO_JOIN=162
-K_SPACE_SAVING_ALL=163
-K_SPACE_SAVING_SLOW_TRIE_PRECISION=164
-K_SPACE_SAVING_NO_TEXT_FIELD=165
-K_DOC_VALUES=166
-K_COPY_FIELD=167
-K_EXCLUDED=168
-K_INDEXED=169
-K_LOWERCASE=170
-K_COLUMNS=171
-K_PROFILES=172
-K_CONFIG=173
-K_AUTOCOMMIT_TIME=174
-K_DEFAULT_QUERY_FIELD=175
-K_DIRECTORY_FACTORY=176
-K_FILTER_CACHE_LOW_WATERMARK=177
-K_FILTER_CACHE_HIGH_WATERMARK=178
-K_DIRECTORY_FACTORY_CLASS=179
-K_MERGE_MAX_THREAD_COUNT=180
-K_MERGE_MAX_MERGE_COUNT=181
-K_RAM_BUFFER_SIZE=182
-K_REALTIME=183
-K_RECOVERY=184
-K_REINDEX=185
-K_LENIENT=186
-K_STANDARD=187
-K_ENCRYPTED=188
-K_BIGINT=189
-K_BLOB=190
-K_BOOLEAN=191
-K_COUNTER=192
-K_DATE=193
-K_DECIMAL=194
-K_DOUBLE=195
-K_FLOAT=196
-K_FROZEN=197
-K_INET=198
-K_INT=199
-K_LIST=200
-K_MAP=201
-K_SMALLINT=202
-K_TEXT=203
-K_TIMEUUID=204
-K_TIME=205
-K_TINYINT=206
-K_TUPLE=207
-K_VARCHAR=208
-K_VARINT=209
-CODE_BLOCK=210
-STRING_LITERAL=211
-DECIMAL_LITERAL=212
-FLOAT_LITERAL=213
-HEXADECIMAL_LITERAL=214
-REAL_LITERAL=215
-OBJECT_NAME=216
-UUID=217
-OPERATOR_EQ=218
-OPERATOR_LT=219
-OPERATOR_GT=220
-OPERATOR_LTE=221
-OPERATOR_GTE=222
-K_USERS=223
+K_SOLR_INDEX=162
+K_SPACE_SAVING_NO_JOIN=163
+K_SPACE_SAVING_ALL=164
+K_SPACE_SAVING_SLOW_TRIE_PRECISION=165
+K_SPACE_SAVING_NO_TEXT_FIELD=166
+K_DOC_VALUES=167
+K_COPY_FIELD=168
+K_EXCLUDED=169
+K_INDEXED=170
+K_LOWERCASE=171
+K_COLUMNS=172
+K_PROFILES=173
+K_CONFIG=174
+K_AUTOCOMMIT_TIME=175
+K_DEFAULT_QUERY_FIELD=176
+K_DIRECTORY_FACTORY=177
+K_FILTER_CACHE_LOW_WATERMARK=178
+K_FILTER_CACHE_HIGH_WATERMARK=179
+K_DIRECTORY_FACTORY_CLASS=180
+K_MERGE_MAX_THREAD_COUNT=181
+K_MERGE_MAX_MERGE_COUNT=182
+K_RAM_BUFFER_SIZE=183
+K_REALTIME=184
+K_RECOVERY=185
+K_REINDEX=186
+K_LENIENT=187
+K_STANDARD=188
+K_ENCRYPTED=189
+K_BIGINT=190
+K_BLOB=191
+K_BOOLEAN=192
+K_COUNTER=193
+K_DATE=194
+K_DECIMAL=195
+K_DOUBLE=196
+K_FLOAT=197
+K_FROZEN=198
+K_INET=199
+K_INT=200
+K_LIST=201
+K_MAP=202
+K_SMALLINT=203
+K_TEXT=204
+K_TIMEUUID=205
+K_TIME=206
+K_TINYINT=207
+K_TUPLE=208
+K_VARCHAR=209
+K_VARINT=210
+CODE_BLOCK=211
+STRING_LITERAL=212
+DECIMAL_LITERAL=213
+FLOAT_LITERAL=214
+HEXADECIMAL_LITERAL=215
+REAL_LITERAL=216
+OBJECT_NAME=217
+UUID=218
+OPERATOR_EQ=219
+OPERATOR_LT=220
+OPERATOR_GT=221
+OPERATOR_LTE=222
+OPERATOR_GTE=223
+K_USERS=224
 '('=1
 ')'=2
 '{'=3

reverse_engineering/parser/CqlLexer.js

@@ -159,68 +159,69 @@ K_MODE=158
 K_ANALYZER_CLASS=159
 K_STORAGE_ATTACHED_INDEX=160
 K_SASI_INDEX=161
-K_SPACE_SAVING_NO_JOIN=162
-K_SPACE_SAVING_ALL=163
-K_SPACE_SAVING_SLOW_TRIE_PRECISION=164
-K_SPACE_SAVING_NO_TEXT_FIELD=165
-K_DOC_VALUES=166
-K_COPY_FIELD=167
-K_EXCLUDED=168
-K_INDEXED=169
-K_LOWERCASE=170
-K_COLUMNS=171
-K_PROFILES=172
-K_CONFIG=173
-K_AUTOCOMMIT_TIME=174
-K_DEFAULT_QUERY_FIELD=175
-K_DIRECTORY_FACTORY=176
-K_FILTER_CACHE_LOW_WATERMARK=177
-K_FILTER_CACHE_HIGH_WATERMARK=178
-K_DIRECTORY_FACTORY_CLASS=179
-K_MERGE_MAX_THREAD_COUNT=180
-K_MERGE_MAX_MERGE_COUNT=181
-K_RAM_BUFFER_SIZE=182
-K_REALTIME=183
-K_RECOVERY=184
-K_REINDEX=185
-K_LENIENT=186
-K_STANDARD=187
-K_ENCRYPTED=188
-K_BIGINT=189
-K_BLOB=190
-K_BOOLEAN=191
-K_COUNTER=192
-K_DATE=193
-K_DECIMAL=194
-K_DOUBLE=195
-K_FLOAT=196
-K_FROZEN=197
-K_INET=198
-K_INT=199
-K_LIST=200
-K_MAP=201
-K_SMALLINT=202
-K_TEXT=203
-K_TIMEUUID=204
-K_TIME=205
-K_TINYINT=206
-K_TUPLE=207
-K_VARCHAR=208
-K_VARINT=209
-CODE_BLOCK=210
-STRING_LITERAL=211
-DECIMAL_LITERAL=212
-FLOAT_LITERAL=213
-HEXADECIMAL_LITERAL=214
-REAL_LITERAL=215
-OBJECT_NAME=216
-UUID=217
-OPERATOR_EQ=218
-OPERATOR_LT=219
-OPERATOR_GT=220
-OPERATOR_LTE=221
-OPERATOR_GTE=222
-K_USERS=223
+K_SOLR_INDEX=162
+K_SPACE_SAVING_NO_JOIN=163
+K_SPACE_SAVING_ALL=164
+K_SPACE_SAVING_SLOW_TRIE_PRECISION=165
+K_SPACE_SAVING_NO_TEXT_FIELD=166
+K_DOC_VALUES=167
+K_COPY_FIELD=168
+K_EXCLUDED=169
+K_INDEXED=170
+K_LOWERCASE=171
+K_COLUMNS=172
+K_PROFILES=173
+K_CONFIG=174
+K_AUTOCOMMIT_TIME=175
+K_DEFAULT_QUERY_FIELD=176
+K_DIRECTORY_FACTORY=177
+K_FILTER_CACHE_LOW_WATERMARK=178
+K_FILTER_CACHE_HIGH_WATERMARK=179
+K_DIRECTORY_FACTORY_CLASS=180
+K_MERGE_MAX_THREAD_COUNT=181
+K_MERGE_MAX_MERGE_COUNT=182
+K_RAM_BUFFER_SIZE=183
+K_REALTIME=184
+K_RECOVERY=185
+K_REINDEX=186
+K_LENIENT=187
+K_STANDARD=188
+K_ENCRYPTED=189
+K_BIGINT=190
+K_BLOB=191
+K_BOOLEAN=192
+K_COUNTER=193
+K_DATE=194
+K_DECIMAL=195
+K_DOUBLE=196
+K_FLOAT=197
+K_FROZEN=198
+K_INET=199
+K_INT=200
+K_LIST=201
+K_MAP=202
+K_SMALLINT=203
+K_TEXT=204
+K_TIMEUUID=205
+K_TIME=206
+K_TINYINT=207
+K_TUPLE=208
+K_VARCHAR=209
+K_VARINT=210
+CODE_BLOCK=211
+STRING_LITERAL=212
+DECIMAL_LITERAL=213
+FLOAT_LITERAL=214
+HEXADECIMAL_LITERAL=215
+REAL_LITERAL=216
+OBJECT_NAME=217
+UUID=218
+OPERATOR_EQ=219
+OPERATOR_LT=220
+OPERATOR_GT=221
+OPERATOR_LTE=222
+OPERATOR_GTE=223
+K_USERS=224
 '('=1
 ')'=2
 '{'=3