Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
86ed2765
Commit
86ed2765
authored
Feb 21, 2013
by
Antony T Curtis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for FindJust.cmake
Make sure that boost is included with consistent config.
parent
694cbb5f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
65 additions
and
6 deletions
+65
-6
cmake/FindJudy.cmake
cmake/FindJudy.cmake
+1
-1
storage/oqgraph/graphcore-config.h
storage/oqgraph/graphcore-config.h
+40
-0
storage/oqgraph/graphcore-graph.cc
storage/oqgraph/graphcore-graph.cc
+1
-0
storage/oqgraph/graphcore.cc
storage/oqgraph/graphcore.cc
+4
-4
storage/oqgraph/ha_oqgraph.cc
storage/oqgraph/ha_oqgraph.cc
+11
-1
storage/oqgraph/oqgraph_judy.cc
storage/oqgraph/oqgraph_judy.cc
+6
-0
storage/oqgraph/oqgraph_thunk.h
storage/oqgraph/oqgraph_thunk.h
+2
-0
No files found.
cmake/FindJudy.cmake
View file @
86ed2765
...
...
@@ -19,7 +19,7 @@ ELSE (Judy_INCLUDE_DIR AND Judy_LIBRARIES)
SET
(
Judy_FOUND FALSE
)
ENDIF
(
Judy_INCLUDE_DIR AND Judy_LIBRARIES
)
IF
(
Judy
)
IF
(
Judy
_FOUND
)
IF
(
NOT Judy_FIND_QUIETLY
)
MESSAGE
(
STATUS
"Found libjudy:
${
Judy_LIBRARIES
}
"
)
ENDIF
(
NOT Judy_FIND_QUIETLY
)
...
...
storage/oqgraph/graphcore-config.h
0 → 100644
View file @
86ed2765
/* Copyright (C) 2007-2013 Arjen G Lentz & Antony T Curtis for Open Query
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* ======================================================================
Open Query Graph Computation Engine, based on a concept by Arjen Lentz
Mk.II implementation by Antony Curtis & Arjen Lentz
For more information, documentation, support, enhancement engineering,
and non-GPL licensing, see http://openquery.com/graph
or contact graph@openquery.com
For packaged binaries, see http://ourdelta.org
======================================================================
*/
#ifndef oq_graphcore_config_h_
#define oq_graphcore_config_h_
#define BOOST_ALL_NO_LIB 1
#define BOOST_NO_RTTI 1
#define BOOST_NO_TYPEID 1
#ifdef DBUG_OFF
#define NDEBUG 1
#endif
#include <boost/config.hpp>
#endif
storage/oqgraph/graphcore-graph.cc
View file @
86ed2765
...
...
@@ -24,5 +24,6 @@
======================================================================
*/
#include "graphcore-config.h"
#include "graphcore-graph.h"
storage/oqgraph/graphcore.cc
View file @
86ed2765
...
...
@@ -26,10 +26,7 @@
#include <string.h>
#define BOOST_ALL_NO_LIB 1
#include <boost/config.hpp>
#include "graphcore-config.h"
#include "graphcore-graph.h"
#include <set>
...
...
@@ -46,12 +43,15 @@
#include "graphcore.h"
#include <boost/unordered_map.hpp>
#include <boost/version.hpp>
using
namespace
open_query
;
using
namespace
boost
;
static
const
row
empty_row
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
extern
"C"
const
char
*
const
oqgraph_boost_version
=
BOOST_LIB_VERSION
;
namespace
open_query
{
...
...
storage/oqgraph/ha_oqgraph.cc
View file @
86ed2765
...
...
@@ -831,6 +831,16 @@ void ha_oqgraph::update_create_info(HA_CREATE_INFO *create_info)
struct
st_mysql_storage_engine
oqgraph_storage_engine
=
{
MYSQL_HANDLERTON_INTERFACE_VERSION
};
extern
"C"
const
char
*
const
oqgraph_boost_version
;
extern
"C"
const
char
*
const
oqgraph_judy_version
;
static
struct
st_mysql_show_var
oqgraph_status
[]
=
{
{
"OQGraph_Boost_Version"
,
(
char
*
)
&
oqgraph_boost_version
,
SHOW_CHAR_PTR
},
/*{ "OQGraph_Judy_Version", (char*) &oqgraph_judy_version, SHOW_CHAR_PTR },*/
{
0
,
0
}
};
maria_declare_plugin
(
oqgraph
)
{
MYSQL_STORAGE_ENGINE_PLUGIN
,
...
...
@@ -842,7 +852,7 @@ maria_declare_plugin(oqgraph)
(
int
(
*
)(
void
*
))
oqgraph_init
,
/* Plugin Init */
oqgraph_fini
,
/* Plugin Deinit */
0x0300
,
/* Version: 3s.0 */
NULL
,
/* status variables */
oqgraph_status
,
/* status variables */
NULL
,
/* system variables */
"3.0"
,
MariaDB_PLUGIN_MATURITY_BETA
...
...
storage/oqgraph/oqgraph_judy.cc
View file @
86ed2765
...
...
@@ -27,6 +27,12 @@
#include "oqgraph_judy.h"
#include <Judy.h>
#ifndef JUDY_LIB_VERSION
#define JUDY_LIB_VERSION "(unknown)"
#endif
extern
"C"
const
char
*
const
oqgraph_judy_version
=
JUDY_LIB_VERSION
;
void
open_query
::
judy_bitset
::
clear
()
{
int
rc
;
...
...
storage/oqgraph/oqgraph_thunk.h
View file @
86ed2765
...
...
@@ -31,6 +31,8 @@
#include <string>
#include <utility>
#include "graphcore-config.h"
#include <boost/intrusive_ptr.hpp>
#include <boost/optional.hpp>
#include <boost/unordered_map.hpp>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment