You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-11-25 20:23:16 +03:00
3fabf01e93
Disabled 4th if block in buildOuterJoin to handle non-optimized MDB query
structures.
Broke getSelectPlan into pieces: processFrom, processWhere.
MCOL-3593 UNION processing depends on two flags isUnion that comes as
arg of getSelectPlan and unionSel that is a local variable in
getSelectPlan. Modularization of getSelectPlan broke the mechanizm.
This patch is supposed to partially fix it.
MCOL-3593 Removed unused if condition from buildOuterJoin that allows
unsupported construct subquery in ON expression.
Fixed an improper if condition that ignors tableMap entries w/o condition
in external_lock thus external_lock doesn't clean up when the query
finishes.
Fixed wrong logging for queries processed in tableMode. Now rnd_init
properly sends queryText down to ExeMgr to be logged.
MCOL-3593 Unused attribute FromSubQuery::fFromSub was removed.
getSelectPlan has been modularized into: setExecutionParams,
processFrom, processWhere. SELECT, HAVING, GROUP BY, ORDER BY
still lives in getSelectPlan.
Copied optimization function simplify_joins_ into our pushdown
code to provide the plugin code with some rewrites from MDB it
expects.
The columnstore_processing_handlers_fallback session variable
has been removed thus CS can't fallback from SH to partial
execution paths, e.g. DH, GBH or plugin API.
MCOL-3602 Moved MDB optimizer rewrites into a separate file.
Add SELECT_LEX::optimize_unflattened_subqueries() call to fix IN
into EXISTS rewrite for semi-JOINs with subqueries.
disable_indices_for_CEJ() add index related hints to disable
index access methods in Cross Engine Joins.
create_SH() now flattens JOIN that has both physical tables and
views. This fixes most of views related tests in the regression.
119 lines
5.1 KiB
CMake
119 lines
5.1 KiB
CMake
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/install_mcs_mysql.sh.in" "${CMAKE_CURRENT_SOURCE_DIR}/install_mcs_mysql.sh" @ONLY)
|
|
|
|
|
|
include_directories( ${ENGINE_COMMON_INCLUDES}
|
|
/usr/include/libxml2 )
|
|
|
|
|
|
SET ( libcalmysql_SRCS
|
|
ha_mcs_sysvars.cpp
|
|
ha_mcs_client_udfs.cpp
|
|
ha_mcs_opt_rewrites.cpp
|
|
ha_mcs_pushdown.cpp
|
|
ha_mcs.cpp
|
|
ha_mcs_impl.cpp
|
|
ha_mcs_dml.cpp
|
|
ha_mcs_ddl.cpp
|
|
ha_mcs_execplan.cpp
|
|
ha_scalar_sub.cpp
|
|
ha_in_sub.cpp
|
|
ha_exists_sub.cpp
|
|
ha_from_sub.cpp
|
|
ha_select_sub.cpp
|
|
ha_view.cpp sm.cpp
|
|
ha_window_function.cpp
|
|
ha_mcs_partition.cpp
|
|
ha_pseudocolumn.cpp)
|
|
|
|
add_definitions(-DMYSQL_DYNAMIC_PLUGIN)
|
|
|
|
set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-templates")
|
|
|
|
add_library(calmysql SHARED ${libcalmysql_SRCS})
|
|
|
|
target_link_libraries(calmysql ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
|
|
|
|
set_target_properties(calmysql PROPERTIES VERSION 1.0.0 SOVERSION 1)
|
|
|
|
SET ( is_columnstore_tables_SRCS
|
|
is_columnstore_tables.cpp
|
|
sm.cpp
|
|
)
|
|
add_library(is_columnstore_tables SHARED ${is_columnstore_tables_SRCS})
|
|
|
|
target_link_libraries(is_columnstore_tables ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
|
|
|
|
# Don't prepend .so file with 'lib'
|
|
set_target_properties(is_columnstore_tables PROPERTIES PREFIX "")
|
|
set_target_properties(is_columnstore_tables PROPERTIES VERSION 1.0.0 SOVERSION 1)
|
|
|
|
SET ( is_columnstore_columns_SRCS
|
|
is_columnstore_columns.cpp
|
|
sm.cpp
|
|
)
|
|
add_library(is_columnstore_columns SHARED ${is_columnstore_columns_SRCS})
|
|
|
|
target_link_libraries(is_columnstore_columns ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
|
|
|
|
# Don't prepend .so file with 'lib'
|
|
set_target_properties(is_columnstore_columns PROPERTIES PREFIX "")
|
|
set_target_properties(is_columnstore_columns PROPERTIES VERSION 1.0.0 SOVERSION 1)
|
|
|
|
SET ( is_columnstore_extents_SRCS
|
|
is_columnstore_extents.cpp
|
|
sm.cpp
|
|
)
|
|
add_library(is_columnstore_extents SHARED ${is_columnstore_extents_SRCS})
|
|
|
|
target_link_libraries(is_columnstore_extents ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
|
|
|
|
# Don't prepend .so file with 'lib'
|
|
set_target_properties(is_columnstore_extents PROPERTIES PREFIX "")
|
|
set_target_properties(is_columnstore_extents PROPERTIES VERSION 1.0.0 SOVERSION 1)
|
|
|
|
SET ( is_columnstore_files_SRCS
|
|
is_columnstore_files.cpp
|
|
sm.cpp
|
|
)
|
|
add_library(is_columnstore_files SHARED ${is_columnstore_files_SRCS})
|
|
|
|
target_link_libraries(is_columnstore_files ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
|
|
|
|
# Don't prepend .so file with 'lib'
|
|
set_target_properties(is_columnstore_files PROPERTIES PREFIX "")
|
|
set_target_properties(is_columnstore_files PROPERTIES VERSION 1.0.0 SOVERSION 1)
|
|
|
|
|
|
install(TARGETS calmysql is_columnstore_tables is_columnstore_columns is_columnstore_extents is_columnstore_files DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine)
|
|
install(FILES syscatalog_mysql.sql
|
|
dumpcat_mysql.sql
|
|
calsetuserpriority.sql
|
|
calremoveuserpriority.sql
|
|
calshowprocesslist.sql
|
|
columnstore_info.sql
|
|
DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT storage-engine)
|
|
install(PROGRAMS install_mcs_mysql.sh mysql-Columnstore
|
|
DESTINATION ${ENGINE_SBINDIR} COMPONENT storage-engine)
|
|
|
|
install(FILES columnstore.cnf
|
|
DESTINATION ${MARIADB_MYCNFDIR} COMPONENT storage-engine)
|
|
|
|
|
|
#AM_CPPFLAGS = $(idb_common_includes) $(idb_cppflags)
|
|
#AM_CFLAGS = $(idb_cflags)
|
|
#AM_CXXFLAGS = $(idb_cxxflags)
|
|
#AM_LDFLAGS = $(idb_ldflags)
|
|
#lib_LTLIBRARIES = libcalmysql.la
|
|
#libcalmysql_la_SOURCES = ha_mcs.cpp ha_mcs_impl.cpp ha_mcs_dml.cpp ha_mcs_ddl.cpp ha_mcs_execplan.cpp ha_scalar_sub.cpp ha_in_sub.cpp ha_exists_sub.cpp ha_from_sub.cpp ha_select_sub.cpp ha_view.cpp sm.cpp ha_window_function.cpp ha_mcs_partition.cpp ha_pseudocolumn.cpp
|
|
#libcalmysql_la_LDFLAGS = -version-info 1:0:0 $(idb_common_ldflags) $(idb_common_libs) $(idb_write_libs) $(AM_LDFLAGS)
|
|
#libcalmysql_la_CPPFLAGS = -I/usr/include/libxml2 -I../../../mysql/include -I../../../mysql/sql -I../../../mysql/regex -DMYSQL_DYNAMIC_PLUGIN $(AM_CPPFLAGS)
|
|
#include_HEADERS = idb_mysql.h
|
|
#
|
|
#dist_mysql_DATA = syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql calshowprocesslist.sql my.cnf
|
|
#dist_mysql_SCRIPTS = install_mcs_mysql.sh mysql-Columnstore dumpcat.pl
|
|
#
|
|
#libcalmysql_la-ha_mcs.lo: ha_mcs.cpp
|
|
# if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcalmysql_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -fno-rtti -fno-implicit-templates -MT libcalmysql_la-ha_mcs.lo -MD -MP -MF "$(DEPDIR)/libcalmysql_la-ha_mcs.Tpo" -c -o libcalmysql_la-ha_mcs.lo `test -f 'ha_mcs.cpp' || echo '$(srcdir)/'`ha_mcs.cpp; \
|
|
# then mv -f "$(DEPDIR)/libcalmysql_la-ha_mcs.Tpo" "$(DEPDIR)/libcalmysql_la-ha_mcs.Plo"; else rm -f "$(DEPDIR)/libcalmysql_la-ha_mcs.Tpo"; exit 1; fi
|
|
|