database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Make changes based on feedback to PR #1254 for the cache.

Browse Source
This commit is contained in:
Gagan Goel
2020-06-08 14:11:30 -04:00
parent 1216f9fc70
commit 1a5c6910da
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/mysql/CMakeLists.txt
View File

@ -36,13 +36,13 @@ set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-t
if (COMMAND mysql_add_plugin) if (COMMAND mysql_add_plugin)
mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY DEFAULT mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY DEFAULT
LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool aria myisam perfschema LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool
COMPONENT columnstore-engine) COMPONENT columnstore-engine)
else () else ()
add_library(ha_columnstore SHARED ${libcalmysql_SRCS}) add_library(ha_columnstore SHARED ${libcalmysql_SRCS})
SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "")
target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool aria myisam perfschema) target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine) install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT columnstore-engine)
endif () endif ()

6
dbcon/mysql/ha_mcs.cpp
View File

@ -1655,7 +1655,7 @@ static int ha_mcs_cache_deinit(void *p)
if (plugin_maria) if (plugin_maria)
{ {
plugin_unlock(0, plugin_maria); plugin_unlock(0, plugin_maria);
plugin_maria= 0; plugin_maria= NULL;
} }
return 0; return 0;
} }
@ -1696,10 +1696,10 @@ maria_declare_plugin(columnstore)
PLUGIN_LICENSE_GPL, PLUGIN_LICENSE_GPL,
ha_mcs_cache_init, /* Plugin Init */ ha_mcs_cache_init, /* Plugin Init */
ha_mcs_cache_deinit, /* Plugin Deinit */ ha_mcs_cache_deinit, /* Plugin Deinit */
0x0100, /* 1.0 */ MCSVERSIONHEX,
NULL, /* status variables */ NULL, /* status variables */
NULL, /* system variables */ NULL, /* system variables */
"1.0", MCSVERSION, /* string version */
MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */ MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */
}, },
{ {

1
dbcon/mysql/ha_mcs_execplan.cpp
View File

@ -6095,7 +6095,6 @@ bool isMCSTable(TABLE* table_ptr)
#endif #endif
if (engineName == "Columnstore" || if (engineName == "Columnstore" ||
engineName == "InfiniDB" ||
engineName == "Columnstore_cache") engineName == "Columnstore_cache")
return true; return true;
else else