Skip to content

DM-55216: Add Hyrise-based SQL parser backend #1030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malensek wants to merge 19 commits into
base: tickets/DM-43715
Choose a base branch
from
Open

DM-55216: Add Hyrise-based SQL parser backend #1030

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
618c68f
Normalize test queries
malensek Jun 12, 2026
03403cd
TEMPORARY: add hyrise source to extern
malensek Jun 15, 2026
bc9b28c
Add Hyrise adapter and tests
malensek Jun 15, 2026
892c3c3
Add parser stress test and .sql corpus
malensek Jun 17, 2026
b313f68
Expand test coverage
malensek Jun 17, 2026
6503435
Update parser to handle excess empty statements
malensek Jun 17, 2026
dd2f2ae
Refactor Hyrise adapter and add diagnostics
malensek Jun 17, 2026
f27e277
Add more Qserv IR test validation
malensek Jun 18, 2026
a4f1613
Add alternate non-ANTLR SET / CALL implementation
malensek Jun 19, 2026
a68f3fc
Remove QueryAnaHelper::getParser
malensek Jun 19, 2026
9becc72
Remove hyrise source tree
malensek Jun 20, 2026
099d956
Move hyrise to submodule
malensek Jun 20, 2026
dcc49bc
Simplify SQL backend testing string normalization
malensek Jun 22, 2026
1e50e41
Update Hyrise IR test to properly test SET
malensek Jun 22, 2026
fa3a12b
Make CALL regex more restrictive
malensek Jun 23, 2026
0b29348
Update session variable handling for SET GLOBAL
malensek Jun 23, 2026
8936681
Update area restrictor handling with AND/OR/NOT
malensek Jun 24, 2026
829fa8c
Minor refactor to improve readability
malensek Jun 25, 2026
a2aaa7f
Update _resultDeleteRe docstring to match regex
malensek Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
[submodule "extern/log"]
path = extern/log
url = ../../lsst/log
[submodule "extern/hyrise-sql-parser"]
path = extern/hyrise-sql-parser
url = https://github.com/lsst/hyrise-sql-parser
branch = qserv-compat
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,18 @@ project(Qserv

enable_testing()

option(QSERV_USE_HYRISE_SQL_PARSER
"Use the Hyrise SQL parser to build query IR for SELECT statements, instead of the ANTLR-based parser"
ON
)

include(GNUInstallDirs)
set(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR}/install)

add_subdirectory(bin)
add_subdirectory(doc)
add_subdirectory(etc)
add_subdirectory(extern/hyrise-sql-parser)
add_subdirectory(extern/log)
add_subdirectory(extern/sphgeom)
Comment thread
malensek marked this conversation as resolved.
add_subdirectory(python)
Expand Down
4 changes: 2 additions & 2 deletions doc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ add_custom_target(docs-linkcheck
COMMENT "Checking documentation links with Sphinx"
COMMAND ${SPHINX_EXECUTABLE}
-b linkcheck
-d ${CMAKE_CURRENT_BINARY_DIR}/doctrees
-d ${CMAKE_CURRENT_BINARY_DIR}/doctrees-linkcheck
-n -W
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/linkcheck
BYPRODUCTS
${CMAKE_CURRENT_BINARY_DIR}/doctrees
${CMAKE_CURRENT_BINARY_DIR}/doctrees-linkcheck
${CMAKE_CURRENT_BINARY_DIR}/linkcheck
)
1 change: 1 addition & 0 deletions extern/hyrise-sql-parser
Open in desktop
Submodule hyrise-sql-parser added at 17e8d1
22 changes: 21 additions & 1 deletion src/ccontrol/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ target_include_directories(ccontrol PRIVATE
)

target_sources(ccontrol PRIVATE
HyriseAdapter.cc
MergingHandler.cc
ParseAdapters.cc
ParseListener.cc
Comment thread
malensek marked this conversation as resolved.
Expand All @@ -27,11 +28,16 @@ target_link_libraries(ccontrol PUBLIC
cconfig
css
global
hyrise_sql_parser::sqlparser
log
parser
sphgeom
)
Comment thread
malensek marked this conversation as resolved.

if(QSERV_USE_HYRISE_SQL_PARSER)
target_compile_definitions(ccontrol PUBLIC QSERV_USE_HYRISE_SQL_PARSER)
endif()

install(TARGETS ccontrol)

FUNCTION(ccontrol_tests)
Expand All @@ -58,7 +64,21 @@ FUNCTION(ccontrol_tests)
ENDFUNCTION()

ccontrol_tests(
testAntlr4GeneratedIR
testCControl
testParserCorpus
testUserQueryType
)

target_compile_definitions(testParserCorpus PRIVATE
QSERV_PARSER_CORPUS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/testdata/parser-corpus"
)

if(QSERV_USE_HYRISE_SQL_PARSER)
ccontrol_tests(
testHyriseGeneratedIR
)
else()
ccontrol_tests(
testAntlr4GeneratedIR
)
endif()
Loading
Loading