Use DB version to control 32/64-bit ownership format

Author: simonmar

glean/db/Glean/Database/Storage.hs

@@ -34,11 +34,11 @@ import Glean.Types (PredicateStats, Repo, SchemaId)
 
 -- | List of binary representation versions we can read
 readableVersions :: [DBVersion]
-readableVersions = [DBVersion 3]
+readableVersions = [DBVersion 3, DBVersion 4]
 
 -- | List of binary representation versions we can write
 writableVersions :: [DBVersion]
-writableVersions = [DBVersion 3]
+writableVersions = [DBVersion 3, DBVersion 4]
 
 -- | Check whether we can open a particular database version
 canOpenVersion :: Mode -> DBVersion -> Bool
@@ -51,7 +51,7 @@ canOpenVersion mode version = version `elem` versions
 
 -- | Default current binary representation version
 currentVersion :: DBVersion
-currentVersion = maximum writableVersions
+currentVersion = DBVersion 3 -- update to 4 later
 
 -- Choose which schema goes into a newly created DB
 data CreateSchema

glean/rocksdb/database-impl.cpp

@@ -11,10 +11,6 @@
 
 #include "glean/rts/timer.h"
 
-#ifndef OSS
-#include "justknobs/JustKnobProxy.h"
-#endif
-
 namespace facebook {
 namespace glean {
 namespace rocks {
@@ -29,7 +25,6 @@ const char* admin_names[] = {
     "FIRST_UNIT_ID",
     "NEXT_UNIT_ID",
     "ORPHAN_FACTS",
-    "OWNERSHIP_FORMAT_VERSION",
 };
 
 namespace {
@@ -150,37 +145,10 @@ DatabaseImpl::DatabaseImpl(
     rts::error("unexpected database version {}", db_version);
   }
 
-  // Initialize ownership format version
-  // For new DBs: Check JustKnob to decide whether to use 64-bit or 32-bit
-  // format. For existing DBs: if no version marker exists, assume 32-bit format
-  // Both formats are always readable regardless of gatekeeper value
-  if (container_.mode == Mode::Create) {
-    // New DB: check JustKnob to determine format
-#ifndef OSS
-    static facebook::jk::BooleanKnob use64BitOwnership(
-        "glean/ownership:64_bit_ids");
-    uint32_t format_to_use = use64BitOwnership()
-        ? OWNERSHIP_FORMAT_VERSION_64BIT
-        : OWNERSHIP_FORMAT_VERSION_32BIT;
-#else
-    // OSS builds always use 32-bit format for now
-    uint32_t format_to_use = OWNERSHIP_FORMAT_VERSION_32BIT;
-#endif
-    ownership_format_version = static_cast<uint32_t>(initAdminValue(
-        container_,
-        AdminId::OWNERSHIP_FORMAT_VERSION,
-        static_cast<uint64_t>(format_to_use),
-        true, // write
-        [] {}));
-  } else {
-    // Existing DB: read format version, default to 32-bit if not present
-    ownership_format_version = static_cast<uint32_t>(initAdminValue(
-        container_,
-        AdminId::OWNERSHIP_FORMAT_VERSION,
-        static_cast<uint64_t>(OWNERSHIP_FORMAT_VERSION_32BIT),
-        false, // don't write
-        [] {}));
-  }
+  ownership_format_version =
+      version == 3
+      ? OWNERSHIP_FORMAT_VERSION_32BIT
+      : OWNERSHIP_FORMAT_VERSION_64BIT;
 
   VLOG(1) << folly::sformat(
       "ownership_format_version: {} ({})",