XDB-476 merge from apple main (#207)

* XDB-476 update main from upstream
* XDB-476 update main and repair old commits
* XDB-476 fixed tests tenantModes was removed

Author: MarkSh1

.gitignore

@@ -97,11 +97,6 @@ flow/coveragetool/obj
 /.cache
 TAGS
 
-# Openway fork build
-/bld/
-/ide-projects/*/nbproject/private/
-/Testing/Temporary/
-
 # Temporary and user configuration files
 *~
 *.orig

CMakeLists.txt

@@ -270,7 +270,6 @@ else()
   add_subdirectory(fdbservice)
 endif()
 add_subdirectory(fdbbackup)
-add_subdirectory(metacluster)
 add_subdirectory(tests)
 if(NOT FOUNDATIONDB_CROSS_COMPILING) # FIXME(swift): make this work when
                                      # x-compiling.

bindings/bindingtester/bindingtester.py

@@ -314,11 +314,6 @@ def __init__(self, args):
                 [not tester.directory_snapshot_ops_enabled for tester in self.testers]
             )
         )
-        self.args.no_tenants = (
-            self.args.no_tenants
-            or any([not tester.tenants_enabled for tester in self.testers])
-            or self.args.api_version < 710
-        )
 
     def print_test(self):
         test_instructions = self._generate_test()
@@ -431,19 +426,6 @@ def _insert_instructions(self, test_instructions):
         util.get_logger().info("\nInserting test into database...")
         del self.db[:]
 
-        if not self.args.no_tenants:
-            while True:
-                tr = self.db.create_transaction()
-                try:
-                    tr.options.set_special_key_space_enable_writes()
-                    del tr[
-                        b"\xff\xff/management/tenant/map/":b"\xff\xff/management/tenant/map0"
-                    ]
-                    tr.commit().wait()
-                    break
-                except fdb.FDBError as e:
-                    tr.on_error(e).wait()
-
         for subspace, thread in test_instructions.items():
             thread.insert_operations(self.db, subspace)
 

bindings/bindingtester/known_testers.py

@@ -48,7 +48,6 @@ def __init__(
         threads_enabled=True,
         types=COMMON_TYPES,
         directory_snapshot_ops_enabled=True,
-        tenants_enabled=False,
     ):
         self.name = name
         self.cmd = cmd
@@ -58,7 +57,6 @@ def __init__(
         self.threads_enabled = threads_enabled
         self.types = types
         self.directory_snapshot_ops_enabled = directory_snapshot_ops_enabled
-        self.tenants_enabled = tenants_enabled
 
     def supports_api_version(self, api_version):
         return (
@@ -91,7 +89,6 @@ def _absolute_path(path):
         23,
         MAX_API_VERSION,
         types=ALL_TYPES,
-        tenants_enabled=True,
     ),
     "ruby": Tester(
         "ruby", _absolute_path("ruby/tests/tester.rb"), 2040, 23, MAX_API_VERSION
@@ -103,7 +100,6 @@ def _absolute_path(path):
         510,
         MAX_API_VERSION,
         types=ALL_TYPES,
-        tenants_enabled=True,
     ),
     "java_async": Tester(
         "java",
@@ -112,7 +108,6 @@ def _absolute_path(path):
         510,
         MAX_API_VERSION,
         types=ALL_TYPES,
-        tenants_enabled=True,
     ),
     "go": Tester(
         "go",

bindings/bindingtester/spec/tenantTester.md

@@ -37,12 +37,11 @@ def matches_op(op, target_op):
         op == target_op
         or op == target_op + "_SNAPSHOT"
         or op == target_op + "_DATABASE"
-        or op == target_op + "_TENANT"
     )
 
 
 def is_non_transaction_op(op):
-    return op.endswith("_DATABASE") or op.endswith("_TENANT")
+    return op.endswith("_DATABASE")
 
 
 class ApiTest(Test):
@@ -77,7 +76,6 @@ def setup(self, args):
             args.max_int_bits, args.api_version, args.types
         )
         self.api_version = args.api_version
-        self.allocated_tenants = set()
 
     def add_stack_items(self, num):
         self.stack_size += num
@@ -164,15 +162,6 @@ def wait_for_reads(self, instructions):
             test_util.to_front(instructions, self.stack_size - read[0])
             instructions.append("WAIT_FUTURE")
 
-    def choose_tenant(self, new_tenant_probability):
-        if len(self.allocated_tenants) == 0 or random.random() < new_tenant_probability:
-            return self.random.random_string(random.randint(0, 30))
-        else:
-            tenant_list = list(self.allocated_tenants)
-            # sort to ensure deterministic selection of a tenant
-            tenant_list.sort()
-            return random.choice(tenant_list)
-
     def generate(self, args, thread_number):
         instructions = InstructionSet()
 
@@ -195,8 +184,6 @@ def generate(self, args, thread_number):
         snapshot_reads = [x + "_SNAPSHOT" for x in reads]
         database_reads = [x + "_DATABASE" for x in reads]
         database_mutations = [x + "_DATABASE" for x in mutations]
-        tenant_reads = [x + "_TENANT" for x in reads]
-        tenant_mutations = [x + "_TENANT" for x in mutations]
         mutations += ["VERSIONSTAMP"]
         versions = ["GET_READ_VERSION", "SET_READ_VERSION", "GET_COMMITTED_VERSION"]
         snapshot_versions = ["GET_READ_VERSION_SNAPSHOT"]
@@ -222,14 +209,6 @@ def generate(self, args, thread_number):
         ]
         txn_sizes = ["GET_APPROXIMATE_SIZE"]
         storage_metrics = ["GET_ESTIMATED_RANGE_SIZE", "GET_RANGE_SPLIT_POINTS"]
-        tenants = [
-            "TENANT_CREATE",
-            "TENANT_DELETE",
-            "TENANT_SET_ACTIVE",
-            "TENANT_CLEAR_ACTIVE",
-            "TENANT_LIST",
-            "TENANT_GET_ID",
-        ]
 
         op_choices += reads
         op_choices += mutations
@@ -245,11 +224,6 @@ def generate(self, args, thread_number):
         op_choices += txn_sizes
         op_choices += storage_metrics
 
-        if not args.no_tenants:
-            op_choices += tenants
-            op_choices += tenant_reads
-            op_choices += tenant_mutations
-
         idempotent_atomic_ops = [
             "BIT_AND",
             "BIT_OR",
@@ -281,8 +255,6 @@ def generate(self, args, thread_number):
 
             if args.concurrency == 1 and (
                 op in database_mutations
-                or op in tenant_mutations
-                or op in ["TENANT_CREATE", "TENANT_DELETE"]
             ):
                 self.wait_for_reads(instructions)
                 test_util.blocking_commit(instructions)
@@ -698,56 +670,20 @@ def generate(self, args, thread_number):
                 instructions.push_args(key1, key2, chunkSize)
                 instructions.append(op)
                 self.add_strings(1)
-            elif op == "TENANT_CREATE":
-                tenant_name = self.choose_tenant(0.8)
-                self.allocated_tenants.add(tenant_name)
-                instructions.push_args(tenant_name)
-                instructions.append(op)
-                self.add_strings(1)
-            elif op == "TENANT_DELETE":
-                tenant_name = self.choose_tenant(0.2)
-                if tenant_name in self.allocated_tenants:
-                    self.allocated_tenants.remove(tenant_name)
-                instructions.push_args(tenant_name)
-                instructions.append(op)
-                self.add_strings(1)
-            elif op == "TENANT_SET_ACTIVE":
-                tenant_name = self.choose_tenant(0.8)
-                instructions.push_args(tenant_name)
-                instructions.append(op)
-                self.add_strings(1)
-            elif op == "TENANT_CLEAR_ACTIVE":
-                instructions.append(op)
-            elif op == "TENANT_LIST":
-                self.ensure_string(instructions, 2)
-                instructions.push_args(self.random.random_int())
-                test_util.to_front(instructions, 2)
-                test_util.to_front(instructions, 2)
-                instructions.append(op)
-                self.add_strings(1)
-            elif op == "TENANT_GET_ID":
-                instructions.append(op)
-                self.add_strings(1)
             else:
                 assert False, "Unknown operation: " + op
 
-            if read_performed and op not in database_reads and op not in tenant_reads:
+            if read_performed and op not in database_reads:
                 self.outstanding_ops.append((self.stack_size, len(instructions) - 1))
 
             if args.concurrency == 1 and (
                 op in database_reads
                 or op in database_mutations
-                or op in tenant_reads
-                or op in tenant_mutations
-                or op in ["TENANT_CREATE", "TENANT_DELETE"]
             ):
                 instructions.append("WAIT_FUTURE")
 
         instructions.begin_finalization()
 
-        if not args.no_tenants:
-            instructions.append("TENANT_CLEAR_ACTIVE")
-
         if args.concurrency == 1:
             self.wait_for_reads(instructions)
             test_util.blocking_commit(instructions)

bindings/bindingtester/tests/api.py

@@ -116,8 +116,6 @@ if(NOT WIN32)
     test/mako/process.hpp
     test/mako/shm.hpp
     test/mako/stats.hpp
-    test/mako/tenant.cpp
-    test/mako/tenant.hpp
     test/mako/time.hpp
     test/mako/utils.cpp
     test/mako/utils.hpp)
@@ -223,7 +221,7 @@ if(NOT WIN32)
 
   # do not set RPATH for mako
   set_property(TARGET mako PROPERTY SKIP_BUILD_RPATH TRUE)
-  target_link_libraries(mako PRIVATE fdb_c tokensign fdbclient fmt::fmt Threads::Threads fdb_cpp boost_target rapidjson)
+  target_link_libraries(mako PRIVATE fdb_c fdbclient fmt::fmt Threads::Threads fdb_cpp boost_target rapidjson)
 
   if(NOT OPEN_FOR_IDE)
     # Make sure that fdb_c.h is compatible with c90
@@ -292,7 +290,7 @@ if(NOT WIN32)
     set(PATTERNS_TO_SKIP "XXXX")
     if (USE_ASAN)
       set(PATTERNS_TO_SKIP
-        ".*Tenant.*"       # skip Tenant tests because we don't use
+        ".*ExampleDontUsePattern.*"       # skip ExampleDontUsePattern tests because we don't use those files
       )
     endif()
     foreach(test_file ${API_TEST_FILES})