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

Prepared index creation to be enterprise-ready.

This commit is contained in:
Michael Hackstein 2016-10-04 19:05:23 +02:00
parent 0a193835be
commit 21317e16b0
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
arangod/V8Server/v8-vocindex.cpp
View File

@ -448,40 +448,18 @@ static int EnhanceIndexJson(v8::FunctionCallbackInfo<v8::Value> const& args,
/// @brief ensures an index, coordinator case /// @brief ensures an index, coordinator case
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void EnsureIndexCoordinator( int EnsureIndexCoordinator(
v8::FunctionCallbackInfo<v8::Value> const& args, LogicalCollection const* collection, VPackSlice const slice, bool create,
LogicalCollection const* collection, VPackSlice const slice, bool create) { VPackBuilder& resultBuilder, std::string& errorMsg) {
v8::Isolate* isolate = args.GetIsolate();
v8::HandleScope scope(isolate);
TRI_ASSERT(collection != nullptr); TRI_ASSERT(collection != nullptr);
TRI_ASSERT(!slice.isNone()); TRI_ASSERT(!slice.isNone());
std::string const databaseName(collection->dbName()); std::string const databaseName(collection->dbName());
std::string const cid = collection->cid_as_string(); std::string const cid = collection->cid_as_string();
std::string const collectionName(collection->name());
VPackBuilder resultBuilder; return ClusterInfo::instance()->ensureIndexCoordinator(
std::string errorMsg;
int res = ClusterInfo::instance()->ensureIndexCoordinator(
databaseName, cid, slice, create, &arangodb::Index::Compare, databaseName, cid, slice, create, &arangodb::Index::Compare,
resultBuilder, errorMsg, 360.0); resultBuilder, errorMsg, 360.0);
if (res != TRI_ERROR_NO_ERROR) {
TRI_V8_THROW_EXCEPTION_MESSAGE(res, errorMsg);
}
if (resultBuilder.slice().isNone()) {
if (!create) {
// did not find a suitable index
TRI_V8_RETURN_NULL();
}
TRI_V8_THROW_EXCEPTION_MEMORY();
}
v8::Handle<v8::Value> ret = IndexRep(isolate, collectionName, resultBuilder.slice());
TRI_V8_RETURN(ret);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -623,7 +601,26 @@ static void EnsureIndex(v8::FunctionCallbackInfo<v8::Value> const& args,
TRI_ASSERT(!slice.isNone()); TRI_ASSERT(!slice.isNone());
// ensure an index, coordinator case // ensure an index, coordinator case
if (ServerState::instance()->isCoordinator()) { if (ServerState::instance()->isCoordinator()) {
EnsureIndexCoordinator(args, collection, slice, create); VPackBuilder resultBuilder;
std::string errorMsg;
#ifdef USE_ENTERPRISE
int res = EnsureIndexCoordinatorEnterprise(collection, slice, create, resultBuilder, errorMsg);
#else
int res = EnsureIndexCoordinator(collection, slice, create, resultBuilder, errorMsg);
#endif
if (res != TRI_ERROR_NO_ERROR) {
TRI_V8_THROW_EXCEPTION_MESSAGE(res, errorMsg);
}
if (resultBuilder.slice().isNone()) {
if (!create) {
// did not find a suitable index
TRI_V8_RETURN_NULL();
}
TRI_V8_THROW_EXCEPTION_MEMORY();
}
v8::Handle<v8::Value> ret = IndexRep(isolate, collection->name(), resultBuilder.slice());
TRI_V8_RETURN(ret);
} else { } else {
EnsureIndexLocal(args, collection, slice, create); EnsureIndexLocal(args, collection, slice, create);
} }

13
arangod/V8Server/v8-vocindex.h
View File

@ -60,4 +60,17 @@ std::unique_ptr<arangodb::LogicalCollection> CreateCollectionCoordinatorEnterpri
TRI_col_type_e collectionType, TRI_vocbase_t* vocbase, TRI_col_type_e collectionType, TRI_vocbase_t* vocbase,
arangodb::velocypack::Slice parameters); arangodb::velocypack::Slice parameters);
#endif #endif
int EnsureIndexCoordinator(arangodb::LogicalCollection const* collection,
arangodb::velocypack::Slice const slice, bool create,
arangodb::velocypack::Builder& resultBuilder,
std::string& errorMessage);
#ifdef USE_ENTERPRISE
int EnsureIndexCoordinatorEnterprise(
arangodb::LogicalCollection const* collection,
arangodb::velocypack::Slice const slice, bool create,
arangodb::velocypack::Builder& resultBuilder, std::string& errorMessage);
#endif
#endif #endif