8000 Fix usesRevisionAsDocumentId population and add syncByRevision flag by dhly-etc · Pull Request #11314 · arangodb/arangodb · GitHub
[go: up one dir, main page]

Skip to content

Fix usesRevisionAsDocumentId population and add syncByRevision flag #11314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion arangod/VocBase/LogicalCollection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,8 @@ arangodb::Result LogicalCollection::appendVelocyPack(arangodb::velocypack::Build
result.add(StaticStrings::UsesRevisionsAsDocumentIds,
VPackValue(usesRevisionsAsDocumentIds()));
result.add(StaticStrings::MinRevision, VPackValue(minRevision()));

result.add(StaticStrings::SyncByRevision, VPackValue(syncByRevision()));

if (hasSmartJoinAttribute()) {
result.add(StaticStrings::SmartJoinAttribute, VPackValue(_smartJoinAttribute));
}
Expand Down
3 changes: 2 additions & 1 deletion arangod/VocBase/Methods/Collections.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,8 @@ Result Collections::create(TRI_vocbase_t& vocbase,
vocbase.server().hasFeature<ShardingFeature>();
bool addUseRevs = ServerState::instance()->isSingleServerOrCoordinator();
bool useRevs =
vocbase.server().getFeature<arangodb::EngineSelectorFeature>().isRocksDB();
vocbase.server().getFeature<arangodb::EngineSelectorFeature>().isRocksDB() &&
LogicalCollection::currentVersion() >= LogicalCollection::Version::v37;
VPackBuilder builder;
VPackBuilder helper;
builder.openArray();
Expand Down
1 change: 1 addition & 0 deletions lib/Basics/StaticStrings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ std::string const StaticStrings::ShardingStrategy("shardingStrategy");
std::string const StaticStrings::SmartJoinAttribute("smartJoinAttribute");
std::string const StaticStrings::Sharding("sharding");
std::string const StaticStrings::Satellite("satellite");
std::string const StaticStrings::SyncByRevision("syncByRevision");
std::string const StaticStrings::UsesRevisionsAsDocumentIds(
"usesRevisionsAsDocumentIds");
std::string const StaticStrings::Validation("validation");
Expand Down
1 change: 1 addition & 0 deletions lib/Basics/StaticStrings.h
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ class StaticStrings {
static std::string const SmartJoinAttribute;
static std::string const Sharding;
static std::string const Satellite;
static std::string const SyncByRevision;
static std::string const UsesRevisionsAsDocumentIds;
static std::string const Validation;
static std::string const WriteConcern;
Expand Down
3 changes: 1 addition & 2 deletions tests/js/common/shell/shell-collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -551,9 +551,8 @@ function CollectionSuite () {

var p = c1.properties();

var isRocksDB = db._engine().name === "rocksdb";
assertEqual(true, p.hasOwnProperty("usesRevisionsAsDocumentIds"));
assertEqual(isRocksDB, p.usesRevisionsAsDocumentIds);
assertEqual(false, p.usesRevisionsAsDocumentIds);

db._drop(cn);
},
Expand Down
1 0