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

read & write collection ids as strings in parameter.json files

This commit is contained in:
Jan Steemann 2013-04-04 08:49:40 +02:00
parent af1ed1e0f0
commit 059980ed50
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arangod/VocBase/collection.c
View File

@ -916,7 +916,7 @@ int TRI_LoadCollectionInfo (char const* path,
parameter->_type = value->_value._number; parameter->_type = value->_value._number;
} }
else if (TRI_EqualString(key->_value._string.data, "cid")) { else if (TRI_EqualString(key->_value._string.data, "cid")) {
parameter->_cid = value->_value._number; parameter->_cid = (TRI_voc_cid_t) value->_value._number;
} }
else if (TRI_EqualString(key->_value._string.data, "maximalSize")) { else if (TRI_EqualString(key->_value._string.data, "maximalSize")) {
parameter->_maximalSize = value->_value._number; parameter->_maximalSize = value->_value._number;
@ -928,6 +928,9 @@ int TRI_LoadCollectionInfo (char const* path,
parameter->_isSystem = TRI_IsSystemCollectionName(parameter->_name); parameter->_isSystem = TRI_IsSystemCollectionName(parameter->_name);
} }
else if (value->_type == TRI_JSON_STRING) {
parameter->_cid = (TRI_voc_cid_t) TRI_UInt64String(value->_value._string.data);
}
} }
else if (value->_type == TRI_JSON_BOOLEAN) { else if (value->_type == TRI_JSON_BOOLEAN) {
if (TRI_EqualString(key->_value._string.data, "deleted")) { if (TRI_EqualString(key->_value._string.data, "deleted")) {
@ -974,16 +977,18 @@ int TRI_SaveCollectionInfo (char const* path,
const bool forceSync) { const bool forceSync) {
TRI_json_t* json; TRI_json_t* json;
char* filename; char* filename;
char* cidString;
bool ok; bool ok;
filename = TRI_Concatenate2File(path, TRI_COL_PARAMETER_FILE); filename = TRI_Concatenate2File(path, TRI_COL_PARAMETER_FILE);
cidString = TRI_StringUInt64((uint64_t) info->_cid);
// create a json info object // create a json info object
json = TRI_CreateArrayJson(TRI_CORE_MEM_ZONE); json = TRI_CreateArrayJson(TRI_CORE_MEM_ZONE);
TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "version", TRI_CreateNumberJson(TRI_CORE_MEM_ZONE, info->_version)); TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "version", TRI_CreateNumberJson(TRI_CORE_MEM_ZONE, info->_version));
TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "type", TRI_CreateNumberJson(TRI_CORE_MEM_ZONE, info->_type)); TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "type", TRI_CreateNumberJson(TRI_CORE_MEM_ZONE, info->_type));
TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "cid", TRI_CreateNumberJson(TRI_CORE_MEM_ZONE, info->_cid)); TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "cid", TRI_CreateStringCopyJson(TRI_CORE_MEM_ZONE, cidString));
TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "deleted", TRI_CreateBooleanJson(TRI_CORE_MEM_ZONE, info->_deleted)); TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "deleted", TRI_CreateBooleanJson(TRI_CORE_MEM_ZONE, info->_deleted));
TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "maximalSize", TRI_CreateNumberJson(TRI_CORE_MEM_ZONE, info->_maximalSize)); TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "maximalSize", TRI_CreateNumberJson(TRI_CORE_MEM_ZONE, info->_maximalSize));
TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "name", TRI_CreateStringCopyJson(TRI_CORE_MEM_ZONE, info->_name)); TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "name", TRI_CreateStringCopyJson(TRI_CORE_MEM_ZONE, info->_name));
@ -993,6 +998,8 @@ int TRI_SaveCollectionInfo (char const* path,
if (info->_keyOptions) { if (info->_keyOptions) {
TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "keyOptions", TRI_CopyJson(TRI_CORE_MEM_ZONE, info->_keyOptions)); TRI_Insert3ArrayJson(TRI_CORE_MEM_ZONE, json, "keyOptions", TRI_CopyJson(TRI_CORE_MEM_ZONE, info->_keyOptions));
} }
TRI_Free(TRI_CORE_MEM_ZONE, cidString);
// save json info to file // save json info to file
ok = TRI_SaveJson(filename, json, forceSync); ok = TRI_SaveJson(filename, json, forceSync);