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:
Jan Steemann 2012-11-08 17:47:53 +01:00
parent 64c6bc5cb0 8532aecd73
commit 149c6c1fc1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/VocBase/document-collection.c
View File

@ -1125,12 +1125,12 @@ static TRI_doc_mptr_t CreateShapedJson (TRI_doc_operation_context_t* context,
TRI_CopyString(keyBody, key, keySize); TRI_CopyString(keyBody, key, keySize);
} }
else { else {
// create key from did // create key from did
sprintf(ridBuffer,"%d", (unsigned int) marker._rid); TRI_StringUInt64InPlace(marker._rid, ridBuffer);
keySize = strlen(ridBuffer) + 1; keySize = strlen(ridBuffer) + 1;
keyBodySize = ((keySize + TRI_DF_BLOCK_ALIGN - 1) / TRI_DF_BLOCK_ALIGN) * TRI_DF_BLOCK_ALIGN; keyBodySize = ((keySize + TRI_DF_BLOCK_ALIGN - 1) / TRI_DF_BLOCK_ALIGN) * TRI_DF_BLOCK_ALIGN;
keyBody = TRI_Allocate(TRI_CORE_MEM_ZONE, keyBodySize, true); keyBody = TRI_Allocate(TRI_CORE_MEM_ZONE, keyBodySize, true);
TRI_CopyString(keyBody, ridBuffer, keySize); TRI_CopyString(keyBody, ridBuffer, keySize);
} }
marker._offsetKey = sizeof(marker); marker._offsetKey = sizeof(marker);
@ -1175,7 +1175,7 @@ static TRI_doc_mptr_t CreateShapedJson (TRI_doc_operation_context_t* context,
} }
else { else {
// create key from did // create key from did
sprintf(ridBuffer,"%d", (unsigned int) marker.base._rid); TRI_StringUInt64InPlace(marker.base._rid, ridBuffer);
keySize = strlen(ridBuffer) + 1; keySize = strlen(ridBuffer) + 1;
keyBodySize = ((keySize + fromSize + toSize + TRI_DF_BLOCK_ALIGN - 1) / TRI_DF_BLOCK_ALIGN) * TRI_DF_BLOCK_ALIGN; keyBodySize = ((keySize + fromSize + toSize + TRI_DF_BLOCK_ALIGN - 1) / TRI_DF_BLOCK_ALIGN) * TRI_DF_BLOCK_ALIGN;
keyBody = TRI_Allocate(TRI_CORE_MEM_ZONE, keyBodySize, true); keyBody = TRI_Allocate(TRI_CORE_MEM_ZONE, keyBodySize, true);