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

Fixes in collection management.

This commit is contained in:
Max Neunhoeffer 2016-10-09 11:06:26 +02:00
parent 6c64e61982
commit 4c49853e3b
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Cluster/ClusterInfo.cpp
View File

@ -2373,7 +2373,7 @@ int ClusterInfo::getResponsibleShard(LogicalCollection* collInfo,
std::shared_ptr<std::vector<std::string>> shardKeysPtr;
std::shared_ptr<std::vector<ShardID>> shards;
bool found = false;
CollectionID collectionId = collInfo->planId();
CollectionID collectionId = std::to_string(collInfo->planId());
while (true) {
{

1
js/common/bootstrap/errors.js
View File

@ -260,6 +260,7 @@
"ERROR_MODULE_FAILURE" : { "code" : 3103, "message" : "failed to invoke module" },
"ERROR_NO_SMART_COLLECTION" : { "code" : 4000, "message" : "collection is not smart" },
"ERROR_NO_SMART_GRAPH_ATTRIBUTE" : { "code" : 4001, "message" : "smart graph attribute not given" },
"ERROR_CANNOT_DROP_SMART_COLLECTION" : { "code" : 4002, "message" : "cannot drop this smart collection" },
"ERROR_DISPATCHER_IS_STOPPING" : { "code" : 21001, "message" : "dispatcher stopped" },
"ERROR_QUEUE_UNKNOWN" : { "code" : 21002, "message" : "named queue does not exist" },
"ERROR_QUEUE_FULL" : { "code" : 21003, "message" : "named queue is full" }

1
lib/Basics/voc-errors.cpp
View File

@ -256,6 +256,7 @@ void TRI_InitializeErrorMessages () {
REG_ERROR(ERROR_MODULE_FAILURE, "failed to invoke module");
REG_ERROR(ERROR_NO_SMART_COLLECTION, "collection is not smart");
REG_ERROR(ERROR_NO_SMART_GRAPH_ATTRIBUTE, "smart graph attribute not given");
REG_ERROR(ERROR_CANNOT_DROP_SMART_COLLECTION, "cannot drop this smart collection");
REG_ERROR(ERROR_DISPATCHER_IS_STOPPING, "dispatcher stopped");
REG_ERROR(ERROR_QUEUE_UNKNOWN, "named queue does not exist");
REG_ERROR(ERROR_QUEUE_FULL, "named queue is full");

13
lib/Basics/voc-errors.h
View File

@ -609,6 +609,9 @@
/// The requested collection needs to be smart, but it ain't
/// - 4001: @LIT{smart graph attribute not given}
/// The given document does not have the smart graph attribute set.
/// - 4002: @LIT{cannot drop this smart collection}
/// This smart collection cannot be dropped, it dictates sharding in the
/// graph.
/// - 21001: @LIT{dispatcher stopped}
/// Will be returned if a shutdown is in progress.
/// - 21002: @LIT{named queue does not exist}
@ -3219,6 +3222,16 @@ void TRI_InitializeErrorMessages ();
#define TRI_ERROR_NO_SMART_GRAPH_ATTRIBUTE (4001)
////////////////////////////////////////////////////////////////////////////////
/// @brief 4002: ERROR_CANNOT_DROP_SMART_COLLECTION
///
/// cannot drop this smart collection
///
/// This smart collection cannot be dropped, it dictates sharding in the graph.
////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_CANNOT_DROP_SMART_COLLECTION (4002)
////////////////////////////////////////////////////////////////////////////////
/// @brief 21001: ERROR_DISPATCHER_IS_STOPPING
///