Fix usesRevisionAsDocumentId population and add syncByRevision flag (#11314)

Dan Larkin-York · web-flow · commit 62dfd0ff1c6e · 2020-03-20T08:02:29.000+01:00
* Fix usesRevisionAsDocumentId population and add syncByRevision flag to collection properties

* Fix test.
diff --git a/arangod/VocBase/LogicalCollection.cpp b/arangod/VocBase/LogicalCollection.cpp
@@ -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));
   }
diff --git a/arangod/VocBase/Methods/Collections.cpp b/arangod/VocBase/Methods/Collections.cpp
@@ -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();
diff --git a/lib/Basics/StaticStrings.cpp b/lib/Basics/StaticStrings.cpp
@@ -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");
diff --git a/lib/Basics/StaticStrings.h b/lib/Basics/StaticStrings.h
@@ -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;
diff --git a/tests/js/common/shell/shell-collection.js b/tests/js/common/shell/shell-collection.js
@@ -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);
     },
