From 16787e3061b258c45fce24aca2b4500ce50472e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20A=CC=8Ahle=CC=81n?= Date: Thu, 29 Sep 2022 15:58:04 +0200 Subject: [PATCH] CDPD-40713: [frontend] Improve autocomplete and syntax parser generation and structure (#3027) - Improve the readability of the generator tool, switch to async/await and a major cleanup - Move jison files to a subfolder next to the parser being generated, making it easier to develop a parser when it's all in one place. - Remove broken and unused new parser bootstrap tool - Remove generation of dynamic imports (sqlParserRepository.ts), as it's not always the case that the generated file will be the actual parser to use moving forward (cherry picked from commit ba3ae3a010ffc4964f9128a48e8021f2004739a0) (cherry picked from commit cc3fa3e0094d1fce079b566741c6f359d3a362fb) Change-Id: I630c69f0eef5e958de0034b182e95021ddb8bbb8 --- .../js/parse/jison/sql/calcite/structure.json | 118 ---- .../js/parse/jison/sql/dasksql/structure.json | 82 --- .../js/parse/jison/sql/flink/structure.json | 118 ---- .../js/parse/jison/sql/ksql/structure.json | 108 ---- .../js/parse/jison/sql/phoenix/structure.json | 116 ---- .../js/parse/jison/sql/presto/structure.json | 218 ------- .../jison}/describe/describe_table.jison | 0 .../jison}/quoted_table_identifier.jison | 0 .../calcite/jison}/select/select_stream.jison | 0 .../calcite/jison}/sql.jisonlex | 0 .../js/parse/sql/calcite/jison/structure.json | 118 ++++ .../dasksql/jison}/create/create_common.jison | 0 .../dasksql/jison}/create/create_table.jison | 0 .../dasksql/jison}/create/create_view.jison | 0 .../dasksql/jison}/show/show.jison | 0 .../dasksql/jison}/sql.jisonlex | 0 .../js/parse/sql/dasksql/jison/structure.json | 82 +++ .../flink/jison}/show/sql_show.jison | 0 .../flink => sql/flink/jison}/sql.jisonlex | 0 .../js/parse/sql/flink/jison/structure.json | 118 ++++ .../generic/jison}/alter/alter_common.jison | 0 .../generic/jison}/alter/alter_table.jison | 0 .../generic/jison}/alter/alter_view.jison | 0 .../generic/jison}/autocomplete_footer.jison | 0 .../generic/jison}/autocomplete_header.jison | 0 .../generic/jison}/create/create_common.jison | 0 .../jison}/create/create_database.jison | 0 .../generic/jison}/create/create_role.jison | 0 .../generic/jison}/create/create_table.jison | 0 .../generic/jison}/create/create_view.jison | 0 .../generic/jison}/drop/drop_common.jison | 0 .../generic/jison}/drop/drop_database.jison | 0 .../generic/jison}/drop/drop_role.jison | 0 .../generic/jison}/drop/drop_table.jison | 0 .../generic/jison}/drop/drop_view.jison | 0 .../generic/jison}/insert/insert.jison | 0 .../jison}/select/cte_select_statement.jison | 0 .../generic/jison}/select/from_clause.jison | 0 .../jison}/select/group_by_clause.jison | 0 .../generic/jison}/select/having_clause.jison | 0 .../generic/jison}/select/joins.jison | 0 .../generic/jison}/select/limit_clause.jison | 0 .../jison}/select/order_by_clause.jison | 0 .../generic/jison}/select/select.jison | 0 .../jison}/select/select_conditions.jison | 0 .../generic/jison}/select/union_clause.jison | 0 .../generic/jison}/select/where_clause.jison | 0 .../generic/jison}/set/set_all.jison | 0 .../generic/jison}/set/set_common.jison | 0 .../generic/jison}/set/set_option.jison | 0 .../generic/jison}/sql.jisonlex | 0 .../generic/jison}/sql_error.jison | 0 .../generic/jison}/sql_main.jison | 0 .../generic/jison}/sql_valueExpression.jison | 0 .../generic/jison}/structure.json | 0 .../generic/jison}/syntax_footer.jison | 0 .../generic/jison}/syntax_header.jison | 0 .../jison}/truncate/truncate_table.jison | 0 .../udf/aggregate/aggregate_common.jison | 0 .../generic/jison}/udf/aggregate/avg.jison | 0 .../generic/jison}/udf/aggregate/count.jison | 0 .../generic/jison}/udf/aggregate/max.jison | 0 .../generic/jison}/udf/aggregate/min.jison | 0 .../jison}/udf/aggregate/stddev_pop.jison | 0 .../jison}/udf/aggregate/stddev_samp.jison | 0 .../generic/jison}/udf/aggregate/sum.jison | 0 .../jison}/udf/aggregate/var_pop.jison | 0 .../jison}/udf/aggregate/var_samp.jison | 0 .../jison}/udf/aggregate/variance.jison | 0 .../jison}/udf/analytic/analytic.jison | 0 .../generic/jison}/udf/function/array.jison | 0 .../generic/jison}/udf/function/cast.jison | 0 .../generic/jison}/udf/function/if.jison | 0 .../generic/jison}/udf/function/map.jison | 0 .../jison}/udf/function/truncate.jison | 0 .../generic/jison}/udf/udf_common.jison | 0 .../generic/jison}/update/update_table.jison | 0 .../generic/jison}/use/use.jison | 0 .../jison}/abort/abort_transactions.jison | 0 .../hive/jison}/alter/alter_common.jison | 0 .../hive/jison}/alter/alter_connector.jison | 0 .../hive/jison}/alter/alter_database.jison | 0 .../hive/jison}/alter/alter_index.jison | 0 .../alter/alter_materialized_view.jison | 0 .../jison}/alter/alter_scheduled_query.jison | 0 .../hive/jison}/alter/alter_table.jison | 0 .../hive/jison}/alter/alter_view.jison | 0 .../hive/jison}/analyze/analyze_table.jison | 0 .../hive/jison}/common/table_constraint.jison | 0 .../hive/jison}/create/create_common.jison | 0 .../hive/jison}/create/create_connector.jison | 0 .../hive/jison}/create/create_database.jison | 0 .../hive/jison}/create/create_function.jison | 0 .../hive/jison}/create/create_index.jison | 0 .../create/create_materialized_view.jison | 0 .../hive/jison}/create/create_role.jison | 0 .../create/create_scheduled_query.jison | 0 .../hive/jison}/create/create_table.jison | 0 .../create/create_temporary_function.jison | 0 .../create/create_temporary_macro.jison | 0 .../hive/jison}/create/create_view.jison | 0 .../hive/jison}/delete/delete.jison | 0 .../hive/jison}/describe/describe.jison | 0 .../jison}/describe/describe_connector.jison | 0 .../jison}/describe/describe_database.jison | 0 .../jison}/describe/describe_function.jison | 0 .../hive/jison}/drop/drop_common.jison | 0 .../hive/jison}/drop/drop_connector.jison | 0 .../hive/jison}/drop/drop_database.jison | 0 .../hive/jison}/drop/drop_function.jison | 0 .../hive/jison}/drop/drop_index.jison | 0 .../jison}/drop/drop_materialized_view.jison | 0 .../hive/jison}/drop/drop_role.jison | 0 .../jison}/drop/drop_scheduled_query.jison | 0 .../hive/jison}/drop/drop_table.jison | 0 .../jison}/drop/drop_temporary_function.jison | 0 .../jison}/drop/drop_temporary_macro.jison | 0 .../hive/jison}/drop/drop_view.jison | 0 .../hive/jison}/explain/explain.jison | 0 .../hive/jison}/export/export.jison | 0 .../hive/jison}/grant/grant_common.jison | 0 .../hive/jison}/grant/grant_privilege.jison | 0 .../hive/jison}/grant/grant_role.jison | 0 .../hive/jison}/grant/grant_user.jison | 0 .../hive/jison}/grant/privilege_type.jison | 0 .../hive/jison}/import/import.jison | 0 .../hive/jison}/insert/insert.jison | 0 .../hive/jison}/load/load_data.jison | 0 .../hive => sql/hive/jison}/merge/merge.jison | 0 .../hive => sql/hive/jison}/msck/msck.jison | 0 .../hive/jison}/reload/reload.jison | 0 .../revoke/revoke_admin_option_for.jison | 0 .../hive/jison}/revoke/revoke_all.jison | 0 .../hive/jison}/revoke/revoke_common.jison | 0 .../revoke/revoke_grant_option_for.jison | 0 .../hive/jison}/revoke/revoke_privilege.jison | 0 .../hive/jison}/revoke/revoke_role.jison | 0 .../hive/jison}/revoke/revoke_user.jison | 0 .../hive/jison}/set/set_common.jison | 0 .../hive/jison}/set/set_role.jison | 0 .../hive/jison}/show/show_columns.jison | 0 .../hive/jison}/show/show_common.jison | 0 .../hive/jison}/show/show_compactions.jison | 0 .../hive/jison}/show/show_conf.jison | 0 .../hive/jison}/show/show_connectors.jison | 0 .../hive/jison}/show/show_create_table.jison | 0 .../hive/jison}/show/show_current_roles.jison | 0 .../hive/jison}/show/show_databases.jison | 0 .../hive/jison}/show/show_functions.jison | 0 .../hive/jison}/show/show_grant.jison | 0 .../hive/jison}/show/show_index.jison | 0 .../hive/jison}/show/show_locks.jison | 0 .../jison}/show/show_materialized_views.jison | 0 .../hive/jison}/show/show_partitions.jison | 0 .../hive/jison}/show/show_role.jison | 0 .../hive/jison}/show/show_roles.jison | 0 .../hive/jison}/show/show_table.jison | 0 .../hive/jison}/show/show_tables.jison | 0 .../hive/jison}/show/show_tblproperties.jison | 0 .../hive/jison}/show/show_transactions.jison | 0 .../hive/jison}/show/show_views.jison | 0 .../sql/hive => sql/hive/jison}/sql.jisonlex | 0 .../hive => sql/hive/jison}/sql_error.jison | 0 .../hive => sql/hive/jison}/sql_main.jison | 0 .../hive => sql/hive/jison}/structure.json | 100 +-- .../hive/jison}/truncate/truncate_table.jison | 0 .../hive/jison}/udf/sql_aggregate.jison | 0 .../hive/jison}/udf/sql_arbitrary.jison | 0 .../hive/jison}/udf/sql_extract.jison | 0 .../hive/jison}/update/update.jison | 0 .../impala/jison}/alter/alter_common.jison | 0 .../impala/jison}/alter/alter_database.jison | 0 .../impala/jison}/alter/alter_table.jison | 0 .../impala/jison}/alter/alter_view.jison | 0 .../impala/jison}/autocomplete_header.jison | 0 .../impala/jison}/comment/comment_on.jison | 0 .../impala/jison}/compute/compute_stats.jison | 0 .../create/create_aggregate_function.jison | 0 .../impala/jison}/create/create_common.jison | 0 .../jison}/create/create_database.jison | 0 .../jison}/create/create_function.jison | 0 .../impala/jison}/create/create_role.jison | 0 .../impala/jison}/create/create_table.jison | 0 .../impala/jison}/create/create_view.jison | 0 .../impala/jison}/delete/delete.jison | 0 .../impala/jison}/describe/describe.jison | 0 .../jison}/describe/describe_database.jison | 0 .../jison}/describe/describe_history.jison | 0 .../jison}/drop/drop_aggregate_function.jison | 0 .../impala/jison}/drop/drop_common.jison | 0 .../impala/jison}/drop/drop_database.jison | 0 .../impala/jison}/drop/drop_function.jison | 0 .../jison}/drop/drop_incremental_stats.jison | 0 .../impala/jison}/drop/drop_role.jison | 0 .../impala/jison}/drop/drop_stats.jison | 0 .../impala/jison}/drop/drop_table.jison | 0 .../impala/jison}/drop/drop_view.jison | 0 .../impala/jison}/grant/grant_common.jison | 0 .../impala/jison}/grant/grant_on.jison | 0 .../impala/jison}/grant/grant_role.jison | 0 .../impala/jison}/insert/cte_insert.jison | 0 .../impala/jison}/insert/insert.jison | 0 .../impala/jison}/insert/insert_common.jison | 0 .../invalidate/invalidate_metadata.jison | 0 .../impala/jison}/load/load_data.jison | 0 .../impala/jison}/refresh/refresh.jison | 0 .../impala/jison}/revoke/revoke_common.jison | 0 .../impala/jison}/revoke/revoke_on.jison | 0 .../impala/jison}/revoke/revoke_role.jison | 0 .../impala/jison}/select/joins.jison | 0 .../impala/jison}/select/limit_clause.jison | 0 .../impala/jison}/select/offset_clause.jison | 0 .../jison}/select/order_by_clause.jison | 0 .../impala/jison}/select/select.jison | 0 .../jison}/select/select_conditions.jison | 0 .../impala => sql/impala/jison}/set/set.jison | 0 .../jison}/show/show_column_stats.jison | 0 .../impala/jison}/show/show_common.jison | 0 .../jison}/show/show_create_table.jison | 0 .../jison}/show/show_current_roles.jison | 0 .../impala/jison}/show/show_databases.jison | 0 .../impala/jison}/show/show_files.jison | 0 .../impala/jison}/show/show_functions.jison | 0 .../impala/jison}/show/show_grant.jison | 0 .../impala/jison}/show/show_partitions.jison | 0 .../jison}/show/show_range_partitions.jison | 0 .../impala/jison}/show/show_role.jison | 0 .../impala/jison}/show/show_roles.jison | 0 .../impala/jison}/show/show_table_stats.jison | 0 .../impala/jison}/show/show_tables.jison | 0 .../impala => sql/impala/jison}/sql.jisonlex | 0 .../impala/jison}/sql_error.jison | 0 .../impala/jison}/sql_main.jison | 0 .../impala/jison}/sql_valueExpression.jison | 0 .../impala/jison}/structure.json | 92 +-- .../impala/jison}/syntax_header.jison | 0 .../jison}/truncate/truncate_table.jison | 0 .../udf/aggregate/aggregate_common.jison | 0 .../jison}/udf/aggregate/appx_median.jison | 0 .../impala/jison}/udf/aggregate/count.jison | 0 .../jison}/udf/aggregate/group_concat.jison | 0 .../impala/jison}/udf/aggregate/ndv.jison | 0 .../impala/jison}/udf/aggregate/stddev.jison | 0 .../impala/jison}/udf/aggregate/sum.jison | 0 .../jison}/udf/aggregate/variance_pop.jison | 0 .../jison}/udf/aggregate/variance_samp.jison | 0 .../impala/jison}/udf/function/extract.jison | 0 .../impala/jison}/udf/function/replace.jison | 0 .../impala/jison}/udf/function/user.jison | 0 .../impala/jison}/update/update.jison | 0 .../impala/jison}/upsert/cte_upsert.jison | 0 .../impala/jison}/upsert/upsert.jison | 0 .../ksql/jison/list}/sql_list.jison | 0 .../ksql/jison/show}/sql_show.jison | 0 .../sql/ksql => sql/ksql/jison}/sql.jisonlex | 0 .../js/parse/sql/ksql/jison/structure.json | 108 ++++ .../phoenix/jison}/sql.jisonlex | 0 .../js/parse/sql/phoenix/jison/structure.json | 116 ++++ .../phoenix/jison}/upsert/upsert.jison | 0 .../jison}/common/table_constraint.jison | 0 .../presto/jison}/create/create_common.jison | 0 .../jison}/create/create_database_no_db.jison | 0 .../presto/jison}/load/load_data.jison | 0 .../presto/jison}/msck/msck.jison | 0 .../presto => sql/presto/jison}/sql.jisonlex | 0 .../presto/jison}/sql_main.jison | 0 .../js/parse/sql/presto/jison/structure.json | 218 +++++++ .../js/parse/sql/sqlParserRepository.ts | 17 +- tools/jison/generateParsers.js | 573 +++--------------- tools/jison/package.json | 1 + tools/jison/parserDefinitions.js | 201 ++++++ tools/jison/utils.js | 30 + 272 files changed, 1181 insertions(+), 1353 deletions(-) delete mode 100644 desktop/core/src/desktop/js/parse/jison/sql/calcite/structure.json delete mode 100644 desktop/core/src/desktop/js/parse/jison/sql/dasksql/structure.json delete mode 100644 desktop/core/src/desktop/js/parse/jison/sql/flink/structure.json delete mode 100644 desktop/core/src/desktop/js/parse/jison/sql/ksql/structure.json delete mode 100644 desktop/core/src/desktop/js/parse/jison/sql/phoenix/structure.json delete mode 100644 desktop/core/src/desktop/js/parse/jison/sql/presto/structure.json rename desktop/core/src/desktop/js/parse/{jison/sql/calcite => sql/calcite/jison}/describe/describe_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/calcite => sql/calcite/jison}/quoted_table_identifier.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/calcite => sql/calcite/jison}/select/select_stream.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/calcite => sql/calcite/jison}/sql.jisonlex (100%) create mode 100644 desktop/core/src/desktop/js/parse/sql/calcite/jison/structure.json rename desktop/core/src/desktop/js/parse/{jison/sql/dasksql => sql/dasksql/jison}/create/create_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/dasksql => sql/dasksql/jison}/create/create_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/dasksql => sql/dasksql/jison}/create/create_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/dasksql => sql/dasksql/jison}/show/show.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/dasksql => sql/dasksql/jison}/sql.jisonlex (100%) create mode 100644 desktop/core/src/desktop/js/parse/sql/dasksql/jison/structure.json rename desktop/core/src/desktop/js/parse/{jison/sql/flink => sql/flink/jison}/show/sql_show.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/flink => sql/flink/jison}/sql.jisonlex (100%) create mode 100644 desktop/core/src/desktop/js/parse/sql/flink/jison/structure.json rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/alter/alter_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/alter/alter_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/alter/alter_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/autocomplete_footer.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/autocomplete_header.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/create/create_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/create/create_database.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/create/create_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/create/create_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/create/create_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/drop/drop_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/drop/drop_database.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/drop/drop_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/drop/drop_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/drop/drop_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/insert/insert.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/cte_select_statement.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/from_clause.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/group_by_clause.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/having_clause.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/joins.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/limit_clause.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/order_by_clause.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/select.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/select_conditions.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/union_clause.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/select/where_clause.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/set/set_all.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/set/set_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/set/set_option.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/sql.jisonlex (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/sql_error.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/sql_main.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/sql_valueExpression.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/structure.json (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/syntax_footer.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/syntax_header.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/truncate/truncate_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/aggregate_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/avg.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/count.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/max.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/min.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/stddev_pop.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/stddev_samp.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/sum.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/var_pop.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/var_samp.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/aggregate/variance.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/analytic/analytic.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/function/array.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/function/cast.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/function/if.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/function/map.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/function/truncate.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/udf/udf_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/update/update_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/generic => sql/generic/jison}/use/use.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/abort/abort_transactions.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/alter/alter_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/alter/alter_connector.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/alter/alter_database.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/alter/alter_index.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/alter/alter_materialized_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/alter/alter_scheduled_query.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/alter/alter_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/alter/alter_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/analyze/analyze_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/common/table_constraint.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_connector.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_database.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_function.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_index.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_materialized_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_scheduled_query.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_temporary_function.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_temporary_macro.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/create/create_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/delete/delete.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/describe/describe.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/describe/describe_connector.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/describe/describe_database.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/describe/describe_function.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_connector.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_database.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_function.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_index.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_materialized_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_scheduled_query.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_temporary_function.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_temporary_macro.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/drop/drop_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/explain/explain.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/export/export.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/grant/grant_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/grant/grant_privilege.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/grant/grant_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/grant/grant_user.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/grant/privilege_type.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/import/import.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/insert/insert.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/load/load_data.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/merge/merge.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/msck/msck.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/reload/reload.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/revoke/revoke_admin_option_for.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/revoke/revoke_all.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/revoke/revoke_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/revoke/revoke_grant_option_for.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/revoke/revoke_privilege.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/revoke/revoke_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/revoke/revoke_user.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/set/set_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/set/set_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_columns.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_compactions.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_conf.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_connectors.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_create_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_current_roles.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_databases.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_functions.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_grant.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_index.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_locks.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_materialized_views.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_partitions.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_roles.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_tables.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_tblproperties.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_transactions.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/show/show_views.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/sql.jisonlex (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/sql_error.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/sql_main.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/structure.json (69%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/truncate/truncate_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/udf/sql_aggregate.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/udf/sql_arbitrary.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/udf/sql_extract.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/hive => sql/hive/jison}/update/update.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/alter/alter_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/alter/alter_database.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/alter/alter_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/alter/alter_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/autocomplete_header.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/comment/comment_on.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/compute/compute_stats.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/create/create_aggregate_function.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/create/create_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/create/create_database.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/create/create_function.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/create/create_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/create/create_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/create/create_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/delete/delete.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/describe/describe.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/describe/describe_database.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/describe/describe_history.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/drop/drop_aggregate_function.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/drop/drop_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/drop/drop_database.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/drop/drop_function.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/drop/drop_incremental_stats.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/drop/drop_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/drop/drop_stats.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/drop/drop_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/drop/drop_view.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/grant/grant_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/grant/grant_on.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/grant/grant_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/insert/cte_insert.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/insert/insert.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/insert/insert_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/invalidate/invalidate_metadata.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/load/load_data.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/refresh/refresh.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/revoke/revoke_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/revoke/revoke_on.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/revoke/revoke_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/select/joins.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/select/limit_clause.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/select/offset_clause.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/select/order_by_clause.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/select/select.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/select/select_conditions.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/set/set.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_column_stats.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_create_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_current_roles.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_databases.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_files.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_functions.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_grant.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_partitions.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_range_partitions.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_role.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_roles.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_table_stats.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/show/show_tables.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/sql.jisonlex (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/sql_error.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/sql_main.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/sql_valueExpression.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/structure.json (68%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/syntax_header.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/truncate/truncate_table.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/aggregate/aggregate_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/aggregate/appx_median.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/aggregate/count.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/aggregate/group_concat.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/aggregate/ndv.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/aggregate/stddev.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/aggregate/sum.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/aggregate/variance_pop.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/aggregate/variance_samp.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/function/extract.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/function/replace.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/udf/function/user.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/update/update.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/upsert/cte_upsert.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/impala => sql/impala/jison}/upsert/upsert.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/ksql => sql/ksql/jison/list}/sql_list.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/ksql => sql/ksql/jison/show}/sql_show.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/ksql => sql/ksql/jison}/sql.jisonlex (100%) create mode 100644 desktop/core/src/desktop/js/parse/sql/ksql/jison/structure.json rename desktop/core/src/desktop/js/parse/{jison/sql/phoenix => sql/phoenix/jison}/sql.jisonlex (100%) create mode 100644 desktop/core/src/desktop/js/parse/sql/phoenix/jison/structure.json rename desktop/core/src/desktop/js/parse/{jison/sql/phoenix => sql/phoenix/jison}/upsert/upsert.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/presto => sql/presto/jison}/common/table_constraint.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/presto => sql/presto/jison}/create/create_common.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/presto => sql/presto/jison}/create/create_database_no_db.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/presto => sql/presto/jison}/load/load_data.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/presto => sql/presto/jison}/msck/msck.jison (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/presto => sql/presto/jison}/sql.jisonlex (100%) rename desktop/core/src/desktop/js/parse/{jison/sql/presto => sql/presto/jison}/sql_main.jison (100%) create mode 100644 desktop/core/src/desktop/js/parse/sql/presto/jison/structure.json create mode 100644 tools/jison/parserDefinitions.js create mode 100644 tools/jison/utils.js diff --git a/desktop/core/src/desktop/js/parse/jison/sql/calcite/structure.json b/desktop/core/src/desktop/js/parse/jison/sql/calcite/structure.json deleted file mode 100644 index 7456283b3d7..00000000000 --- a/desktop/core/src/desktop/js/parse/jison/sql/calcite/structure.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "lexer": "../generic/sql.jisonlex", - "autocomplete": [ - "../generic/autocomplete_header.jison", - "../generic/alter/alter_common.jison", - "../generic/alter/alter_table.jison", - "../generic/alter/alter_view.jison", - "../generic/create/create_common.jison", - "../generic/create/create_database.jison", - "../generic/create/create_role.jison", - "../generic/create/create_table.jison", - "../generic/create/create_view.jison", - "../generic/drop/drop_common.jison", - "../generic/drop/drop_database.jison", - "../generic/drop/drop_role.jison", - "../generic/drop/drop_table.jison", - "../generic/drop/drop_view.jison", - "../generic/insert/insert.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", - "../generic/select/joins.jison", - "../generic/select/limit_clause.jison", - "../generic/select/order_by_clause.jison", - "../generic/select/select.jison", - "../generic/select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", - "../generic/set/set_common.jison", - "../generic/set/set_all.jison", - "../generic/set/set_option.jison", - "../generic/truncate/truncate_table.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "../generic/update/update_table.jison", - "../generic/use/use.jison", - "../generic/sql_main.jison", - "select/select_stream.jison", - "../generic/sql_error.jison", - "../generic/sql_valueExpression.jison", - "describe/describe_table.jison", - "../generic/autocomplete_footer.jison" - ], - "syntax": [ - "../generic/syntax_header.jison", - "../generic/alter/alter_common.jison", - "../generic/alter/alter_table.jison", - "../generic/alter/alter_view.jison", - "../generic/create/create_common.jison", - "../generic/create/create_database.jison", - "../generic/create/create_role.jison", - "../generic/create/create_table.jison", - "../generic/create/create_view.jison", - "../generic/drop/drop_common.jison", - "../generic/drop/drop_database.jison", - "../generic/drop/drop_role.jison", - "../generic/drop/drop_table.jison", - "../generic/drop/drop_view.jison", - "../generic/insert/insert.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", - "../generic/select/joins.jison", - "../generic/select/limit_clause.jison", - "../generic/select/order_by_clause.jison", - "../generic/select/select.jison", - "../generic/select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", - "../generic/set/set_common.jison", - "../generic/set/set_all.jison", - "../generic/set/set_option.jison", - "../generic/truncate/truncate_table.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "../generic/update/update_table.jison", - "../generic/use/use.jison", - "../generic/sql_main.jison", - "select/select_stream.jison", - "../generic/sql_valueExpression.jison", - "describe/describe_table.jison", - "../generic/syntax_footer.jison" - ] -} diff --git a/desktop/core/src/desktop/js/parse/jison/sql/dasksql/structure.json b/desktop/core/src/desktop/js/parse/jison/sql/dasksql/structure.json deleted file mode 100644 index 9d5dfd23c2b..00000000000 --- a/desktop/core/src/desktop/js/parse/jison/sql/dasksql/structure.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "lexer": "sql.jisonlex", - "autocomplete": [ - "../generic/autocomplete_header.jison", - "create/create_common.jison", - "create/create_table.jison", - "create/create_view.jison", - "show/show.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", - "../generic/select/joins.jison", - "../generic/select/limit_clause.jison", - "../generic/select/order_by_clause.jison", - "../generic/select/select.jison", - "../generic/select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "../generic/sql_error.jison", - "../generic/sql_main.jison", - "../generic/sql_valueExpression.jison", - "../generic/autocomplete_footer.jison" - ], - "syntax": [ - "../generic/syntax_header.jison", - "create/create_common.jison", - "create/create_table.jison", - "create/create_view.jison", - "show/show.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", - "../generic/select/joins.jison", - "../generic/select/limit_clause.jison", - "../generic/select/order_by_clause.jison", - "../generic/select/select.jison", - "../generic/select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "../generic/sql_main.jison", - "../generic/sql_valueExpression.jison", - "../generic/syntax_footer.jison" - ] -} \ No newline at end of file diff --git a/desktop/core/src/desktop/js/parse/jison/sql/flink/structure.json b/desktop/core/src/desktop/js/parse/jison/sql/flink/structure.json deleted file mode 100644 index 374dc881f78..00000000000 --- a/desktop/core/src/desktop/js/parse/jison/sql/flink/structure.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "lexer": "sql.jisonlex", - "autocomplete": [ - "../generic/autocomplete_header.jison", - "../generic/alter/alter_common.jison", - "../generic/alter/alter_table.jison", - "../generic/alter/alter_view.jison", - "../generic/create/create_common.jison", - "../generic/create/create_database.jison", - "../generic/create/create_role.jison", - "../generic/create/create_table.jison", - "../generic/create/create_view.jison", - "../generic/drop/drop_common.jison", - "../generic/drop/drop_database.jison", - "../generic/drop/drop_role.jison", - "../generic/drop/drop_table.jison", - "../generic/drop/drop_view.jison", - "../generic/insert/insert.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", - "../generic/select/joins.jison", - "../generic/select/limit_clause.jison", - "../generic/select/order_by_clause.jison", - "../generic/select/select.jison", - "../generic/select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", - "../generic/set/set_common.jison", - "../generic/set/set_all.jison", - "../generic/set/set_option.jison", - "../generic/truncate/truncate_table.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "../generic/update/update_table.jison", - "../generic/use/use.jison", - "../generic/sql_error.jison", - "../generic/sql_main.jison", - "show/sql_show.jison", - "../calcite/describe/describe_table.jison", - "../generic/sql_valueExpression.jison", - "../generic/autocomplete_footer.jison" - ], - "syntax": [ - "../generic/syntax_header.jison", - "../generic/alter/alter_common.jison", - "../generic/alter/alter_table.jison", - "../generic/alter/alter_view.jison", - "../generic/create/create_common.jison", - "../generic/create/create_database.jison", - "../generic/create/create_role.jison", - "../generic/create/create_table.jison", - "../generic/create/create_view.jison", - "../generic/drop/drop_common.jison", - "../generic/drop/drop_database.jison", - "../generic/drop/drop_role.jison", - "../generic/drop/drop_table.jison", - "../generic/drop/drop_view.jison", - "../generic/insert/insert.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", - "../generic/select/joins.jison", - "../generic/select/limit_clause.jison", - "../generic/select/order_by_clause.jison", - "../generic/select/select.jison", - "../generic/select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", - "../generic/set/set_common.jison", - "../generic/set/set_all.jison", - "../generic/set/set_option.jison", - "../generic/truncate/truncate_table.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "../generic/update/update_table.jison", - "../generic/use/use.jison", - "../generic/sql_main.jison", - "show/sql_show.jison", - "../calcite/describe/describe_table.jison", - "../generic/sql_valueExpression.jison", - "../generic/syntax_footer.jison" - ] -} diff --git a/desktop/core/src/desktop/js/parse/jison/sql/ksql/structure.json b/desktop/core/src/desktop/js/parse/jison/sql/ksql/structure.json deleted file mode 100644 index b174836c508..00000000000 --- a/desktop/core/src/desktop/js/parse/jison/sql/ksql/structure.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "lexer": "sql.jisonlex", - "autocomplete": [ - "../generic/autocomplete_header.jison", - "../generic/create/create_common.jison", - "../generic/create/create_database.jison", - "../generic/create/create_role.jison", - "../generic/create/create_table.jison", - "../generic/create/create_view.jison", - "../generic/drop/drop_common.jison", - "../generic/drop/drop_database.jison", - "../generic/drop/drop_role.jison", - "../generic/drop/drop_table.jison", - "../generic/drop/drop_view.jison", - "../generic/truncate/truncate_table.jison", - "../generic/sql_error.jison", - "../generic/insert/insert.jison", - "sql_list.jison", - "../generic/sql_main.jison", - "../generic/select/select.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", - "../generic/select/joins.jison", - "../generic/select/limit_clause.jison", - "../generic/select/order_by_clause.jison", - "../generic/select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", - "../generic/set/set_common.jison", - "../generic/set/set_all.jison", - "../generic/set/set_option.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "sql_show.jison", - "../generic/sql_valueExpression.jison", - "../generic/autocomplete_footer.jison" - ], - "syntax": [ - "../generic/syntax_header.jison", - "../generic/create/create_common.jison", - "../generic/create/create_database.jison", - "../generic/create/create_role.jison", - "../generic/create/create_table.jison", - "../generic/create/create_view.jison", - "../generic/drop/drop_common.jison", - "../generic/drop/drop_database.jison", - "../generic/drop/drop_role.jison", - "../generic/drop/drop_table.jison", - "../generic/drop/drop_view.jison", - "../generic/truncate/truncate_table.jison", - "../generic/insert/insert.jison", - "sql_list.jison", - "../generic/sql_main.jison", - "../generic/select/select.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", - "../generic/select/joins.jison", - "../generic/select/limit_clause.jison", - "../generic/select/order_by_clause.jison", - "../generic/select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", - "../generic/set/set_common.jison", - "../generic/set/set_all.jison", - "../generic/set/set_option.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "sql_show.jison", - "../generic/sql_valueExpression.jison", - "../generic/syntax_footer.jison" - ] -} diff --git a/desktop/core/src/desktop/js/parse/jison/sql/phoenix/structure.json b/desktop/core/src/desktop/js/parse/jison/sql/phoenix/structure.json deleted file mode 100644 index a76af6147f8..00000000000 --- a/desktop/core/src/desktop/js/parse/jison/sql/phoenix/structure.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "lexer": "sql.jisonlex", - "autocomplete": [ - "../generic/autocomplete_header.jison", - "../generic/alter/alter_common.jison", - "../generic/alter/alter_table.jison", - "../generic/alter/alter_view.jison", - "../generic/create/create_common.jison", - "../generic/create/create_database.jison", - "../generic/create/create_role.jison", - "../generic/create/create_table.jison", - "../generic/create/create_view.jison", - "../generic/drop/drop_common.jison", - "../generic/drop/drop_database.jison", - "../generic/drop/drop_role.jison", - "../generic/drop/drop_table.jison", - "../generic/drop/drop_view.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", - "../generic/select/joins.jison", - "../generic/select/limit_clause.jison", - "../generic/select/order_by_clause.jison", - "../generic/select/select.jison", - "../generic/select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", - "../generic/set/set_common.jison", - "../generic/set/set_all.jison", - "../generic/set/set_option.jison", - "../generic/truncate/truncate_table.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "../generic/update/update_table.jison", - "../generic/use/use.jison", - "../generic/sql_error.jison", - "../generic/sql_main.jison", - "upsert/upsert.jison", - "../calcite/quoted_table_identifier.jison", - "../generic/sql_valueExpression.jison", - "../generic/autocomplete_footer.jison" - ], - "syntax": [ - "../generic/syntax_header.jison", - "../generic/alter/alter_common.jison", - "../generic/alter/alter_table.jison", - "../generic/alter/alter_view.jison", - "../generic/create/create_common.jison", - "../generic/create/create_database.jison", - "../generic/create/create_role.jison", - "../generic/create/create_table.jison", - "../generic/create/create_view.jison", - "../generic/drop/drop_common.jison", - "../generic/drop/drop_database.jison", - "../generic/drop/drop_role.jison", - "../generic/drop/drop_table.jison", - "../generic/drop/drop_view.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", - "../generic/select/joins.jison", - "../generic/select/limit_clause.jison", - "../generic/select/order_by_clause.jison", - "../generic/select/select.jison", - "../generic/select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", - "../generic/set/set_common.jison", - "../generic/set/set_all.jison", - "../generic/set/set_option.jison", - "../generic/truncate/truncate_table.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "../generic/update/update_table.jison", - "../generic/use/use.jison", - "../generic/sql_main.jison", - "upsert/upsert.jison", - "../calcite/quoted_table_identifier.jison", - "../generic/sql_valueExpression.jison", - "../generic/syntax_footer.jison" - ] -} diff --git a/desktop/core/src/desktop/js/parse/jison/sql/presto/structure.json b/desktop/core/src/desktop/js/parse/jison/sql/presto/structure.json deleted file mode 100644 index f2e7d8f0f6c..00000000000 --- a/desktop/core/src/desktop/js/parse/jison/sql/presto/structure.json +++ /dev/null @@ -1,218 +0,0 @@ -{ - "lexer": "sql.jisonlex", - "autocomplete": [ - "../generic/autocomplete_header.jison", - "../hive/abort/abort_transactions.jison", - "common/table_constraint.jison", - "../hive/alter/alter_common.jison", - "../hive/alter/alter_database.jison", - "../hive/alter/alter_index.jison", - "../hive/alter/alter_materialized_view.jison", - "../hive/alter/alter_table.jison", - "../hive/alter/alter_view.jison", - "../hive/analyze/analyze_table.jison", - "create/create_common.jison", - "../hive/create/create_database.jison", - "create/create_database_no_db.jison", - "../hive/create/create_function.jison", - "../hive/create/create_index.jison", - "../hive/create/create_role.jison", - "../hive/create/create_table.jison", - "../hive/create/create_temporary_function.jison", - "../hive/create/create_temporary_macro.jison", - "../hive/create/create_view.jison", - "../hive/delete/delete.jison", - "../hive/describe/describe.jison", - "../hive/describe/describe_database.jison", - "../hive/describe/describe_function.jison", - "../hive/drop/drop_common.jison", - "../hive/drop/drop_database.jison", - "../hive/drop/drop_function.jison", - "../hive/drop/drop_index.jison", - "../hive/drop/drop_materialized_view.jison", - "../hive/drop/drop_role.jison", - "../hive/drop/drop_table.jison", - "../hive/drop/drop_temporary_function.jison", - "../hive/drop/drop_temporary_macro.jison", - "../hive/drop/drop_view.jison", - "../hive/export/export.jison", - "../hive/grant/grant_common.jison", - "../hive/grant/grant_privilege.jison", - "../hive/grant/grant_role.jison", - "../hive/grant/grant_user.jison", - "../hive/grant/privilege_type.jison", - "../hive/import/import.jison", - "../impala/insert/cte_insert.jison", - "../hive/insert/insert.jison", - "load/load_data.jison", - "../hive/merge/merge.jison", - "msck/msck.jison", - "../hive/reload/reload.jison", - "../hive/revoke/revoke_admin_option_for.jison", - "../hive/revoke/revoke_all.jison", - "../hive/revoke/revoke_common.jison", - "../hive/revoke/revoke_grant_option_for.jison", - "../hive/revoke/revoke_privilege.jison", - "../hive/revoke/revoke_role.jison", - "../hive/revoke/revoke_user.jison", - "../generic/set/set_all.jison", - "../hive/set/set_common.jison", - "../generic/set/set_option.jison", - "../hive/set/set_role.jison", - "../hive/show/show_columns.jison", - "../hive/show/show_common.jison", - "../hive/show/show_compactions.jison", - "../hive/show/show_conf.jison", - "../hive/show/show_create_table.jison", - "../hive/show/show_current_roles.jison", - "../hive/show/show_databases.jison", - "../hive/show/show_functions.jison", - "../hive/show/show_grant.jison", - "../hive/show/show_index.jison", - "../hive/show/show_locks.jison", - "../hive/show/show_materialized_views.jison", - "../hive/show/show_partitions.jison", - "../hive/show/show_role.jison", - "../hive/show/show_roles.jison", - "../hive/show/show_table.jison", - "../hive/show/show_tables.jison", - "../hive/show/show_tblproperties.jison", - "../hive/show/show_transactions.jison", - "../hive/show/show_views.jison", - "../hive/truncate/truncate_table.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "../hive/udf/sql_aggregate.jison", - "../hive/udf/sql_arbitrary.jison", - "../hive/udf/sql_extract.jison", - "../hive/update/update.jison", - "../generic/use/use.jison", - "../generic/sql_valueExpression.jison", - "../hive/sql_error.jison", - "sql_main.jison", - "../generic/autocomplete_footer.jison" - ], - "syntax": [ - "../generic/syntax_header.jison", - "../hive/abort/abort_transactions.jison", - "common/table_constraint.jison", - "../hive/alter/alter_common.jison", - "../hive/alter/alter_database.jison", - "../hive/alter/alter_index.jison", - "../hive/alter/alter_materialized_view.jison", - "../hive/alter/alter_table.jison", - "../hive/alter/alter_view.jison", - "../hive/analyze/analyze_table.jison", - "create/create_common.jison", - "../hive/create/create_database.jison", - "create/create_database_no_db.jison", - "../hive/create/create_function.jison", - "../hive/create/create_index.jison", - "../hive/create/create_role.jison", - "../hive/create/create_table.jison", - "../hive/create/create_temporary_function.jison", - "../hive/create/create_temporary_macro.jison", - "../hive/create/create_view.jison", - "../hive/delete/delete.jison", - "../hive/describe/describe.jison", - "../hive/describe/describe_database.jison", - "../hive/describe/describe_function.jison", - "../hive/drop/drop_common.jison", - "../hive/drop/drop_database.jison", - "../hive/drop/drop_function.jison", - "../hive/drop/drop_index.jison", - "../hive/drop/drop_materialized_view.jison", - "../hive/drop/drop_role.jison", - "../hive/drop/drop_table.jison", - "../hive/drop/drop_temporary_function.jison", - "../hive/drop/drop_temporary_macro.jison", - "../hive/drop/drop_view.jison", - "../hive/export/export.jison", - "../hive/grant/grant_common.jison", - "../hive/grant/grant_privilege.jison", - "../hive/grant/grant_role.jison", - "../hive/grant/grant_user.jison", - "../hive/grant/privilege_type.jison", - "../hive/import/import.jison", - "../impala/insert/cte_insert.jison", - "../hive/insert/insert.jison", - "load/load_data.jison", - "../hive/merge/merge.jison", - "msck/msck.jison", - "../hive/reload/reload.jison", - "../hive/revoke/revoke_admin_option_for.jison", - "../hive/revoke/revoke_all.jison", - "../hive/revoke/revoke_common.jison", - "../hive/revoke/revoke_grant_option_for.jison", - "../hive/revoke/revoke_privilege.jison", - "../hive/revoke/revoke_role.jison", - "../hive/revoke/revoke_user.jison", - "../generic/set/set_all.jison", - "../hive/set/set_common.jison", - "../generic/set/set_option.jison", - "../hive/set/set_role.jison", - "../hive/show/show_columns.jison", - "../hive/show/show_common.jison", - "../hive/show/show_compactions.jison", - "../hive/show/show_conf.jison", - "../hive/show/show_create_table.jison", - "../hive/show/show_current_roles.jison", - "../hive/show/show_databases.jison", - "../hive/show/show_functions.jison", - "../hive/show/show_grant.jison", - "../hive/show/show_index.jison", - "../hive/show/show_locks.jison", - "../hive/show/show_materialized_views.jison", - "../hive/show/show_partitions.jison", - "../hive/show/show_role.jison", - "../hive/show/show_roles.jison", - "../hive/show/show_table.jison", - "../hive/show/show_tables.jison", - "../hive/show/show_tblproperties.jison", - "../hive/show/show_transactions.jison", - "../hive/show/show_views.jison", - "../hive/truncate/truncate_table.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", - "../hive/udf/sql_aggregate.jison", - "../hive/udf/sql_arbitrary.jison", - "../hive/udf/sql_extract.jison", - "../hive/update/update.jison", - "../generic/use/use.jison", - "../generic/sql_valueExpression.jison", - "sql_main.jison", - "../generic/syntax_footer.jison" - ] -} diff --git a/desktop/core/src/desktop/js/parse/jison/sql/calcite/describe/describe_table.jison b/desktop/core/src/desktop/js/parse/sql/calcite/jison/describe/describe_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/calcite/describe/describe_table.jison rename to desktop/core/src/desktop/js/parse/sql/calcite/jison/describe/describe_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/calcite/quoted_table_identifier.jison b/desktop/core/src/desktop/js/parse/sql/calcite/jison/quoted_table_identifier.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/calcite/quoted_table_identifier.jison rename to desktop/core/src/desktop/js/parse/sql/calcite/jison/quoted_table_identifier.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/calcite/select/select_stream.jison b/desktop/core/src/desktop/js/parse/sql/calcite/jison/select/select_stream.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/calcite/select/select_stream.jison rename to desktop/core/src/desktop/js/parse/sql/calcite/jison/select/select_stream.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/calcite/sql.jisonlex b/desktop/core/src/desktop/js/parse/sql/calcite/jison/sql.jisonlex similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/calcite/sql.jisonlex rename to desktop/core/src/desktop/js/parse/sql/calcite/jison/sql.jisonlex diff --git a/desktop/core/src/desktop/js/parse/sql/calcite/jison/structure.json b/desktop/core/src/desktop/js/parse/sql/calcite/jison/structure.json new file mode 100644 index 00000000000..d853dfbb848 --- /dev/null +++ b/desktop/core/src/desktop/js/parse/sql/calcite/jison/structure.json @@ -0,0 +1,118 @@ +{ + "lexer": "../../generic/jison/sql.jisonlex", + "autocomplete": [ + "../../generic/jison/autocomplete_header.jison", + "../../generic/jison/alter/alter_common.jison", + "../../generic/jison/alter/alter_table.jison", + "../../generic/jison/alter/alter_view.jison", + "../../generic/jison/create/create_common.jison", + "../../generic/jison/create/create_database.jison", + "../../generic/jison/create/create_role.jison", + "../../generic/jison/create/create_table.jison", + "../../generic/jison/create/create_view.jison", + "../../generic/jison/drop/drop_common.jison", + "../../generic/jison/drop/drop_database.jison", + "../../generic/jison/drop/drop_role.jison", + "../../generic/jison/drop/drop_table.jison", + "../../generic/jison/drop/drop_view.jison", + "../../generic/jison/insert/insert.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", + "../../generic/jison/select/joins.jison", + "../../generic/jison/select/limit_clause.jison", + "../../generic/jison/select/order_by_clause.jison", + "../../generic/jison/select/select.jison", + "../../generic/jison/select/select_conditions.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", + "../../generic/jison/set/set_common.jison", + "../../generic/jison/set/set_all.jison", + "../../generic/jison/set/set_option.jison", + "../../generic/jison/truncate/truncate_table.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "../../generic/jison/update/update_table.jison", + "../../generic/jison/use/use.jison", + "../../generic/jison/sql_main.jison", + "select/select_stream.jison", + "../../generic/jison/sql_error.jison", + "../../generic/jison/sql_valueExpression.jison", + "describe/describe_table.jison", + "../../generic/jison/autocomplete_footer.jison" + ], + "syntax": [ + "../../generic/jison/syntax_header.jison", + "../../generic/jison/alter/alter_common.jison", + "../../generic/jison/alter/alter_table.jison", + "../../generic/jison/alter/alter_view.jison", + "../../generic/jison/create/create_common.jison", + "../../generic/jison/create/create_database.jison", + "../../generic/jison/create/create_role.jison", + "../../generic/jison/create/create_table.jison", + "../../generic/jison/create/create_view.jison", + "../../generic/jison/drop/drop_common.jison", + "../../generic/jison/drop/drop_database.jison", + "../../generic/jison/drop/drop_role.jison", + "../../generic/jison/drop/drop_table.jison", + "../../generic/jison/drop/drop_view.jison", + "../../generic/jison/insert/insert.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", + "../../generic/jison/select/joins.jison", + "../../generic/jison/select/limit_clause.jison", + "../../generic/jison/select/order_by_clause.jison", + "../../generic/jison/select/select.jison", + "../../generic/jison/select/select_conditions.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", + "../../generic/jison/set/set_common.jison", + "../../generic/jison/set/set_all.jison", + "../../generic/jison/set/set_option.jison", + "../../generic/jison/truncate/truncate_table.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "../../generic/jison/update/update_table.jison", + "../../generic/jison/use/use.jison", + "../../generic/jison/sql_main.jison", + "select/select_stream.jison", + "../../generic/jison/sql_valueExpression.jison", + "describe/describe_table.jison", + "../../generic/jison/syntax_footer.jison" + ] +} diff --git a/desktop/core/src/desktop/js/parse/jison/sql/dasksql/create/create_common.jison b/desktop/core/src/desktop/js/parse/sql/dasksql/jison/create/create_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/dasksql/create/create_common.jison rename to desktop/core/src/desktop/js/parse/sql/dasksql/jison/create/create_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/dasksql/create/create_table.jison b/desktop/core/src/desktop/js/parse/sql/dasksql/jison/create/create_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/dasksql/create/create_table.jison rename to desktop/core/src/desktop/js/parse/sql/dasksql/jison/create/create_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/dasksql/create/create_view.jison b/desktop/core/src/desktop/js/parse/sql/dasksql/jison/create/create_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/dasksql/create/create_view.jison rename to desktop/core/src/desktop/js/parse/sql/dasksql/jison/create/create_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/dasksql/show/show.jison b/desktop/core/src/desktop/js/parse/sql/dasksql/jison/show/show.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/dasksql/show/show.jison rename to desktop/core/src/desktop/js/parse/sql/dasksql/jison/show/show.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/dasksql/sql.jisonlex b/desktop/core/src/desktop/js/parse/sql/dasksql/jison/sql.jisonlex similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/dasksql/sql.jisonlex rename to desktop/core/src/desktop/js/parse/sql/dasksql/jison/sql.jisonlex diff --git a/desktop/core/src/desktop/js/parse/sql/dasksql/jison/structure.json b/desktop/core/src/desktop/js/parse/sql/dasksql/jison/structure.json new file mode 100644 index 00000000000..a80fdeed101 --- /dev/null +++ b/desktop/core/src/desktop/js/parse/sql/dasksql/jison/structure.json @@ -0,0 +1,82 @@ +{ + "lexer": "sql.jisonlex", + "autocomplete": [ + "../../generic/jison/autocomplete_header.jison", + "create/create_common.jison", + "create/create_table.jison", + "create/create_view.jison", + "show/show.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", + "../../generic/jison/select/joins.jison", + "../../generic/jison/select/limit_clause.jison", + "../../generic/jison/select/order_by_clause.jison", + "../../generic/jison/select/select.jison", + "../../generic/jison/select/select_conditions.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "../../generic/jison/sql_error.jison", + "../../generic/jison/sql_main.jison", + "../../generic/jison/sql_valueExpression.jison", + "../../generic/jison/autocomplete_footer.jison" + ], + "syntax": [ + "../../generic/jison/syntax_header.jison", + "create/create_common.jison", + "create/create_table.jison", + "create/create_view.jison", + "show/show.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", + "../../generic/jison/select/joins.jison", + "../../generic/jison/select/limit_clause.jison", + "../../generic/jison/select/order_by_clause.jison", + "../../generic/jison/select/select.jison", + "../../generic/jison/select/select_conditions.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "../../generic/jison/sql_main.jison", + "../../generic/jison/sql_valueExpression.jison", + "../../generic/jison/syntax_footer.jison" + ] +} \ No newline at end of file diff --git a/desktop/core/src/desktop/js/parse/jison/sql/flink/show/sql_show.jison b/desktop/core/src/desktop/js/parse/sql/flink/jison/show/sql_show.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/flink/show/sql_show.jison rename to desktop/core/src/desktop/js/parse/sql/flink/jison/show/sql_show.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/flink/sql.jisonlex b/desktop/core/src/desktop/js/parse/sql/flink/jison/sql.jisonlex similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/flink/sql.jisonlex rename to desktop/core/src/desktop/js/parse/sql/flink/jison/sql.jisonlex diff --git a/desktop/core/src/desktop/js/parse/sql/flink/jison/structure.json b/desktop/core/src/desktop/js/parse/sql/flink/jison/structure.json new file mode 100644 index 00000000000..2776a7c29ae --- /dev/null +++ b/desktop/core/src/desktop/js/parse/sql/flink/jison/structure.json @@ -0,0 +1,118 @@ +{ + "lexer": "sql.jisonlex", + "autocomplete": [ + "../../generic/jison/autocomplete_header.jison", + "../../generic/jison/alter/alter_common.jison", + "../../generic/jison/alter/alter_table.jison", + "../../generic/jison/alter/alter_view.jison", + "../../generic/jison/create/create_common.jison", + "../../generic/jison/create/create_database.jison", + "../../generic/jison/create/create_role.jison", + "../../generic/jison/create/create_table.jison", + "../../generic/jison/create/create_view.jison", + "../../generic/jison/drop/drop_common.jison", + "../../generic/jison/drop/drop_database.jison", + "../../generic/jison/drop/drop_role.jison", + "../../generic/jison/drop/drop_table.jison", + "../../generic/jison/drop/drop_view.jison", + "../../generic/jison/insert/insert.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", + "../../generic/jison/select/joins.jison", + "../../generic/jison/select/limit_clause.jison", + "../../generic/jison/select/order_by_clause.jison", + "../../generic/jison/select/select.jison", + "../../generic/jison/select/select_conditions.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", + "../../generic/jison/set/set_common.jison", + "../../generic/jison/set/set_all.jison", + "../../generic/jison/set/set_option.jison", + "../../generic/jison/truncate/truncate_table.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "../../generic/jison/update/update_table.jison", + "../../generic/jison/use/use.jison", + "../../generic/jison/sql_error.jison", + "../../generic/jison/sql_main.jison", + "show/sql_show.jison", + "../../calcite/jison/describe/describe_table.jison", + "../../generic/jison/sql_valueExpression.jison", + "../../generic/jison/autocomplete_footer.jison" + ], + "syntax": [ + "../../generic/jison/syntax_header.jison", + "../../generic/jison/alter/alter_common.jison", + "../../generic/jison/alter/alter_table.jison", + "../../generic/jison/alter/alter_view.jison", + "../../generic/jison/create/create_common.jison", + "../../generic/jison/create/create_database.jison", + "../../generic/jison/create/create_role.jison", + "../../generic/jison/create/create_table.jison", + "../../generic/jison/create/create_view.jison", + "../../generic/jison/drop/drop_common.jison", + "../../generic/jison/drop/drop_database.jison", + "../../generic/jison/drop/drop_role.jison", + "../../generic/jison/drop/drop_table.jison", + "../../generic/jison/drop/drop_view.jison", + "../../generic/jison/insert/insert.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", + "../../generic/jison/select/joins.jison", + "../../generic/jison/select/limit_clause.jison", + "../../generic/jison/select/order_by_clause.jison", + "../../generic/jison/select/select.jison", + "../../generic/jison/select/select_conditions.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", + "../../generic/jison/set/set_common.jison", + "../../generic/jison/set/set_all.jison", + "../../generic/jison/set/set_option.jison", + "../../generic/jison/truncate/truncate_table.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "../../generic/jison/update/update_table.jison", + "../../generic/jison/use/use.jison", + "../../generic/jison/sql_main.jison", + "show/sql_show.jison", + "../../calcite/jison/describe/describe_table.jison", + "../../generic/jison/sql_valueExpression.jison", + "../../generic/jison/syntax_footer.jison" + ] +} diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/alter/alter_common.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/alter/alter_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/alter/alter_common.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/alter/alter_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/alter/alter_table.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/alter/alter_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/alter/alter_table.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/alter/alter_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/alter/alter_view.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/alter/alter_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/alter/alter_view.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/alter/alter_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/autocomplete_footer.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/autocomplete_footer.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/autocomplete_footer.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/autocomplete_footer.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/autocomplete_header.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/autocomplete_header.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/autocomplete_header.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/autocomplete_header.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/create/create_common.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/create/create_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/create/create_common.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/create/create_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/create/create_database.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/create/create_database.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/create/create_database.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/create/create_database.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/create/create_role.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/create/create_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/create/create_role.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/create/create_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/create/create_table.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/create/create_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/create/create_table.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/create/create_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/create/create_view.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/create/create_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/create/create_view.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/create/create_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/drop/drop_common.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/drop/drop_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/drop/drop_common.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/drop/drop_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/drop/drop_database.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/drop/drop_database.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/drop/drop_database.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/drop/drop_database.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/drop/drop_role.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/drop/drop_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/drop/drop_role.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/drop/drop_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/drop/drop_table.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/drop/drop_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/drop/drop_table.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/drop/drop_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/drop/drop_view.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/drop/drop_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/drop/drop_view.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/drop/drop_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/insert/insert.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/insert/insert.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/insert/insert.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/insert/insert.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/cte_select_statement.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/cte_select_statement.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/cte_select_statement.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/cte_select_statement.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/from_clause.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/from_clause.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/from_clause.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/from_clause.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/group_by_clause.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/group_by_clause.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/group_by_clause.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/group_by_clause.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/having_clause.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/having_clause.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/having_clause.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/having_clause.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/joins.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/joins.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/joins.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/joins.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/limit_clause.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/limit_clause.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/limit_clause.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/limit_clause.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/order_by_clause.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/order_by_clause.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/order_by_clause.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/order_by_clause.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/select.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/select.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/select.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/select.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/select_conditions.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/select_conditions.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/select_conditions.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/select_conditions.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/union_clause.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/union_clause.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/union_clause.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/union_clause.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/select/where_clause.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/select/where_clause.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/select/where_clause.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/select/where_clause.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/set/set_all.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/set/set_all.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/set/set_all.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/set/set_all.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/set/set_common.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/set/set_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/set/set_common.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/set/set_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/set/set_option.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/set/set_option.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/set/set_option.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/set/set_option.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/sql.jisonlex b/desktop/core/src/desktop/js/parse/sql/generic/jison/sql.jisonlex similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/sql.jisonlex rename to desktop/core/src/desktop/js/parse/sql/generic/jison/sql.jisonlex diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/sql_error.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/sql_error.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/sql_error.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/sql_error.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/sql_main.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/sql_main.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/sql_main.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/sql_main.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/sql_valueExpression.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/sql_valueExpression.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/sql_valueExpression.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/sql_valueExpression.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/structure.json b/desktop/core/src/desktop/js/parse/sql/generic/jison/structure.json similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/structure.json rename to desktop/core/src/desktop/js/parse/sql/generic/jison/structure.json diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/syntax_footer.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/syntax_footer.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/syntax_footer.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/syntax_footer.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/syntax_header.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/syntax_header.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/syntax_header.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/syntax_header.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/truncate/truncate_table.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/truncate/truncate_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/truncate/truncate_table.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/truncate/truncate_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/aggregate_common.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/aggregate_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/aggregate_common.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/aggregate_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/avg.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/avg.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/avg.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/avg.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/count.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/count.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/count.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/count.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/max.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/max.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/max.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/max.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/min.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/min.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/min.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/min.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/stddev_pop.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/stddev_pop.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/stddev_pop.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/stddev_pop.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/stddev_samp.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/stddev_samp.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/stddev_samp.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/stddev_samp.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/sum.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/sum.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/sum.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/sum.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/var_pop.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/var_pop.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/var_pop.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/var_pop.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/var_samp.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/var_samp.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/var_samp.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/var_samp.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/variance.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/variance.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/aggregate/variance.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/aggregate/variance.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/analytic/analytic.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/analytic/analytic.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/analytic/analytic.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/analytic/analytic.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/function/array.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/function/array.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/function/array.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/function/array.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/function/cast.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/function/cast.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/function/cast.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/function/cast.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/function/if.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/function/if.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/function/if.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/function/if.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/function/map.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/function/map.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/function/map.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/function/map.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/function/truncate.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/function/truncate.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/function/truncate.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/function/truncate.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/udf/udf_common.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/udf/udf_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/udf/udf_common.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/udf/udf_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/update/update_table.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/update/update_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/update/update_table.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/update/update_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/generic/use/use.jison b/desktop/core/src/desktop/js/parse/sql/generic/jison/use/use.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/generic/use/use.jison rename to desktop/core/src/desktop/js/parse/sql/generic/jison/use/use.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/abort/abort_transactions.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/abort/abort_transactions.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/abort/abort_transactions.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/abort/abort_transactions.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_common.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_common.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_connector.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_connector.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_connector.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_connector.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_database.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_database.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_database.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_database.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_index.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_index.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_index.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_index.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_materialized_view.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_materialized_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_materialized_view.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_materialized_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_scheduled_query.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_scheduled_query.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_scheduled_query.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_scheduled_query.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_table.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_table.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_view.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/alter/alter_view.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/alter/alter_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/analyze/analyze_table.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/analyze/analyze_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/analyze/analyze_table.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/analyze/analyze_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/common/table_constraint.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/common/table_constraint.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/common/table_constraint.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/common/table_constraint.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_common.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_common.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_connector.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_connector.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_connector.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_connector.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_database.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_database.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_database.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_database.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_function.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_function.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_function.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_function.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_index.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_index.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_index.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_index.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_materialized_view.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_materialized_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_materialized_view.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_materialized_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_role.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_role.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_scheduled_query.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_scheduled_query.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_scheduled_query.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_scheduled_query.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_table.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_table.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_temporary_function.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_temporary_function.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_temporary_function.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_temporary_function.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_temporary_macro.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_temporary_macro.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_temporary_macro.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_temporary_macro.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_view.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/create/create_view.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/create/create_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/delete/delete.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/delete/delete.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/delete/delete.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/delete/delete.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/describe/describe.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/describe/describe.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/describe/describe.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/describe/describe.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/describe/describe_connector.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/describe/describe_connector.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/describe/describe_connector.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/describe/describe_connector.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/describe/describe_database.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/describe/describe_database.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/describe/describe_database.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/describe/describe_database.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/describe/describe_function.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/describe/describe_function.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/describe/describe_function.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/describe/describe_function.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_common.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_common.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_connector.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_connector.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_connector.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_connector.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_database.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_database.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_database.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_database.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_function.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_function.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_function.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_function.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_index.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_index.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_index.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_index.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_materialized_view.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_materialized_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_materialized_view.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_materialized_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_role.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_role.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_scheduled_query.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_scheduled_query.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_scheduled_query.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_scheduled_query.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_table.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_table.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_temporary_function.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_temporary_function.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_temporary_function.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_temporary_function.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_temporary_macro.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_temporary_macro.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_temporary_macro.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_temporary_macro.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_view.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/drop/drop_view.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/drop/drop_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/explain/explain.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/explain/explain.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/explain/explain.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/explain/explain.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/export/export.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/export/export.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/export/export.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/export/export.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/grant/grant_common.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/grant/grant_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/grant/grant_common.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/grant/grant_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/grant/grant_privilege.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/grant/grant_privilege.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/grant/grant_privilege.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/grant/grant_privilege.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/grant/grant_role.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/grant/grant_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/grant/grant_role.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/grant/grant_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/grant/grant_user.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/grant/grant_user.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/grant/grant_user.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/grant/grant_user.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/grant/privilege_type.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/grant/privilege_type.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/grant/privilege_type.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/grant/privilege_type.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/import/import.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/import/import.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/import/import.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/import/import.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/insert/insert.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/insert/insert.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/insert/insert.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/insert/insert.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/load/load_data.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/load/load_data.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/load/load_data.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/load/load_data.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/merge/merge.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/merge/merge.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/merge/merge.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/merge/merge.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/msck/msck.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/msck/msck.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/msck/msck.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/msck/msck.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/reload/reload.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/reload/reload.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/reload/reload.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/reload/reload.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_admin_option_for.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_admin_option_for.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_admin_option_for.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_admin_option_for.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_all.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_all.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_all.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_all.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_common.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_common.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_grant_option_for.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_grant_option_for.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_grant_option_for.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_grant_option_for.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_privilege.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_privilege.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_privilege.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_privilege.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_role.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_role.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_user.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_user.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/revoke/revoke_user.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/revoke/revoke_user.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/set/set_common.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/set/set_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/set/set_common.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/set/set_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/set/set_role.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/set/set_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/set/set_role.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/set/set_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_columns.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_columns.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_columns.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_columns.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_common.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_common.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_compactions.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_compactions.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_compactions.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_compactions.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_conf.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_conf.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_conf.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_conf.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_connectors.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_connectors.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_connectors.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_connectors.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_create_table.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_create_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_create_table.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_create_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_current_roles.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_current_roles.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_current_roles.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_current_roles.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_databases.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_databases.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_databases.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_databases.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_functions.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_functions.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_functions.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_functions.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_grant.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_grant.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_grant.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_grant.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_index.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_index.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_index.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_index.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_locks.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_locks.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_locks.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_locks.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_materialized_views.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_materialized_views.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_materialized_views.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_materialized_views.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_partitions.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_partitions.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_partitions.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_partitions.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_role.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_role.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_roles.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_roles.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_roles.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_roles.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_table.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_table.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_tables.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_tables.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_tables.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_tables.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_tblproperties.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_tblproperties.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_tblproperties.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_tblproperties.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_transactions.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_transactions.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_transactions.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_transactions.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_views.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_views.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/show/show_views.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/show/show_views.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/sql.jisonlex b/desktop/core/src/desktop/js/parse/sql/hive/jison/sql.jisonlex similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/sql.jisonlex rename to desktop/core/src/desktop/js/parse/sql/hive/jison/sql.jisonlex diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/sql_error.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/sql_error.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/sql_error.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/sql_error.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/sql_main.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/sql_main.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/sql_main.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/sql_main.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/structure.json b/desktop/core/src/desktop/js/parse/sql/hive/jison/structure.json similarity index 69% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/structure.json rename to desktop/core/src/desktop/js/parse/sql/hive/jison/structure.json index 65a64920ace..b31cae6d669 100644 --- a/desktop/core/src/desktop/js/parse/jison/sql/hive/structure.json +++ b/desktop/core/src/desktop/js/parse/sql/hive/jison/structure.json @@ -1,7 +1,7 @@ { "lexer": "sql.jisonlex", "autocomplete": [ - "../generic/autocomplete_header.jison", + "../../generic/jison/autocomplete_header.jison", "abort/abort_transactions.jison", "common/table_constraint.jison", "alter/alter_common.jison", @@ -50,7 +50,7 @@ "grant/grant_user.jison", "grant/privilege_type.jison", "import/import.jison", - "../impala/insert/cte_insert.jison", + "../../impala/jison/insert/cte_insert.jison", "insert/insert.jison", "load/load_data.jison", "merge/merge.jison", @@ -63,9 +63,9 @@ "revoke/revoke_privilege.jison", "revoke/revoke_role.jison", "revoke/revoke_user.jison", - "../generic/set/set_all.jison", + "../../generic/jison/set/set_all.jison", "set/set_common.jison", - "../generic/set/set_option.jison", + "../../generic/jison/set/set_option.jison", "set/set_role.jison", "show/show_columns.jison", "show/show_common.jison", @@ -89,36 +89,36 @@ "show/show_transactions.jison", "show/show_views.jison", "truncate/truncate_table.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", "update/update.jison", "udf/sql_aggregate.jison", "udf/sql_arbitrary.jison", "udf/sql_extract.jison", - "../generic/use/use.jison", - "../generic/sql_valueExpression.jison", + "../../generic/jison/use/use.jison", + "../../generic/jison/sql_valueExpression.jison", "sql_error.jison", "sql_main.jison", - "../generic/autocomplete_footer.jison" + "../../generic/jison/autocomplete_footer.jison" ], "syntax": [ - "../generic/syntax_header.jison", + "../../generic/jison/syntax_header.jison", "abort/abort_transactions.jison", "common/table_constraint.jison", "alter/alter_common.jison", @@ -167,7 +167,7 @@ "grant/grant_user.jison", "grant/privilege_type.jison", "import/import.jison", - "../impala/insert/cte_insert.jison", + "../../impala/jison/insert/cte_insert.jison", "insert/insert.jison", "load/load_data.jison", "merge/merge.jison", @@ -180,9 +180,9 @@ "revoke/revoke_privilege.jison", "revoke/revoke_role.jison", "revoke/revoke_user.jison", - "../generic/set/set_all.jison", + "../../generic/jison/set/set_all.jison", "set/set_common.jison", - "../generic/set/set_option.jison", + "../../generic/jison/set/set_option.jison", "set/set_role.jison", "show/show_columns.jison", "show/show_common.jison", @@ -206,31 +206,31 @@ "show/show_transactions.jison", "show/show_views.jison", "truncate/truncate_table.jison", - "../generic/udf/aggregate/aggregate_common.jison", - "../generic/udf/aggregate/avg.jison", - "../generic/udf/aggregate/count.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", - "../generic/udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", - "../generic/udf/function/truncate.jison", - "../generic/udf/udf_common.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", "update/update.jison", "udf/sql_aggregate.jison", "udf/sql_arbitrary.jison", "udf/sql_extract.jison", - "../generic/use/use.jison", - "../generic/sql_valueExpression.jison", + "../../generic/jison/use/use.jison", + "../../generic/jison/sql_valueExpression.jison", "sql_main.jison", - "../generic/syntax_footer.jison" + "../../generic/jison/syntax_footer.jison" ] } diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/truncate/truncate_table.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/truncate/truncate_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/truncate/truncate_table.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/truncate/truncate_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/udf/sql_aggregate.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/udf/sql_aggregate.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/udf/sql_aggregate.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/udf/sql_aggregate.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/udf/sql_arbitrary.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/udf/sql_arbitrary.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/udf/sql_arbitrary.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/udf/sql_arbitrary.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/udf/sql_extract.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/udf/sql_extract.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/udf/sql_extract.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/udf/sql_extract.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/hive/update/update.jison b/desktop/core/src/desktop/js/parse/sql/hive/jison/update/update.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/hive/update/update.jison rename to desktop/core/src/desktop/js/parse/sql/hive/jison/update/update.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/alter/alter_common.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/alter/alter_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/alter/alter_common.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/alter/alter_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/alter/alter_database.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/alter/alter_database.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/alter/alter_database.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/alter/alter_database.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/alter/alter_table.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/alter/alter_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/alter/alter_table.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/alter/alter_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/alter/alter_view.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/alter/alter_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/alter/alter_view.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/alter/alter_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/autocomplete_header.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/autocomplete_header.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/autocomplete_header.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/autocomplete_header.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/comment/comment_on.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/comment/comment_on.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/comment/comment_on.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/comment/comment_on.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/compute/compute_stats.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/compute/compute_stats.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/compute/compute_stats.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/compute/compute_stats.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_aggregate_function.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_aggregate_function.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_aggregate_function.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_aggregate_function.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_common.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_common.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_database.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_database.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_database.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_database.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_function.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_function.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_function.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_function.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_role.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_role.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_table.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_table.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_view.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/create/create_view.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/create/create_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/delete/delete.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/delete/delete.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/delete/delete.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/delete/delete.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/describe/describe.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/describe/describe.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/describe/describe.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/describe/describe.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/describe/describe_database.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/describe/describe_database.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/describe/describe_database.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/describe/describe_database.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/describe/describe_history.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/describe/describe_history.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/describe/describe_history.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/describe/describe_history.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_aggregate_function.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_aggregate_function.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_aggregate_function.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_aggregate_function.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_common.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_common.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_database.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_database.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_database.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_database.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_function.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_function.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_function.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_function.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_incremental_stats.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_incremental_stats.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_incremental_stats.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_incremental_stats.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_role.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_role.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_stats.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_stats.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_stats.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_stats.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_table.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_table.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_view.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_view.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/drop/drop_view.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/drop/drop_view.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/grant/grant_common.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/grant/grant_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/grant/grant_common.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/grant/grant_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/grant/grant_on.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/grant/grant_on.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/grant/grant_on.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/grant/grant_on.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/grant/grant_role.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/grant/grant_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/grant/grant_role.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/grant/grant_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/insert/cte_insert.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/insert/cte_insert.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/insert/cte_insert.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/insert/cte_insert.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/insert/insert.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/insert/insert.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/insert/insert.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/insert/insert.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/insert/insert_common.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/insert/insert_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/insert/insert_common.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/insert/insert_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/invalidate/invalidate_metadata.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/invalidate/invalidate_metadata.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/invalidate/invalidate_metadata.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/invalidate/invalidate_metadata.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/load/load_data.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/load/load_data.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/load/load_data.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/load/load_data.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/refresh/refresh.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/refresh/refresh.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/refresh/refresh.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/refresh/refresh.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/revoke/revoke_common.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/revoke/revoke_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/revoke/revoke_common.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/revoke/revoke_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/revoke/revoke_on.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/revoke/revoke_on.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/revoke/revoke_on.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/revoke/revoke_on.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/revoke/revoke_role.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/revoke/revoke_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/revoke/revoke_role.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/revoke/revoke_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/select/joins.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/select/joins.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/select/joins.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/select/joins.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/select/limit_clause.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/select/limit_clause.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/select/limit_clause.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/select/limit_clause.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/select/offset_clause.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/select/offset_clause.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/select/offset_clause.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/select/offset_clause.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/select/order_by_clause.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/select/order_by_clause.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/select/order_by_clause.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/select/order_by_clause.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/select/select.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/select/select.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/select/select.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/select/select.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/select/select_conditions.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/select/select_conditions.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/select/select_conditions.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/select/select_conditions.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/set/set.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/set/set.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/set/set.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/set/set.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_column_stats.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_column_stats.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_column_stats.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_column_stats.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_common.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_common.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_create_table.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_create_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_create_table.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_create_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_current_roles.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_current_roles.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_current_roles.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_current_roles.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_databases.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_databases.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_databases.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_databases.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_files.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_files.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_files.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_files.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_functions.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_functions.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_functions.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_functions.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_grant.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_grant.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_grant.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_grant.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_partitions.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_partitions.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_partitions.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_partitions.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_range_partitions.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_range_partitions.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_range_partitions.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_range_partitions.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_role.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_role.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_role.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_role.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_roles.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_roles.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_roles.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_roles.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_table_stats.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_table_stats.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_table_stats.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_table_stats.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_tables.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_tables.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/show/show_tables.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/show/show_tables.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/sql.jisonlex b/desktop/core/src/desktop/js/parse/sql/impala/jison/sql.jisonlex similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/sql.jisonlex rename to desktop/core/src/desktop/js/parse/sql/impala/jison/sql.jisonlex diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/sql_error.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/sql_error.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/sql_error.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/sql_error.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/sql_main.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/sql_main.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/sql_main.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/sql_main.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/sql_valueExpression.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/sql_valueExpression.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/sql_valueExpression.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/sql_valueExpression.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/structure.json b/desktop/core/src/desktop/js/parse/sql/impala/jison/structure.json similarity index 68% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/structure.json rename to desktop/core/src/desktop/js/parse/sql/impala/jison/structure.json index d24f953e4b8..bc3cce3c855 100644 --- a/desktop/core/src/desktop/js/parse/jison/sql/impala/structure.json +++ b/desktop/core/src/desktop/js/parse/sql/impala/jison/structure.json @@ -40,18 +40,18 @@ "revoke/revoke_common.jison", "revoke/revoke_on.jison", "revoke/revoke_role.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", "select/joins.jison", "select/limit_clause.jison", "select/offset_clause.jison", "select/order_by_clause.jison", "select/select.jison", "select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", "set/set.jison", "show/show_column_stats.jison", "show/show_common.jison", @@ -70,39 +70,39 @@ "truncate/truncate_table.jison", "udf/aggregate/aggregate_common.jison", "udf/aggregate/appx_median.jison", - "../generic/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/avg.jison", "udf/aggregate/count.jison", "udf/aggregate/group_concat.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", "udf/aggregate/ndv.jison", "udf/aggregate/stddev.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", "udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", "udf/aggregate/variance_pop.jison", "udf/aggregate/variance_samp.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", "udf/function/extract.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", "udf/function/replace.jison", - "../generic/udf/function/truncate.jison", + "../../generic/jison/udf/function/truncate.jison", "udf/function/user.jison", - "../generic/udf/udf_common.jison", + "../../generic/jison/udf/udf_common.jison", "update/update.jison", "upsert/cte_upsert.jison", "upsert/upsert.jison", "sql_error.jison", "sql_main.jison", - "../generic/use/use.jison", + "../../generic/jison/use/use.jison", "sql_valueExpression.jison", - "../generic/autocomplete_footer.jison" + "../../generic/jison/autocomplete_footer.jison" ], "syntax": [ "syntax_header.jison", @@ -144,18 +144,18 @@ "revoke/revoke_common.jison", "revoke/revoke_on.jison", "revoke/revoke_role.jison", - "../generic/select/cte_select_statement.jison", - "../generic/select/from_clause.jison", - "../generic/select/group_by_clause.jison", - "../generic/select/having_clause.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", "select/joins.jison", "select/limit_clause.jison", "select/offset_clause.jison", "select/order_by_clause.jison", "select/select.jison", "select/select_conditions.jison", - "../generic/select/union_clause.jison", - "../generic/select/where_clause.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", "set/set.jison", "show/show_column_stats.jison", "show/show_common.jison", @@ -174,37 +174,37 @@ "truncate/truncate_table.jison", "udf/aggregate/aggregate_common.jison", "udf/aggregate/appx_median.jison", - "../generic/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/avg.jison", "udf/aggregate/count.jison", "udf/aggregate/group_concat.jison", - "../generic/udf/aggregate/max.jison", - "../generic/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", "udf/aggregate/ndv.jison", "udf/aggregate/stddev.jison", - "../generic/udf/aggregate/stddev_pop.jison", - "../generic/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", "udf/aggregate/sum.jison", - "../generic/udf/aggregate/var_pop.jison", - "../generic/udf/aggregate/var_samp.jison", - "../generic/udf/aggregate/variance.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", "udf/aggregate/variance_pop.jison", "udf/aggregate/variance_samp.jison", - "../generic/udf/analytic/analytic.jison", - "../generic/udf/function/array.jison", - "../generic/udf/function/cast.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", "udf/function/extract.jison", - "../generic/udf/function/if.jison", - "../generic/udf/function/map.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", "udf/function/replace.jison", - "../generic/udf/function/truncate.jison", + "../../generic/jison/udf/function/truncate.jison", "udf/function/user.jison", - "../generic/udf/udf_common.jison", + "../../generic/jison/udf/udf_common.jison", "update/update.jison", "upsert/cte_upsert.jison", "upsert/upsert.jison", "sql_main.jison", - "../generic/use/use.jison", + "../../generic/jison/use/use.jison", "sql_valueExpression.jison", - "../generic/syntax_footer.jison" + "../../generic/jison/syntax_footer.jison" ] } diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/syntax_header.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/syntax_header.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/syntax_header.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/syntax_header.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/truncate/truncate_table.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/truncate/truncate_table.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/truncate/truncate_table.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/truncate/truncate_table.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/aggregate_common.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/aggregate_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/aggregate_common.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/aggregate_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/appx_median.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/appx_median.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/appx_median.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/appx_median.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/count.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/count.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/count.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/count.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/group_concat.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/group_concat.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/group_concat.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/group_concat.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/ndv.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/ndv.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/ndv.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/ndv.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/stddev.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/stddev.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/stddev.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/stddev.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/sum.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/sum.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/sum.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/sum.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/variance_pop.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/variance_pop.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/variance_pop.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/variance_pop.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/variance_samp.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/variance_samp.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/aggregate/variance_samp.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/aggregate/variance_samp.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/function/extract.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/function/extract.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/function/extract.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/function/extract.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/function/replace.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/function/replace.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/function/replace.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/function/replace.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/udf/function/user.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/udf/function/user.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/udf/function/user.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/udf/function/user.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/update/update.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/update/update.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/update/update.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/update/update.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/upsert/cte_upsert.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/upsert/cte_upsert.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/upsert/cte_upsert.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/upsert/cte_upsert.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/impala/upsert/upsert.jison b/desktop/core/src/desktop/js/parse/sql/impala/jison/upsert/upsert.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/impala/upsert/upsert.jison rename to desktop/core/src/desktop/js/parse/sql/impala/jison/upsert/upsert.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/ksql/sql_list.jison b/desktop/core/src/desktop/js/parse/sql/ksql/jison/list/sql_list.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/ksql/sql_list.jison rename to desktop/core/src/desktop/js/parse/sql/ksql/jison/list/sql_list.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/ksql/sql_show.jison b/desktop/core/src/desktop/js/parse/sql/ksql/jison/show/sql_show.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/ksql/sql_show.jison rename to desktop/core/src/desktop/js/parse/sql/ksql/jison/show/sql_show.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/ksql/sql.jisonlex b/desktop/core/src/desktop/js/parse/sql/ksql/jison/sql.jisonlex similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/ksql/sql.jisonlex rename to desktop/core/src/desktop/js/parse/sql/ksql/jison/sql.jisonlex diff --git a/desktop/core/src/desktop/js/parse/sql/ksql/jison/structure.json b/desktop/core/src/desktop/js/parse/sql/ksql/jison/structure.json new file mode 100644 index 00000000000..8b2602e9b39 --- /dev/null +++ b/desktop/core/src/desktop/js/parse/sql/ksql/jison/structure.json @@ -0,0 +1,108 @@ +{ + "lexer": "sql.jisonlex", + "autocomplete": [ + "../../generic/jison/autocomplete_header.jison", + "../../generic/jison/create/create_common.jison", + "../../generic/jison/create/create_database.jison", + "../../generic/jison/create/create_role.jison", + "../../generic/jison/create/create_table.jison", + "../../generic/jison/create/create_view.jison", + "../../generic/jison/drop/drop_common.jison", + "../../generic/jison/drop/drop_database.jison", + "../../generic/jison/drop/drop_role.jison", + "../../generic/jison/drop/drop_table.jison", + "../../generic/jison/drop/drop_view.jison", + "../../generic/jison/truncate/truncate_table.jison", + "../../generic/jison/sql_error.jison", + "../../generic/jison/insert/insert.jison", + "list/sql_list.jison", + "../../generic/jison/sql_main.jison", + "../../generic/jison/select/select.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", + "../../generic/jison/select/joins.jison", + "../../generic/jison/select/limit_clause.jison", + "../../generic/jison/select/order_by_clause.jison", + "../../generic/jison/select/select_conditions.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", + "../../generic/jison/set/set_common.jison", + "../../generic/jison/set/set_all.jison", + "../../generic/jison/set/set_option.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "show/sql_show.jison", + "../../generic/jison/sql_valueExpression.jison", + "../../generic/jison/autocomplete_footer.jison" + ], + "syntax": [ + "../../generic/jison/syntax_header.jison", + "../../generic/jison/create/create_common.jison", + "../../generic/jison/create/create_database.jison", + "../../generic/jison/create/create_role.jison", + "../../generic/jison/create/create_table.jison", + "../../generic/jison/create/create_view.jison", + "../../generic/jison/drop/drop_common.jison", + "../../generic/jison/drop/drop_database.jison", + "../../generic/jison/drop/drop_role.jison", + "../../generic/jison/drop/drop_table.jison", + "../../generic/jison/drop/drop_view.jison", + "../../generic/jison/truncate/truncate_table.jison", + "../../generic/jison/insert/insert.jison", + "list/sql_list.jison", + "../../generic/jison/sql_main.jison", + "../../generic/jison/select/select.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", + "../../generic/jison/select/joins.jison", + "../../generic/jison/select/limit_clause.jison", + "../../generic/jison/select/order_by_clause.jison", + "../../generic/jison/select/select_conditions.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", + "../../generic/jison/set/set_common.jison", + "../../generic/jison/set/set_all.jison", + "../../generic/jison/set/set_option.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "show/sql_show.jison", + "../../generic/jison/sql_valueExpression.jison", + "../../generic/jison/syntax_footer.jison" + ] +} diff --git a/desktop/core/src/desktop/js/parse/jison/sql/phoenix/sql.jisonlex b/desktop/core/src/desktop/js/parse/sql/phoenix/jison/sql.jisonlex similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/phoenix/sql.jisonlex rename to desktop/core/src/desktop/js/parse/sql/phoenix/jison/sql.jisonlex diff --git a/desktop/core/src/desktop/js/parse/sql/phoenix/jison/structure.json b/desktop/core/src/desktop/js/parse/sql/phoenix/jison/structure.json new file mode 100644 index 00000000000..0452ba7ab6d --- /dev/null +++ b/desktop/core/src/desktop/js/parse/sql/phoenix/jison/structure.json @@ -0,0 +1,116 @@ +{ + "lexer": "sql.jisonlex", + "autocomplete": [ + "../../generic/jison/autocomplete_header.jison", + "../../generic/jison/alter/alter_common.jison", + "../../generic/jison/alter/alter_table.jison", + "../../generic/jison/alter/alter_view.jison", + "../../generic/jison/create/create_common.jison", + "../../generic/jison/create/create_database.jison", + "../../generic/jison/create/create_role.jison", + "../../generic/jison/create/create_table.jison", + "../../generic/jison/create/create_view.jison", + "../../generic/jison/drop/drop_common.jison", + "../../generic/jison/drop/drop_database.jison", + "../../generic/jison/drop/drop_role.jison", + "../../generic/jison/drop/drop_table.jison", + "../../generic/jison/drop/drop_view.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", + "../../generic/jison/select/joins.jison", + "../../generic/jison/select/limit_clause.jison", + "../../generic/jison/select/order_by_clause.jison", + "../../generic/jison/select/select.jison", + "../../generic/jison/select/select_conditions.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", + "../../generic/jison/set/set_common.jison", + "../../generic/jison/set/set_all.jison", + "../../generic/jison/set/set_option.jison", + "../../generic/jison/truncate/truncate_table.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "../../generic/jison/update/update_table.jison", + "../../generic/jison/use/use.jison", + "../../generic/jison/sql_error.jison", + "../../generic/jison/sql_main.jison", + "upsert/upsert.jison", + "../../calcite/jison/quoted_table_identifier.jison", + "../../generic/jison/sql_valueExpression.jison", + "../../generic/jison/autocomplete_footer.jison" + ], + "syntax": [ + "../../generic/jison/syntax_header.jison", + "../../generic/jison/alter/alter_common.jison", + "../../generic/jison/alter/alter_table.jison", + "../../generic/jison/alter/alter_view.jison", + "../../generic/jison/create/create_common.jison", + "../../generic/jison/create/create_database.jison", + "../../generic/jison/create/create_role.jison", + "../../generic/jison/create/create_table.jison", + "../../generic/jison/create/create_view.jison", + "../../generic/jison/drop/drop_common.jison", + "../../generic/jison/drop/drop_database.jison", + "../../generic/jison/drop/drop_role.jison", + "../../generic/jison/drop/drop_table.jison", + "../../generic/jison/drop/drop_view.jison", + "../../generic/jison/select/cte_select_statement.jison", + "../../generic/jison/select/from_clause.jison", + "../../generic/jison/select/group_by_clause.jison", + "../../generic/jison/select/having_clause.jison", + "../../generic/jison/select/joins.jison", + "../../generic/jison/select/limit_clause.jison", + "../../generic/jison/select/order_by_clause.jison", + "../../generic/jison/select/select.jison", + "../../generic/jison/select/select_conditions.jison", + "../../generic/jison/select/union_clause.jison", + "../../generic/jison/select/where_clause.jison", + "../../generic/jison/set/set_common.jison", + "../../generic/jison/set/set_all.jison", + "../../generic/jison/set/set_option.jison", + "../../generic/jison/truncate/truncate_table.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "../../generic/jison/update/update_table.jison", + "../../generic/jison/use/use.jison", + "../../generic/jison/sql_main.jison", + "upsert/upsert.jison", + "../../calcite/jison/quoted_table_identifier.jison", + "../../generic/jison/sql_valueExpression.jison", + "../../generic/jison/syntax_footer.jison" + ] +} diff --git a/desktop/core/src/desktop/js/parse/jison/sql/phoenix/upsert/upsert.jison b/desktop/core/src/desktop/js/parse/sql/phoenix/jison/upsert/upsert.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/phoenix/upsert/upsert.jison rename to desktop/core/src/desktop/js/parse/sql/phoenix/jison/upsert/upsert.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/presto/common/table_constraint.jison b/desktop/core/src/desktop/js/parse/sql/presto/jison/common/table_constraint.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/presto/common/table_constraint.jison rename to desktop/core/src/desktop/js/parse/sql/presto/jison/common/table_constraint.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/presto/create/create_common.jison b/desktop/core/src/desktop/js/parse/sql/presto/jison/create/create_common.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/presto/create/create_common.jison rename to desktop/core/src/desktop/js/parse/sql/presto/jison/create/create_common.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/presto/create/create_database_no_db.jison b/desktop/core/src/desktop/js/parse/sql/presto/jison/create/create_database_no_db.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/presto/create/create_database_no_db.jison rename to desktop/core/src/desktop/js/parse/sql/presto/jison/create/create_database_no_db.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/presto/load/load_data.jison b/desktop/core/src/desktop/js/parse/sql/presto/jison/load/load_data.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/presto/load/load_data.jison rename to desktop/core/src/desktop/js/parse/sql/presto/jison/load/load_data.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/presto/msck/msck.jison b/desktop/core/src/desktop/js/parse/sql/presto/jison/msck/msck.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/presto/msck/msck.jison rename to desktop/core/src/desktop/js/parse/sql/presto/jison/msck/msck.jison diff --git a/desktop/core/src/desktop/js/parse/jison/sql/presto/sql.jisonlex b/desktop/core/src/desktop/js/parse/sql/presto/jison/sql.jisonlex similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/presto/sql.jisonlex rename to desktop/core/src/desktop/js/parse/sql/presto/jison/sql.jisonlex diff --git a/desktop/core/src/desktop/js/parse/jison/sql/presto/sql_main.jison b/desktop/core/src/desktop/js/parse/sql/presto/jison/sql_main.jison similarity index 100% rename from desktop/core/src/desktop/js/parse/jison/sql/presto/sql_main.jison rename to desktop/core/src/desktop/js/parse/sql/presto/jison/sql_main.jison diff --git a/desktop/core/src/desktop/js/parse/sql/presto/jison/structure.json b/desktop/core/src/desktop/js/parse/sql/presto/jison/structure.json new file mode 100644 index 00000000000..6e11e173679 --- /dev/null +++ b/desktop/core/src/desktop/js/parse/sql/presto/jison/structure.json @@ -0,0 +1,218 @@ +{ + "lexer": "sql.jisonlex", + "autocomplete": [ + "../../generic/jison/autocomplete_header.jison", + "../../hive/jison/abort/abort_transactions.jison", + "common/table_constraint.jison", + "../../hive/jison/alter/alter_common.jison", + "../../hive/jison/alter/alter_database.jison", + "../../hive/jison/alter/alter_index.jison", + "../../hive/jison/alter/alter_materialized_view.jison", + "../../hive/jison/alter/alter_table.jison", + "../../hive/jison/alter/alter_view.jison", + "../../hive/jison/analyze/analyze_table.jison", + "create/create_common.jison", + "../../hive/jison/create/create_database.jison", + "create/create_database_no_db.jison", + "../../hive/jison/create/create_function.jison", + "../../hive/jison/create/create_index.jison", + "../../hive/jison/create/create_role.jison", + "../../hive/jison/create/create_table.jison", + "../../hive/jison/create/create_temporary_function.jison", + "../../hive/jison/create/create_temporary_macro.jison", + "../../hive/jison/create/create_view.jison", + "../../hive/jison/delete/delete.jison", + "../../hive/jison/describe/describe.jison", + "../../hive/jison/describe/describe_database.jison", + "../../hive/jison/describe/describe_function.jison", + "../../hive/jison/drop/drop_common.jison", + "../../hive/jison/drop/drop_database.jison", + "../../hive/jison/drop/drop_function.jison", + "../../hive/jison/drop/drop_index.jison", + "../../hive/jison/drop/drop_materialized_view.jison", + "../../hive/jison/drop/drop_role.jison", + "../../hive/jison/drop/drop_table.jison", + "../../hive/jison/drop/drop_temporary_function.jison", + "../../hive/jison/drop/drop_temporary_macro.jison", + "../../hive/jison/drop/drop_view.jison", + "../../hive/jison/export/export.jison", + "../../hive/jison/grant/grant_common.jison", + "../../hive/jison/grant/grant_privilege.jison", + "../../hive/jison/grant/grant_role.jison", + "../../hive/jison/grant/grant_user.jison", + "../../hive/jison/grant/privilege_type.jison", + "../../hive/jison/import/import.jison", + "../../impala/jison/insert/cte_insert.jison", + "../../hive/jison/insert/insert.jison", + "load/load_data.jison", + "../../hive/jison/merge/merge.jison", + "msck/msck.jison", + "../../hive/jison/reload/reload.jison", + "../../hive/jison/revoke/revoke_admin_option_for.jison", + "../../hive/jison/revoke/revoke_all.jison", + "../../hive/jison/revoke/revoke_common.jison", + "../../hive/jison/revoke/revoke_grant_option_for.jison", + "../../hive/jison/revoke/revoke_privilege.jison", + "../../hive/jison/revoke/revoke_role.jison", + "../../hive/jison/revoke/revoke_user.jison", + "../../generic/jison/set/set_all.jison", + "../../hive/jison/set/set_common.jison", + "../../generic/jison/set/set_option.jison", + "../../hive/jison/set/set_role.jison", + "../../hive/jison/show/show_columns.jison", + "../../hive/jison/show/show_common.jison", + "../../hive/jison/show/show_compactions.jison", + "../../hive/jison/show/show_conf.jison", + "../../hive/jison/show/show_create_table.jison", + "../../hive/jison/show/show_current_roles.jison", + "../../hive/jison/show/show_databases.jison", + "../../hive/jison/show/show_functions.jison", + "../../hive/jison/show/show_grant.jison", + "../../hive/jison/show/show_index.jison", + "../../hive/jison/show/show_locks.jison", + "../../hive/jison/show/show_materialized_views.jison", + "../../hive/jison/show/show_partitions.jison", + "../../hive/jison/show/show_role.jison", + "../../hive/jison/show/show_roles.jison", + "../../hive/jison/show/show_table.jison", + "../../hive/jison/show/show_tables.jison", + "../../hive/jison/show/show_tblproperties.jison", + "../../hive/jison/show/show_transactions.jison", + "../../hive/jison/show/show_views.jison", + "../../hive/jison/truncate/truncate_table.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "../../hive/jison/udf/sql_aggregate.jison", + "../../hive/jison/udf/sql_arbitrary.jison", + "../../hive/jison/udf/sql_extract.jison", + "../../hive/jison/update/update.jison", + "../../generic/jison/use/use.jison", + "../../generic/jison/sql_valueExpression.jison", + "../../hive/jison/sql_error.jison", + "sql_main.jison", + "../../generic/jison/autocomplete_footer.jison" + ], + "syntax": [ + "../../generic/jison/syntax_header.jison", + "../../hive/jison/abort/abort_transactions.jison", + "common/table_constraint.jison", + "../../hive/jison/alter/alter_common.jison", + "../../hive/jison/alter/alter_database.jison", + "../../hive/jison/alter/alter_index.jison", + "../../hive/jison/alter/alter_materialized_view.jison", + "../../hive/jison/alter/alter_table.jison", + "../../hive/jison/alter/alter_view.jison", + "../../hive/jison/analyze/analyze_table.jison", + "create/create_common.jison", + "../../hive/jison/create/create_database.jison", + "create/create_database_no_db.jison", + "../../hive/jison/create/create_function.jison", + "../../hive/jison/create/create_index.jison", + "../../hive/jison/create/create_role.jison", + "../../hive/jison/create/create_table.jison", + "../../hive/jison/create/create_temporary_function.jison", + "../../hive/jison/create/create_temporary_macro.jison", + "../../hive/jison/create/create_view.jison", + "../../hive/jison/delete/delete.jison", + "../../hive/jison/describe/describe.jison", + "../../hive/jison/describe/describe_database.jison", + "../../hive/jison/describe/describe_function.jison", + "../../hive/jison/drop/drop_common.jison", + "../../hive/jison/drop/drop_database.jison", + "../../hive/jison/drop/drop_function.jison", + "../../hive/jison/drop/drop_index.jison", + "../../hive/jison/drop/drop_materialized_view.jison", + "../../hive/jison/drop/drop_role.jison", + "../../hive/jison/drop/drop_table.jison", + "../../hive/jison/drop/drop_temporary_function.jison", + "../../hive/jison/drop/drop_temporary_macro.jison", + "../../hive/jison/drop/drop_view.jison", + "../../hive/jison/export/export.jison", + "../../hive/jison/grant/grant_common.jison", + "../../hive/jison/grant/grant_privilege.jison", + "../../hive/jison/grant/grant_role.jison", + "../../hive/jison/grant/grant_user.jison", + "../../hive/jison/grant/privilege_type.jison", + "../../hive/jison/import/import.jison", + "../../impala/jison/insert/cte_insert.jison", + "../../hive/jison/insert/insert.jison", + "load/load_data.jison", + "../../hive/jison/merge/merge.jison", + "msck/msck.jison", + "../../hive/jison/reload/reload.jison", + "../../hive/jison/revoke/revoke_admin_option_for.jison", + "../../hive/jison/revoke/revoke_all.jison", + "../../hive/jison/revoke/revoke_common.jison", + "../../hive/jison/revoke/revoke_grant_option_for.jison", + "../../hive/jison/revoke/revoke_privilege.jison", + "../../hive/jison/revoke/revoke_role.jison", + "../../hive/jison/revoke/revoke_user.jison", + "../../generic/jison/set/set_all.jison", + "../../hive/jison/set/set_common.jison", + "../../generic/jison/set/set_option.jison", + "../../hive/jison/set/set_role.jison", + "../../hive/jison/show/show_columns.jison", + "../../hive/jison/show/show_common.jison", + "../../hive/jison/show/show_compactions.jison", + "../../hive/jison/show/show_conf.jison", + "../../hive/jison/show/show_create_table.jison", + "../../hive/jison/show/show_current_roles.jison", + "../../hive/jison/show/show_databases.jison", + "../../hive/jison/show/show_functions.jison", + "../../hive/jison/show/show_grant.jison", + "../../hive/jison/show/show_index.jison", + "../../hive/jison/show/show_locks.jison", + "../../hive/jison/show/show_materialized_views.jison", + "../../hive/jison/show/show_partitions.jison", + "../../hive/jison/show/show_role.jison", + "../../hive/jison/show/show_roles.jison", + "../../hive/jison/show/show_table.jison", + "../../hive/jison/show/show_tables.jison", + "../../hive/jison/show/show_tblproperties.jison", + "../../hive/jison/show/show_transactions.jison", + "../../hive/jison/show/show_views.jison", + "../../hive/jison/truncate/truncate_table.jison", + "../../generic/jison/udf/aggregate/aggregate_common.jison", + "../../generic/jison/udf/aggregate/avg.jison", + "../../generic/jison/udf/aggregate/count.jison", + "../../generic/jison/udf/aggregate/max.jison", + "../../generic/jison/udf/aggregate/min.jison", + "../../generic/jison/udf/aggregate/stddev_pop.jison", + "../../generic/jison/udf/aggregate/stddev_samp.jison", + "../../generic/jison/udf/aggregate/sum.jison", + "../../generic/jison/udf/aggregate/var_pop.jison", + "../../generic/jison/udf/aggregate/var_samp.jison", + "../../generic/jison/udf/aggregate/variance.jison", + "../../generic/jison/udf/analytic/analytic.jison", + "../../generic/jison/udf/function/array.jison", + "../../generic/jison/udf/function/cast.jison", + "../../generic/jison/udf/function/if.jison", + "../../generic/jison/udf/function/map.jison", + "../../generic/jison/udf/function/truncate.jison", + "../../generic/jison/udf/udf_common.jison", + "../../hive/jison/udf/sql_aggregate.jison", + "../../hive/jison/udf/sql_arbitrary.jison", + "../../hive/jison/udf/sql_extract.jison", + "../../hive/jison/update/update.jison", + "../../generic/jison/use/use.jison", + "../../generic/jison/sql_valueExpression.jison", + "sql_main.jison", + "../../generic/jison/syntax_footer.jison" + ] +} diff --git a/desktop/core/src/desktop/js/parse/sql/sqlParserRepository.ts b/desktop/core/src/desktop/js/parse/sql/sqlParserRepository.ts index 1bdbe1f097c..88251487a29 100644 --- a/desktop/core/src/desktop/js/parse/sql/sqlParserRepository.ts +++ b/desktop/core/src/desktop/js/parse/sql/sqlParserRepository.ts @@ -14,21 +14,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -/* eslint-disable */ import { AutocompleteParser, SqlParserProvider, SyntaxParser } from 'parse/types'; -/** - * AUTOCOMPLETE_MODULES and SYNTAX_MODULES are generated, do not edit manually, see tools/jison/generateParsers.js - */ const AUTOCOMPLETE_MODULES = { - calcite: () => import(/* webpackChunkName: "calcite-parser" */ './calcite/calciteAutocompleteParser'), - dasksql: () => import(/* webpackChunkName: "dasksql-parser" */ './dasksql/dasksqlAutocompleteParser'), + calcite: () => + import(/* webpackChunkName: "calcite-parser" */ './calcite/calciteAutocompleteParser'), + dasksql: () => + import(/* webpackChunkName: "dasksql-parser" */ './dasksql/dasksqlAutocompleteParser'), flink: () => import(/* webpackChunkName: "flink-parser" */ './flink/flinkAutocompleteParser'), - generic: () => import(/* webpackChunkName: "generic-parser" */ './generic/genericAutocompleteParser'), + generic: () => + import(/* webpackChunkName: "generic-parser" */ './generic/genericAutocompleteParser'), hive: () => import(/* webpackChunkName: "hive-parser" */ './hive/hiveAutocompleteParser'), impala: () => import(/* webpackChunkName: "impala-parser" */ './impala/impalaAutocompleteParser'), ksql: () => import(/* webpackChunkName: "ksql-parser" */ './ksql/ksqlAutocompleteParser'), - phoenix: () => import(/* webpackChunkName: "phoenix-parser" */ './phoenix/phoenixAutocompleteParser'), + phoenix: () => + import(/* webpackChunkName: "phoenix-parser" */ './phoenix/phoenixAutocompleteParser'), presto: () => import(/* webpackChunkName: "presto-parser" */ './presto/prestoAutocompleteParser') }; const SYNTAX_MODULES = { @@ -42,7 +42,6 @@ const SYNTAX_MODULES = { phoenix: () => import(/* webpackChunkName: "phoenix-parser" */ './phoenix/phoenixSyntaxParser'), presto: () => import(/* webpackChunkName: "presto-parser" */ './presto/prestoSyntaxParser') }; -/* eslint-enable */ export class SqlParserRepository implements SqlParserProvider { modulePromises: { [dialect: string]: Promise } = {}; diff --git a/tools/jison/generateParsers.js b/tools/jison/generateParsers.js index 0926815d8bb..2da068a2730 100644 --- a/tools/jison/generateParsers.js +++ b/tools/jison/generateParsers.js @@ -16,509 +16,106 @@ /* eslint-disable no-restricted-syntax */ -const fs = require('fs'); -const cli = require('jison/lib/cli'); - -const LICENSE = - '// Licensed to Cloudera, Inc. under one\n' + - '// or more contributor license agreements. See the NOTICE file\n' + - '// distributed with this work for additional information\n' + - '// regarding copyright ownership. Cloudera, Inc. licenses this file\n' + - '// to you under the Apache License, Version 2.0 (the\n' + - '// "License"); you may not use this file except in compliance\n' + - '// with the License. You may obtain a copy of the License at\n' + - '//\n' + - '// http://www.apache.org/licenses/LICENSE-2.0\n' + - '//\n' + - '// Unless required by applicable law or agreed to in writing, software\n' + - '// distributed under the License is distributed on an "AS IS" BASIS,\n' + - '// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n' + - '// See the License for the specific language governing permissions and\n' + - '// limitations under the License.\n'; - -const SQL_STATEMENTS_PARSER_JSDOC = - '/**\n' + - ' * @param {string} input\n' + - ' *\n' + - ' * @return {SqlStatementsParserResult}\n' + - ' */\n'; - -const PARSER_FOLDER = '../../desktop/core/src/desktop/js/parse/sql/'; -const OUTPUT_FOLDER = '../../desktop/core/src/desktop/js/parse/'; -const JISON_FOLDER = '../../desktop/core/src/desktop/js/parse/jison/'; -const SQL_PARSER_REPOSITORY_PATH = - '../../desktop/core/src/desktop/js/parse/sql/sqlParserRepository.ts'; -const SYNTAX_PARSER_IMPORT_TEMPLATE = - ' KEY: () => import(/* webpackChunkName: "KEY-parser" */ \'./KEY/KEYSyntaxParser\')'; -const AUTOCOMPLETE_PARSER_IMPORT_TEMPLATE = - ' KEY: () => import(/* webpackChunkName: "KEY-parser" */ \'./KEY/KEYAutocompleteParser\')'; - -const parserDefinitions = { - globalSearchParser: { - sources: ['globalSearchParser.jison'], - target: 'globalSearchParser.jison', - outputFolder: OUTPUT_FOLDER, - afterParse: contents => - new Promise(resolve => { - resolve( - LICENSE + - contents.replace( - 'var globalSearchParser = ', - "import SqlParseSupport from 'parse/sqlParseSupport';\n\nvar globalSearchParser = " - ) + - '\nexport default globalSearchParser;\n' - ); - }) - }, - solrFormulaParser: { - sources: ['solrFormulaParser.jison'], - target: 'solrFormulaParser.jison', - outputFolder: OUTPUT_FOLDER, - afterParse: contents => - new Promise(resolve => { - resolve(LICENSE + contents + 'export default solrFormulaParser;\n'); - }) - }, - solrQueryParser: { - sources: ['solrQueryParser.jison'], - target: 'solrQueryParser.jison', - outputFolder: OUTPUT_FOLDER, - afterParse: contents => - new Promise(resolve => { - resolve(LICENSE + contents + 'export default solrQueryParser;\n'); - }) - }, - sqlStatementsParser: { - sources: ['sqlStatementsParser.jison'], - target: 'sqlStatementsParser.jison', - outputFolder: OUTPUT_FOLDER, - afterParse: contents => - new Promise(resolve => { - resolve( - LICENSE + - contents.replace( - 'parse: function parse', - SQL_STATEMENTS_PARSER_JSDOC + 'parse: function parse' - ) + - 'export default sqlStatementsParser;\n' - ); - }) - }, - hplsqlStatementsParser: { - sources: ['hplsqlStatementsParser.jison'], - target: 'hplsqlStatementsParser.jison', - outputFolder: OUTPUT_FOLDER, - afterParse: contents => - new Promise(resolve => { - resolve( - LICENSE + - contents.replace( - 'parse: function parse', - SQL_STATEMENTS_PARSER_JSDOC + 'parse: function parse' - ) + - 'export default hplsqlStatementsParser;\n' - ); - }) - } -}; - -const mkdir = path => - new Promise((resolve, reject) => { - if (fs.existsSync(path)) { - resolve(); - } else { - fs.mkdir(path, err => { - if (err) { - reject(err); - } - resolve(); - }); - } - }); - -const readFile = path => - new Promise((resolve, reject) => { - fs.readFile(path, (err, buf) => { - if (err) { - reject(err); - } - resolve(buf ? buf.toString() : ''); - }); - }); - -const writeFile = (path, contents) => - new Promise((resolve, reject) => { - fs.writeFile(path, contents, err => { - if (err) { - reject(); - } - resolve(); - }); - }); - -const copyFile = (source, destination, contentsCallback) => - new Promise((resolve, reject) => { - readFile(source) - .then(contents => { - writeFile(destination, contentsCallback ? contentsCallback(contents) : contents) - .then(resolve) - .catch(reject); - }) - .catch(reject); - }); - -const deleteFile = path => { - fs.unlinkSync(path); -}; - -const generateParser = parserName => - new Promise((resolve, reject) => { - const parserConfig = parserDefinitions[parserName]; - - const concatPromise = new Promise((resolve, reject) => { - if (parserConfig.sources.length > 1 && parserConfig.target) { - console.log('Concatenating files...'); - const promises = parserConfig.sources.map(fileName => readFile(JISON_FOLDER + fileName)); - - Promise.all(promises) - .then(contents => { - writeFile(JISON_FOLDER + parserConfig.target, contents.join('')).then(() => { - resolve(JISON_FOLDER + parserConfig.target); - }); - }) - .catch(reject); - } else if (parserConfig.sources.length === 1) { - resolve(JISON_FOLDER + parserConfig.sources[0]); +import { identifySqlParsers } from './parserDefinitions.js'; +import { deleteFile, readFile, writeFile } from './utils.js'; +import jisonCli from 'jison/lib/cli.js'; + +const findParsersToGenerateFromArgs = parserDefinitions => { + process.argv.shift(); // drop "node" + process.argv.shift(); // drop "generateParsers.js" + const foundDefinitions = new Set(); + const invalid = []; + if (process.argv[0] === 'all') { + Object.values(parserDefinitions).forEach(definition => foundDefinitions.add(definition)); + } else { + process.argv.forEach(arg => { + if (parserDefinitions[arg]) { + foundDefinitions.add(parserDefinitions[arg]); } else { - reject('No jison source specified'); - } - }); - - concatPromise - .then(targetPath => { - const options = { - file: targetPath, - 'module-type': 'js' - }; - if (parserConfig.lexer) { - options['lexfile'] = JISON_FOLDER + parserConfig.lexer; - } - - console.log('Generating parser...'); - try { - cli.main(options); - } catch (err) { - console.error('Failed calling jison cli'); - throw err; - } - if (parserConfig.sources.length > 1) { - deleteFile(targetPath); // Remove concatenated file + let found = false; + Object.keys(parserDefinitions).forEach(key => { + if (key.indexOf(arg) === 0) { + found = true; + foundDefinitions.add(parserDefinitions[key]); + } + }); + if (!found) { + invalid.push(arg); } - console.log('Adjusting JS...'); - const generatedJsFileName = parserConfig.target - .replace('.jison', '.js') - .replace(/^.*\/([^/]+)$/, '$1'); - console.log(generatedJsFileName); - readFile(generatedJsFileName) - .then(contents => { - parserConfig - .afterParse(contents) - .then(finalContents => { - writeFile(parserConfig.outputFolder + generatedJsFileName, finalContents) - .then(() => { - deleteFile(generatedJsFileName); - resolve(); - }) - .catch(reject); - }) - .catch(reject); - }) - .catch(reject); - }) - .catch(reject); - }); - -let parsersToGenerate = []; -const invalid = []; - -let all = false; - -const listDir = folder => - new Promise(resolve => { - fs.readdir(folder, (err, files) => { - resolve(files); + } }); - }); - -const addParserDefinition = (sources, dialect, autocomplete, lexer) => { - const parserName = dialect + (autocomplete ? 'AutocompleteParser' : 'SyntaxParser'); - - const parserDefinition = { - sources: sources, - lexer: 'sql/' + dialect + '/' + lexer, - target: 'sql/' + dialect + '/' + parserName + '.jison', - sqlParser: autocomplete ? 'AUTOCOMPLETE' : 'SYNTAX', - outputFolder: OUTPUT_FOLDER + 'sql/' + dialect + '/', - afterParse: contents => - new Promise(resolve => { - resolve( - LICENSE + - contents - .replace( - 'var ' + parserName + ' = ', - "import SqlParseSupport from 'parse/sql/" + - dialect + - "/sqlParseSupport';\n\nvar " + - parserName + - ' = ' - ) - .replace( - 'loc: yyloc,', - "loc: lexer.yylloc, ruleId: stack.slice(stack.length - 2, stack.length).join('')," - ) + - '\nexport default ' + - parserName + - ';\n' - ); - }) - }; - - parserDefinitions[parserName] = parserDefinition; + } + if (invalid.length) { + throw new Error(`Could not find parser definitions for '${invalid.join(", '")}'`); + } + return [...foundDefinitions]; }; -const addParsersFromStructure = (structure, dialect) => { - addParserDefinition( - structure.autocomplete.map(source => 'sql/' + dialect + '/' + source), - dialect, - true, - structure.lexer - ); - addParserDefinition( - structure.syntax.map(source => 'sql/' + dialect + '/' + source), - dialect, - false, - structure.lexer - ); +const getConcatenatedContent = async sources => { + const contents = []; + for (const source of sources) { + // We know the file exists, verified in parserDefinitions.js + contents.push(await readFile(source)); + } + return contents.join(); }; -const identifySqlParsers = () => - new Promise(resolve => { - listDir(JISON_FOLDER + 'sql').then(files => { - const promises = []; - files.forEach(folder => { - promises.push( - listDir(JISON_FOLDER + 'sql/' + folder).then(async jisonFiles => { - if (jisonFiles.find(fileName => fileName === 'structure.json')) { - const structure = JSON.parse( - await readFile(JISON_FOLDER + 'sql/' + folder + '/structure.json') - ); - addParsersFromStructure(structure, folder); - } else { - console.log( - "Warn: Could not find 'structure.jisonlex' in " + - JISON_FOLDER + - 'sql/' + - folder + - '/' - ); - } - }) - ); - }); - Promise.all(promises).then(resolve); - }); - }); +const generateParser = async parserDefinition => { + const jisonContents = await getConcatenatedContent(parserDefinition.sources); + await writeFile(parserDefinition.targetJison, jisonContents); -const copyTests = (source, target) => - new Promise((resolve, reject) => { - const replaceRegexp = new RegExp(source + '(Autocomplete|Syntax)Parser', 'g'); - mkdir(PARSER_FOLDER + target) - .then(() => { - mkdir(PARSER_FOLDER + target + '/test') - .then(() => { - listDir(PARSER_FOLDER + source + '/test') - .then(testFiles => { - const copyPromises = []; - testFiles.forEach(testFile => { - copyPromises.push( - copyFile( - PARSER_FOLDER + source + '/test/' + testFile, - PARSER_FOLDER + target + '/test/' + testFile.replace(source, target), - contents => contents.replace(replaceRegexp, target + '$1Parser') - ) - ); - }); - Promise.all(copyPromises).then(resolve).catch(reject); - }) - .catch(reject); - }) - .catch(reject); - }) - .catch(reject); - }); + const generatedParserFileName = `${parserDefinition.parserName}.js`; + const options = { + file: parserDefinition.targetJison, + outfile: generatedParserFileName, + 'module-type': 'js' + }; + if (parserDefinition.lexer) { + options.lexfile = parserDefinition.lexer; + } -const prepareForNewParser = () => - new Promise((resolve, reject) => { - if (process.argv.length === 3 && process.argv[0] === '-new') { - process.argv.shift(); - const source = process.argv.shift(); - const target = process.argv.shift(); - console.log("Generating new parser '" + target + "' based on '" + source + "'..."); - process.argv.push(target); + try { + jisonCli.main(options); // Writes the generated parser in the current folder + } catch (err) { + console.error('Failed calling jison cli'); + throw err; + } - if ( - !Object.keys(parserDefinitions).some(key => { - if (key.indexOf(source) === 0) { - copyTests(source, target) - .then(() => { - mkdir(JISON_FOLDER + 'sql/' + target) - .then(() => { - listDir(JISON_FOLDER + 'sql/' + source).then(files => { - const copyPromises = []; - files.forEach(file => { - copyPromises.push( - copyFile( - JISON_FOLDER + 'sql/' + source + '/' + file, - JISON_FOLDER + 'sql/' + target + '/' + file - ) - ); - }); - Promise.all(copyPromises).then(() => { - const autocompleteSources = [ - 'sql/' + target + '/autocomplete_header.jison' - ]; - const syntaxSources = ['sql/' + target + '/syntax_header.jison']; + // Remove the concatenated jison file + deleteFile(parserDefinition.targetJison); - files.forEach(file => { - if (file.indexOf('sql_') === 0) { - autocompleteSources.push('sql/' + target + '/' + file); - syntaxSources.push('sql/' + target + '/' + file); - } - }); - autocompleteSources.push('sql/' + target + '/autocomplete_footer.jison'); - syntaxSources.push('sql/' + target + '/syntax_footer.jison'); - mkdir(PARSER_FOLDER + target).then(() => { - copyFile( - PARSER_FOLDER + source + '/sqlParseSupport.js', - PARSER_FOLDER + target + '/sqlParseSupport.js', - contents => - contents.replace( - /parser\.yy\.activeDialect = '[^']+';'/g, - "parser.yy.activeDialect = '" + target + "';" - ) - ).then(() => { - identifySqlParsers().then(resolve).catch(reject); - }); - }); - }); - }); - }) - .catch(err => { - console.log(err); - }); - }) - .catch(reject); - return true; - } - }) - ) { - reject("No existing parser found for '" + source + "'"); - } - } else { - resolve(); - } - }); + const generatedFileContents = await readFile(generatedParserFileName); + const modifiedContents = await parserDefinition.afterParse(generatedFileContents); -identifySqlParsers().then(() => { - process.argv.shift(); - process.argv.shift(); - prepareForNewParser().then(() => { - process.argv.forEach(arg => { - if (arg === 'all') { - all = true; - } else if (parserDefinitions[arg]) { - parsersToGenerate.push(arg); - } else { - let prefixFound = false; - Object.keys(parserDefinitions).forEach(key => { - if (key.indexOf(arg) === 0) { - prefixFound = true; - parsersToGenerate.push(key); - } - }); - if (!prefixFound) { - invalid.push(arg); - } - } - }); + // Write a modified version of the parser to the defined outputFolder + await writeFile(`${parserDefinition.outputFolder}/${generatedParserFileName}`, modifiedContents); - if (all) { - parsersToGenerate = Object.keys(parserDefinitions); - } + // Remove the generated parser + deleteFile(generatedParserFileName); +}; - if (invalid.length) { - console.log("No parser config found for: '" + invalid.join("', '") + "'"); - console.log( - '\nPossible options are:\n ' + - ['all'].concat(Object.keys(parserDefinitions)).join('\n ') + - '\n' - ); - return; - } +try { + console.log('Identifying parsers...'); + const parserDefinitions = await identifySqlParsers(); - const parserCount = parsersToGenerate.length; - let idx = 0; + const definitionsToGenerate = findParsersToGenerateFromArgs(parserDefinitions); + const totalParserCount = definitionsToGenerate.length; + if (totalParserCount > 1) { + console.log(`Generating ${totalParserCount} parser(s)...`); + } - const generateRecursive = () => { - idx++; - if (parsersToGenerate.length) { - const parserName = parsersToGenerate.pop(); - if (parserCount > 1) { - console.log("Generating '" + parserName + "' (" + idx + '/' + parserCount + ')...'); - } else { - console.log("Generating '" + parserName + "'..."); - } - generateParser(parserName) - .then(generateRecursive) - .catch(error => { - console.log(error); - console.log('FAIL!'); - }); - } else { - const autocompParsers = []; - const syntaxParsers = []; - console.log('Updating sqlParserRepository.ts...'); - Object.keys(parserDefinitions).forEach(key => { - if (parserDefinitions[key].sqlParser === 'AUTOCOMPLETE') { - autocompParsers.push( - AUTOCOMPLETE_PARSER_IMPORT_TEMPLATE.replace( - /KEY/g, - key.replace('AutocompleteParser', '') - ) - ); - } else if (parserDefinitions[key].sqlParser === 'SYNTAX') { - syntaxParsers.push( - SYNTAX_PARSER_IMPORT_TEMPLATE.replace(/KEY/g, key.replace('SyntaxParser', '')) - ); - } - }); - readFile(SQL_PARSER_REPOSITORY_PATH).then(contents => { - contents = contents.replace( - /const SYNTAX_MODULES = [^}]+}/, - 'const SYNTAX_MODULES = {\n' + syntaxParsers.sort().join(',\n') + '\n}' - ); - contents = contents.replace( - /const AUTOCOMPLETE_MODULES = [^}]+}/, - 'const AUTOCOMPLETE_MODULES = {\n' + autocompParsers.sort().join(',\n') + '\n}' - ); - writeFile(SQL_PARSER_REPOSITORY_PATH, contents).then(() => { - console.log('Done!\n'); - }); - }); - } - }; - generateRecursive(); - }); -}); + for (let i = 0; i < definitionsToGenerate.length; i++) { + const parserDefinition = definitionsToGenerate[i]; + console.log( + `Generating "${parserDefinition.parserName}"${ + definitionsToGenerate.length > 1 ? ` (${i + 1}/${totalParserCount})` : '' + }...` + ); + await generateParser(parserDefinition); + } + console.log('Done!'); +} catch (err) { + console.log(err); +} /* eslint-enable no-restricted-syntax */ diff --git a/tools/jison/package.json b/tools/jison/package.json index 0d2a22fe342..65206061094 100644 --- a/tools/jison/package.json +++ b/tools/jison/package.json @@ -3,6 +3,7 @@ "version": "1.0.0", "description": "", "main": "generateParsers.js", + "type": "module", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/tools/jison/parserDefinitions.js b/tools/jison/parserDefinitions.js new file mode 100644 index 00000000000..58a651e640c --- /dev/null +++ b/tools/jison/parserDefinitions.js @@ -0,0 +1,201 @@ +// Licensed to Cloudera, Inc. under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. Cloudera, Inc. licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/* eslint-disable no-restricted-syntax */ + +import { fileExists, listDir, readFile } from './utils.js'; + +const LICENSE = `// Licensed to Cloudera, Inc. under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. Cloudera, Inc. licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +`; + +const SQL_STATEMENTS_PARSER_JSDOC = `/** + * @param {string} input + * + * @return {SqlStatementsParserResult} + */ +`; + +const AUTOCOMPLETE_PARSER_JSDOC = `/** + * @param {string} input + * + * @return {AutocompleteParseResult} + */ +`; + +const PARSER_FOLDER = '../../desktop/core/src/desktop/js/parse'; +const SQL_FOLDER = '../../desktop/core/src/desktop/js/parse/sql'; + +/* + The FIXED_PARSER_DEFINITIONS are for parsers other than the ones used for SQL autocomplete and syntax + which are identified automatically under SQL_FOLDER + + The "afterParse" function can be used to modify the generated parser code, for instance, add the license header, + add specific imports, and make sure it is ES modules compatible etc. + */ +const FIXED_PARSER_DEFINITIONS = { + globalSearchParser: { + sources: [`${PARSER_FOLDER}/jison/globalSearchParser.jison`], + targetJison: 'globalSearchParser.jison', + outputFolder: PARSER_FOLDER, + parserName: 'globalSearchParser', + afterParse: async contents => + `${LICENSE}${contents.replace( + 'var globalSearchParser = ', + "import SqlParseSupport from 'parse/sqlParseSupport';\n\nvar globalSearchParser = " + )}\nexport default globalSearchParser;\n` + }, + solrFormulaParser: { + sources: [`${PARSER_FOLDER}/jison/solrFormulaParser.jison`], + targetJison: 'solrFormulaParser.jison', + outputFolder: PARSER_FOLDER, + parserName: 'solrFormulaParser', + afterParse: async contents => `${LICENSE}${contents}\nexport default solrFormulaParser;\n` + }, + solrQueryParser: { + sources: [`${PARSER_FOLDER}/jison/solrQueryParser.jison`], + targetJison: 'solrQueryParser.jison', + outputFolder: PARSER_FOLDER, + parserName: 'solrQueryParser', + afterParse: async contents => `${LICENSE}${contents}\nexport default solrQueryParser;\n` + }, + sqlStatementsParser: { + sources: [`${PARSER_FOLDER}/jison/sqlStatementsParser.jison`], + targetJison: 'sqlStatementsParser.jison', + outputFolder: PARSER_FOLDER, + parserName: 'sqlStatementsParser', + afterParse: async contents => + `${LICENSE}${contents.replace( + 'parse: function parse', + SQL_STATEMENTS_PARSER_JSDOC + 'parse: function parse' + )}\nexport default sqlStatementsParser;\n` + }, + hplsqlStatementsParser: { + sources: [`${PARSER_FOLDER}/jison/hplsqlStatementsParser.jison`], + targetJison: 'hplsqlStatementsParser.jison', + outputFolder: PARSER_FOLDER, + parserName: 'hplsqlStatementsParser', + afterParse: async contents => + `${LICENSE}${contents.replace( + 'parse: function parse', + SQL_STATEMENTS_PARSER_JSDOC + 'parse: function parse' + )}\nexport default hplsqlStatementsParser;\n` + } +}; + +/** + * Searches through the SQL_FOLDER and if a jison/structure.json file exists it considers it a parser + */ +const findParserSources = async () => { + const folders = await listDir(SQL_FOLDER); + const structureFiles = []; + for (const folder of folders) { + const outputFolder = `${SQL_FOLDER}/${folder}`; + const jisonFolder = `${outputFolder}/jison`; + const structureFile = `${jisonFolder}/structure.json`; + if (fileExists(structureFile)) { + structureFiles.push({ dialect: folder, outputFolder, jisonFolder, structureFile }); + } + } + return structureFiles; +}; + +/** + * Identifies all the SQL parsers based on subfolders in SQL_FOLDER and adds them to parserDefinitions + */ +export const identifySqlParsers = async () => { + const parserSources = await findParserSources(); + const foundDefinitions = {}; + for (const parserSource of parserSources) { + const structure = JSON.parse(await readFile(parserSource.structureFile)); + if (structure.autocomplete) { + foundDefinitions[`${parserSource.dialect}AutocompleteParser`] = createParserDefinition( + structure.autocomplete, + parserSource, + true, + structure + ); + } + if (structure.syntax) { + foundDefinitions[`${parserSource.dialect}SyntaxParser`] = createParserDefinition( + structure.syntax, + parserSource, + false, + structure + ); + } + } + return { ...FIXED_PARSER_DEFINITIONS, ...foundDefinitions }; +}; + +const createParserDefinition = ( + sources, + { dialect, outputFolder, jisonFolder }, + autocomplete, + { lexer, imports } +) => { + const parserName = `${dialect}${autocomplete ? 'AutocompleteParser' : 'SyntaxParser'}`; + + const absoluteSources = sources.map(source => `${jisonFolder}/${source}`); + + for (const source of absoluteSources) { + if (!fileExists(source)) { + throw new Error( + `Could not find the file '${source}' as defined in structure.json for ${dialect}` + ); + } + } + + return { + sources: sources.map(source => `${jisonFolder}/${source}`), + lexer: `${jisonFolder}/${lexer}`, + targetJison: `${outputFolder}/${parserName}.jison`, + sqlParser: autocomplete ? 'AUTOCOMPLETE' : 'SYNTAX', + parserName, + outputFolder, + afterParse: async contents => + `${LICENSE}${contents + // Add default import of sqlParseSupport or imports specified in the structure file + .replace( + `var ${parserName} = `, + imports + ? `${imports.join(';\n')};\n\n$var ${parserName} = ` + : `import SqlParseSupport from 'parse/sql/${dialect}/sqlParseSupport';\n\nvar ${parserName} = ` + ) + // Add jsdoc to the parse function + .replace('parse: function parse', AUTOCOMPLETE_PARSER_JSDOC + 'parse: function parse') + // Fix a bug in jison (https://github.com/zaach/jison/pull/356) + .replace( + 'loc: yyloc,', + "loc: lexer.yylloc, ruleId: stack.slice(stack.length - 2, stack.length).join('')," + )}\nexport default ${parserName};\n` + }; +}; + +/* eslint-enable no-restricted-syntax */ diff --git a/tools/jison/utils.js b/tools/jison/utils.js new file mode 100644 index 00000000000..0248955efa8 --- /dev/null +++ b/tools/jison/utils.js @@ -0,0 +1,30 @@ +// Licensed to Cloudera, Inc. under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. Cloudera, Inc. licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import fs from 'fs'; + +export const listDir = async folder => fs.promises.readdir(folder); + +export const fileExists = file => fs.existsSync(file); + +export const readFile = async path => { + const buffer = await fs.promises.readFile(path); + return buffer ? buffer.toString() : ''; +}; + +export const writeFile = (path, contents) => fs.promises.writeFile(path, contents); + +export const deleteFile = path => fs.unlinkSync(path);