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

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
Andreas Streichardt 2016-04-19 17:41:49 +02:00
parent 1743f2eb49 95662103f2
commit c2914ae521
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangosh/Import/ImportFeature.cpp
View File

@ -147,7 +147,11 @@ void ImportFeature::validateOptions(
size_t n = positionals.size(); size_t n = positionals.size();
if (1 == n) { if (1 == n) {
_filename = positionals[0]; // only take positional file name attribute into account if user
// did not specify the --file option as well
if (!options->processingResult().touched("--file")) {
_filename = positionals[0];
}
} else if (1 < n) { } else if (1 < n) {
LOG(ERR) << "expecting at most one filename, got " + LOG(ERR) << "expecting at most one filename, got " +
StringUtils::join(positionals, ", "); StringUtils::join(positionals, ", ");

5
js/common/modules/@arangodb/general-graph.js
View File

@ -87,6 +87,11 @@ var findOrCreateCollectionByName = function (name, type, noCreate) {
err.errorNum = arangodb.errors.ERROR_GRAPH_NOT_AN_ARANGO_COLLECTION.code; err.errorNum = arangodb.errors.ERROR_GRAPH_NOT_AN_ARANGO_COLLECTION.code;
err.errorMessage = name + arangodb.errors.ERROR_GRAPH_NOT_AN_ARANGO_COLLECTION.message; err.errorMessage = name + arangodb.errors.ERROR_GRAPH_NOT_AN_ARANGO_COLLECTION.message;
throw err; throw err;
} else if (type === ArangoCollection.TYPE_EDGE && col.type() !== type) {
var err2 = new ArangoError();
err2.errorNum = arangodb.errors.ERROR_ARANGO_COLLECTION_TYPE_INVALID.code;
err2.errorMessage = name + " cannot be used as relation. It is not an edge collection";
throw err2;
} }
return res; return res;
}; };

13
scripts/startLocalCluster.sh
View File

@ -249,12 +249,21 @@ if [ -n "$SECONDARIES" ]; then
fi fi
echo Bootstrapping DBServers... echo Bootstrapping DBServers...
curl -s -X POST "http://127.0.0.1:8530/_admin/cluster/bootstrapDbServers" \ curl -s -f -X POST "http://127.0.0.1:8530/_admin/cluster/bootstrapDbServers" \
-d '{"isRelaunch":false}' >> cluster/DBServersUpgrade.log 2>&1 -d '{"isRelaunch":false}' >> cluster/DBServersUpgrade.log 2>&1
if [ "$?" != 0 ] ; then
echo "Bootstrapping DBServers failed"
exit 1;
fi
echo Running DB upgrade on cluster... echo Running DB upgrade on cluster...
curl -s -X POST "http://127.0.0.1:8530/_admin/cluster/upgradeClusterDatabase" \ curl -s -f -X POST "http://127.0.0.1:8530/_admin/cluster/upgradeClusterDatabase" \
-d '{"isRelaunch":false}' >> cluster/DBUpgrade.log 2>&1 -d '{"isRelaunch":false}' >> cluster/DBUpgrade.log 2>&1
if [ "$?" != 0 ] ; then
echo "DB upgrade on cluster failed"
exit 1;
fi
echo Bootstrapping Coordinators... echo Bootstrapping Coordinators...
PIDS="" PIDS=""