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

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2016-09-30 14:12:01 +02:00
parent 5cd913e003 2562ded2a0
commit 7c03cfc2e8
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/VocBase/LogicalCollection.cpp
View File

@ -332,6 +332,8 @@ LogicalCollection::LogicalCollection(
_lastCompactionStamp(0.0), _lastCompactionStamp(0.0),
_uncollectedLogfileEntries(0) { _uncollectedLogfileEntries(0) {
_keyGenerator.reset(KeyGenerator::factory(other.keyOptions())); _keyGenerator.reset(KeyGenerator::factory(other.keyOptions()));
createPhysical(); createPhysical();
@ -695,6 +697,10 @@ std::string const& LogicalCollection::distributeShardsLike() const {
return _distributeShardsLike; return _distributeShardsLike;
} }
void LogicalCollection::distributeShardsLike(std::string const& cid) {
_distributeShardsLike = cid;
}
std::string LogicalCollection::dbName() const { std::string LogicalCollection::dbName() const {
TRI_ASSERT(_vocbase != nullptr); TRI_ASSERT(_vocbase != nullptr);
return _vocbase->name(); return _vocbase->name();

1
arangod/VocBase/LogicalCollection.h
View File

@ -139,6 +139,7 @@ class LogicalCollection {
std::string dbName() const; std::string dbName() const;
std::string const& path() const; std::string const& path() const;
std::string const& distributeShardsLike() const; std::string const& distributeShardsLike() const;
void distributeShardsLike(std::string const&);
// For normal collections the realNames is just a vector of length 1 // For normal collections the realNames is just a vector of length 1
// with its name. For smart edge collections (enterprise only) this is // with its name. For smart edge collections (enterprise only) this is

2
scripts/startLocalCluster.sh
View File

@ -73,7 +73,7 @@ while [[ ${1} ]]; do
shift shift
;; ;;
-o|--xterm-options) -o|--xterm-options)
XTERM_OPTIONS=${2} XTERMOPTIONS=${2}
shift shift
;; ;;
-h|--help) -h|--help)