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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
a-brandt 2012-09-17 17:05:23 +02:00
parent fb7c216ffb bb14df164d
commit f154e008fd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/BitIndexes/bitarrayIndex.c
View File

@ -65,7 +65,9 @@ static void BitarrayIndexResetIterator (TRI_index_iterator_t*, bool)
static void BitarrayIndex_destroyMaskSet (TRI_bitarray_mask_set_t*);
static void BitarrayIndex_extendMaskSet (TRI_bitarray_mask_set_t*, const int, const double);
static int BitarrayIndex_findHelper (BitarrayIndex*, TRI_vector_t*, TRI_index_operator_t*, TRI_index_iterator_t*, TRI_bitarray_mask_set_t*);
#if 0
static void BitarrayIndex_freeMaskSet (TRI_bitarray_mask_set_t*);
#endif
static int BitarrayIndex_generateInsertBitMask (BitarrayIndex*, const BitarrayIndexElement*, TRI_bitarray_mask_t*);
static int BitarrayIndex_generateEqualBitMask (BitarrayIndex*, const TRI_relation_index_operator_t*, TRI_bitarray_mask_t*);
static int BitarrayIndex_generateEqualBitMaskHelper (TRI_json_t*, TRI_json_t*, uint64_t*);
@ -936,13 +938,14 @@ static void BitarrayIndex_extendMaskSet(TRI_bitarray_mask_set_t* maskSet, const
maskSet->_arraySize = newSize;
}
#if 0
static void BitarrayIndex_freeMaskSet(TRI_bitarray_mask_set_t* maskSet) {
BitarrayIndex_destroyMaskSet(maskSet);
if (maskSet != 0) {
TRI_Free(TRI_UNKNOWN_MEM_ZONE, maskSet);
}
}
#endif
static int BitarrayIndex_generateEqualBitMaskHelper(TRI_json_t* valueList, TRI_json_t* value, uint64_t* mask) {
int i;

3
arangod/BitIndexes/masterblocktable.h
View File

@ -447,7 +447,7 @@ int removeElementMasterTable(MasterTable_t* mt, TRI_master_table_position_t* pos
return TRI_ERROR_NO_ERROR;
}
#if 0
static int localPushBackVector(TRI_vector_t* vector, void const* element) {
//return TRI_ERROR_NO_ERROR;
if (vector->_length == vector->_capacity) {
@ -471,6 +471,7 @@ static int localPushBackVector(TRI_vector_t* vector, void const* element) {
return TRI_ERROR_NO_ERROR;
}
#endif
int storeElementMasterTable(MasterTable_t* mt, void* results, TRI_master_table_position_t* position) {
// should we store doc pointers directly or indirectly via BitarrayIndexElement