Commit 6467bcca authored by Sergei Golubchik's avatar Sergei Golubchik

oqgraph and sphinx on windows

parent aefaf42f
--plugin-load=$OQGRAPH_ENGINE_SO --plugin-load=$HA_OQGRAPH_SO
...@@ -2,7 +2,7 @@ package My::Suite::OQGraph; ...@@ -2,7 +2,7 @@ package My::Suite::OQGraph;
@ISA = qw(My::Suite); @ISA = qw(My::Suite);
return "No OQGraph" unless $ENV{OQGRAPH_ENGINE_SO}; return "No OQGraph" unless $ENV{HA_OQGRAPH_SO};
bless { }; bless { };
...@@ -13,10 +13,25 @@ ...@@ -13,10 +13,25 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") INCLUDE (CheckCXXSourceCompiles)
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") CHECK_CXX_SOURCE_COMPILES(
"#include <boost/version.hpp>
#if BOOST_VERSION >= 104000
#else
#error oops
#endif
int main() { return 0; }" BOOST_OK)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql IF(BOOST_OK)
INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OQGRAPH /EHsc")
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/regex ${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/extra/yassl/include) ${CMAKE_SOURCE_DIR}/extra/yassl/include)
ADD_LIBRARY(oqgraph ha_oqgraph.cc)
SET(OQGRAPH_SOURCES ha_oqgraph.cc graphcore.cc)
MYSQL_STORAGE_ENGINE(OQGRAPH)
ENDIF()
...@@ -47,11 +47,11 @@ BOOST_CXXFLAGS+= -funroll-loops -fno-trapping-math ...@@ -47,11 +47,11 @@ BOOST_CXXFLAGS+= -funroll-loops -fno-trapping-math
EXTRA_DIST = ha_oqgraph.h ha_oqgraph.cc graphcore.cc \ EXTRA_DIST = ha_oqgraph.h ha_oqgraph.cc graphcore.cc \
graphcore-graph.h graphcore-types.h graphcore.h \ graphcore-graph.h graphcore-types.h graphcore.h \
CMakeFiles.txt plug.in oqgraph_probes.d CMakeLists.txt plug.in oqgraph_probes.d
# DTRACE = @DTRACE@ # DTRACE = @DTRACE@
# DTRACEFLAGS = @DTRACEFLAGS@ # DTRACEFLAGS = @DTRACEFLAGS@
# DTRACEFILES = .libs/liboqgraph_engine_la-ha_oqgraph.o # DTRACEFILES = .libs/libha_oqgraph_la-ha_oqgraph.o
ORIG_CXXFLAGS = @CXXFLAGS@ ORIG_CXXFLAGS = @CXXFLAGS@
CXXFLAGS= CXXFLAGS=
...@@ -71,18 +71,18 @@ else ...@@ -71,18 +71,18 @@ else
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/regex -I$(top_srcdir)/sql -I$(srcdir) -DHAVE_OQGRAPH INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/regex -I$(top_srcdir)/sql -I$(srcdir) -DHAVE_OQGRAPH
endif !BUILD_OQGRAPH_STANDALONE endif !BUILD_OQGRAPH_STANDALONE
EXTRA_LTLIBRARIES = oqgraph_engine.la EXTRA_LTLIBRARIES = ha_oqgraph.la
mysqlplugin_LTLIBRARIES = @plugin_oqgraph_shared_target@ mysqlplugin_LTLIBRARIES = @plugin_oqgraph_shared_target@
oqgraph_engine_la_SOURCES = ha_oqgraph.cc ha_oqgraph_la_SOURCES = ha_oqgraph.cc
oqgraph_engine_la_LIBADD = libgraphcore.la ha_oqgraph_la_LIBADD = libgraphcore.la
# if HAVE_DTRACE # if HAVE_DTRACE
# oqgraph_engine_la_LIBADD += oqgraph_probes.o # ha_oqgraph_la_LIBADD += oqgraph_probes.o
# endif # endif
oqgraph_engine_la_LDFLAGS = -module -rpath $(mysqlplugindir) ha_oqgraph_la_LDFLAGS = -shared -module -rpath $(mysqlplugindir)
oqgraph_engine_la_CFLAGS = $(ORIG_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_oqgraph_la_CFLAGS = $(ORIG_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
oqgraph_engine_la_CXXFLAGS = $(ORIG_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_oqgraph_la_CXXFLAGS = $(ORIG_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
# oqgraph_probes.h: oqgraph_probes.d # oqgraph_probes.h: oqgraph_probes.d
# $(DTRACE) $(DTRACEFLAGS) -h -s oqgraph_probes.d # $(DTRACE) $(DTRACEFLAGS) -h -s oqgraph_probes.d
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
====================================================================== ======================================================================
*/ */
#include <strings.h> #include <string.h>
#define BOOST_ALL_NO_LIB 1 #define BOOST_ALL_NO_LIB 1
...@@ -997,7 +997,7 @@ int stack_cursor::fetch_row(const row &row_info, row &result, ...@@ -997,7 +997,7 @@ int stack_cursor::fetch_row(const row &row_info, row &result,
const reference &ref) const reference &ref)
{ {
last= ref; last= ref;
if (optional<Vertex> v= last.vertex()) if (last.vertex())
{ {
optional<int> seq; optional<int> seq;
optional<EdgeWeight> w; optional<EdgeWeight> w;
......
MYSQL_STORAGE_ENGINE(oqgraph,,[Graph Storage Engine], MYSQL_STORAGE_ENGINE(oqgraph,,[Graph Storage Engine],
[Open Query Graph Computation Engine], []) [Open Query Graph Computation Engine], [])
MYSQL_PLUGIN_DYNAMIC(oqgraph, [oqgraph_engine.la]) MYSQL_PLUGIN_DYNAMIC(oqgraph, [ha_oqgraph.la])
MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(oqgraph, [ha_oqgraph.cc]) MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(oqgraph, [ha_oqgraph.cc])
MYSQL_PLUGIN_ACTIONS(oqgraph,[ MYSQL_PLUGIN_ACTIONS(oqgraph,[
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
# #
# This file is used to make the Windows version # This file is used to make the Windows version
INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMYSQL_SERVER") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMYSQL_SERVER")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMYSQL_SERVER") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMYSQL_SERVER")
...@@ -101,3 +103,4 @@ src/xt_defs.h ...@@ -101,3 +103,4 @@ src/xt_defs.h
src/xt_errno.h) src/xt_errno.h)
MYSQL_STORAGE_ENGINE(PBXT) MYSQL_STORAGE_ENGINE(PBXT)
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
ADD_DEFINITIONS(-DMYSQL_SERVER) ADD_DEFINITIONS(-DMYSQL_SERVER)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
...@@ -8,4 +8,5 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ...@@ -8,4 +8,5 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/regex) ${CMAKE_SOURCE_DIR}/regex)
SET(SPHINX_SOURCES ha_sphinx.cc) SET(SPHINX_SOURCES ha_sphinx.cc)
ADD_LIBRARY(sphinx ha_sphinx.cc) SET(SPHINX_LIBS ws2_32.lib)
MYSQL_STORAGE_ENGINE(SPHINX)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment