mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ha_cassandra.so and ha_oqgraph.so can be build only if boost is installed

Browse source 
on the build machine. So put them into the deb packages optionally.
     
Additionally, fixing cassandra/CMakeLists.txt to work with thrift
installed in /opt/local and /opt. It was supposed to work, but did
not work actually. Only thrift installed in /usr or /usr/local worked.


renamed:
  debian/dist/Debian/mariadb-server-10.0.files => debian/dist/Debian/mariadb-server-10.0.files.in
  debian/dist/Ubuntu/mariadb-server-10.0.files => debian/dist/Ubuntu/mariadb-server-10.0.files.in
modified:
  .bzrignore
  CMakeLists.txt
  storage/cassandra/CMakeLists.txt
  storage/cassandra/cassandra_se.cc
  storage/cassandra/gen-cpp/Cassandra.h
  storage/cassandra/gen-cpp/cassandra_types.h
  storage/oqgraph/CMakeLists.txt
  debian/dist/Debian/mariadb-server-10.0.files.in
  debian/dist/Ubuntu/mariadb-server-10.0.files.in
This commit is contained in:
Alexander Barkov 2013-04-25 17:12:52 +04:00
parent 616e7a7466
commit bc80fb07de
9 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bzrignore
View file

@ -162,6 +162,8 @@ dbug/user.ps
dbug/user.t
debian/control
debian/defs.mk
debian/dist/Debian/mariadb-server-10.0.files
debian/dist/Ubuntu/mariadb-server-10.0.files
debug/
depcomp
Docs/INSTALL-BINARY

12
CMakeLists.txt
View file

@ -345,6 +345,18 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
IF(DEB)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.0.files.in
${CMAKE_SOURCE_DIR}/debian/mariadb-server-10.0.files)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/debian/dist/Debian/mariadb-server-10.0.files.in
${CMAKE_SOURCE_DIR}/debian/dist/Debian/mariadb-server-10.0.files)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/debian/dist/Ubuntu/mariadb-server-10.0.files.in
${CMAKE_SOURCE_DIR}/debian/dist/Ubuntu/mariadb-server-10.0.files)
ENDIF(DEB)
# Handle the "INFO_*" files.
INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
# Source: This can be done during the cmake phase, all information is

4
debian/dist/Debian/mariadb-server-10.0.files → debian/dist/Debian/mariadb-server-10.0.files.in vendored
View file

@ -5,8 +5,6 @@ usr/lib/mysql/plugin/auth_test_plugin.so
usr/lib/mysql/plugin/daemon_example.ini
usr/lib/mysql/plugin/dialog_examples.so
usr/lib/mysql/plugin/dialog.so
usr/lib/mysql/plugin/ha_cassandra.so
usr/lib/mysql/plugin/ha_oqgraph.so
usr/lib/mysql/plugin/handlersocket.so
usr/lib/mysql/plugin/libdaemon_example.so
usr/lib/mysql/plugin/mypluglib.so
@ -81,3 +79,5 @@ usr/share/mysql/mysql_system_tables_data.sql
usr/share/mysql/mysql_system_tables.sql
usr/share/mysql/mysql_performance_tables.sql
usr/share/mysql/mysql_test_data_timezone.sql
@CASSANDRA_DEB_FILES@
@OQGRAPH_DEB_FILES@

4
debian/dist/Ubuntu/mariadb-server-10.0.files → debian/dist/Ubuntu/mariadb-server-10.0.files.in vendored
View file

@ -5,8 +5,6 @@ usr/lib/mysql/plugin/auth_test_plugin.so
usr/lib/mysql/plugin/daemon_example.ini
usr/lib/mysql/plugin/dialog_examples.so
usr/lib/mysql/plugin/dialog.so
usr/lib/mysql/plugin/ha_cassandra.so
usr/lib/mysql/plugin/ha_oqgraph.so
usr/lib/mysql/plugin/handlersocket.so
usr/lib/mysql/plugin/libdaemon_example.so
usr/lib/mysql/plugin/mypluglib.so
@ -83,3 +81,5 @@ usr/share/mysql/mysql_system_tables_data.sql
usr/share/mysql/mysql_system_tables.sql
usr/share/mysql/mysql_performance_tables.sql
usr/share/mysql/mysql_test_data_timezone.sql
@CASSANDRA_DEB_FILES@
@OQGRAPH_DEB_FILES@

8
storage/cassandra/CMakeLists.txt
View file

@ -10,6 +10,7 @@ ${Thrift_INCLUDE_DIR} # this may be set
)
# Verify that thrift linking library is found
SET(Thrift_LIB_PATHS ${Thrift_LIB_PATHS} /usr/local/lib /opt/local/lib /opt/lib)
FIND_LIBRARY(Thrift_LIBS NAMES thrift PATHS ${Thrift_LIB_PATHS} ${Thrift_LIB})
IF(EXISTS ${Thrift_LIBS})
GET_FILENAME_COMPONENT(LINK_DIR ${Thrift_LIBS} PATH ABSOLUTE)
@ -17,15 +18,16 @@ ELSE()
RETURN()
ENDIF()
INCLUDE_DIRECTORIES(AFTER ${Thrift_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(AFTER ${Thrift_INCLUDE_DIRS}/..)
SET(CMAKE_REQUIRED_INCLUDES ${Thrift_INCLUDE_DIRS})
STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
SET(CMAKE_REQUIRED_INCLUDES "${Thrift_INCLUDE_DIRS}/..")
CHECK_CXX_SOURCE_COMPILES(
"
#include <Thrift.h>
#include <thrift/Thrift.h>
#include <boost/shared_ptr.hpp>
int main() {
boost::shared_ptr<char> p(new char(10));
@ -48,6 +50,8 @@ IF(CASSANDRASE_OK)
LINK_DIRECTORIES(${LINK_DIR})
SET(CASSANDRA_DEB_FILES "usr/lib/mysql/plugin/ha_cassandra.so" PARENT_SCOPE)
MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift COMPONENT cassandra-engine)
IF (INSTALL_SYSCONFDIR)
INSTALL(FILES cassandra.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d

12
storage/cassandra/cassandra_se.cc
View file

@ -6,12 +6,12 @@
#include <stdio.h>
#include <stdarg.h>
#include "Thrift.h"
#include "transport/TSocket.h"
#include "transport/TTransport.h"
#include "transport/TBufferTransports.h"
#include "protocol/TProtocol.h"
#include "protocol/TBinaryProtocol.h"
#include "thrift/Thrift.h"
#include "thrift/transport/TSocket.h"
#include "thrift/transport/TTransport.h"
#include "thrift/transport/TBufferTransports.h"
#include "thrift/protocol/TProtocol.h"
#include "thrift/protocol/TBinaryProtocol.h"
#include "gen-cpp/Cassandra.h"
// cassandra includes end

2
storage/cassandra/gen-cpp/Cassandra.h
View file

@ -7,7 +7,7 @@
#ifndef Cassandra_H
#define Cassandra_H
#include <TProcessor.h>
#include <thrift/TProcessor.h>
#include "cassandra_types.h"
namespace org { namespace apache { namespace cassandra {

8
storage/cassandra/gen-cpp/cassandra_types.h
View file

@ -10,10 +10,10 @@
#include <inttypes.h>
#include <netinet/in.h>
#include <Thrift.h>
#include <TApplicationException.h>
#include <protocol/TProtocol.h>
#include <transport/TTransport.h>
#include <thrift/Thrift.h>
#include <thrift/TApplicationException.h>
#include <thrift/protocol/TProtocol.h>
#include <thrift/transport/TTransport.h>

2
storage/oqgraph/CMakeLists.txt
View file

@ -32,6 +32,8 @@ IF(BOOST_OK)
STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
ENDIF(MSVC)
SET(OQGRAPH_DEB_FILES "usr/lib/mysql/plugin/ha_oqgraph.so" PARENT_SCOPE)
MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE
MODULE_ONLY)
ENDIF(BOOST_OK)