Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
Willi Goesgens 2015-02-13 14:12:20 +01:00
parent df226e5a82 3ed5d54fbb
commit e48a75f6e2
2 changed files with 0 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
arangod/GeoIndex/GeoIndex.cpp
View File

@ -267,16 +267,6 @@ typedef struct
GeoPath;
// .............................................................................
// forward declaration of static functions which are used by the query engine
// .............................................................................
static int GeoIndex_queryMethodCall (void*, TRI_index_operator_t*, TRI_index_challenge_t*, void*);
static int GeoIndex_freeMethodCall (void*, void*);
/* =================================================== */
/* GeoIndex_Distance routine */
/* This is the user-facing routine to compute the */
@ -2300,56 +2290,6 @@ int GeoIndex_INDEXVALID(GeoIndex * gi)
#endif
////////////////////////////////////////////////////////////////////////////////
/// @brief Assigns a static function call to a function pointer used by Query Engine
////////////////////////////////////////////////////////////////////////////////
void GeoIndex_assignMethod(void* methodHandle, TRI_index_method_assignment_type_e methodType) {
switch (methodType) {
case TRI_INDEX_METHOD_ASSIGNMENT_FREE : {
TRI_index_query_free_method_call_t* call = (TRI_index_query_free_method_call_t*)(methodHandle);
*call = GeoIndex_freeMethodCall;
break;
}
case TRI_INDEX_METHOD_ASSIGNMENT_QUERY : {
TRI_index_query_method_call_t* call = (TRI_index_query_method_call_t*)(methodHandle);
*call = GeoIndex_queryMethodCall;
break;
}
default : {
TRI_ASSERT(false);
}
}
}
////////////////////////////////////////////////////////////////////////////////
// Implementation of forward declared query engine callback functions
////////////////////////////////////////////////////////////////////////////////
static int GeoIndex_queryMethodCall(void* theIndex, TRI_index_operator_t* indexOperator,
TRI_index_challenge_t* challenge, void* data) {
GeoIx* geoIndex = (GeoIx*)(theIndex);
if (geoIndex == NULL || indexOperator == NULL) {
return TRI_ERROR_INTERNAL;
}
TRI_ASSERT(false);
return TRI_ERROR_NO_ERROR;
}
static int GeoIndex_freeMethodCall (void* theIndex, void* data) {
GeoIx* geoIndex = (GeoIx*) theIndex;
if (geoIndex == NULL) {
return TRI_ERROR_INTERNAL;
}
TRI_ASSERT(false);
return TRI_ERROR_NO_ERROR;
}
size_t GeoIndex_MemoryUsage (void* theIndex) {
GeoIx* geoIndex = (GeoIx*) theIndex;
if (geoIndex != NULL) {

6
arangod/GeoIndex/GeoIndex.h
View File

@ -97,12 +97,6 @@ GeoCoordinates;
typedef char GeoIndex; /* to keep the structure private */
////////////////////////////////////////////////////////////////////////////////
// Allows one or more call back functions to be assigned
////////////////////////////////////////////////////////////////////////////////
void GeoIndex_assignMethod (void*, TRI_index_method_assignment_type_e);
size_t GeoIndex_MemoryUsage (void*);
GeoIndex * GeoIndex_new(void);