remove all multi-version client code related to grv cache

bindings/c/CMakeLists.txt

@@ -1,8 +1,6 @@
 set(FDB_C_SRCS
   fdb_c.cpp
   foundationdb/fdb_c.h
-  foundationdb/fdb_c_internal.h
-  foundationdb/fdb_c_types.h
   ThreadCleanup.cpp)
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/foundationdb)

bindings/c/fdb_c.cpp

@@ -26,7 +26,6 @@
 #include "fdbclient/MultiVersionTransaction.h"
 #include "fdbclient/MultiVersionAssignmentVars.h"
 #include "foundationdb/fdb_c.h"
-#include "foundationdb/fdb_c_internal.h"
 
 int g_api_version = 0;
 
@@ -406,14 +405,6 @@ extern "C" DLLEXPORT FDBFuture* fdb_database_create_snapshot(FDBDatabase* db,
 	                        .extractPtr());
 }
 
-extern "C" DLLEXPORT DatabaseSharedState* fdb_database_create_shared_state(FDBDatabase* db) {
-	return (DatabaseSharedState*)(DB(db)->createSharedState());
-}
-
-extern "C" DLLEXPORT void fdb_database_set_shared_state(FDBDatabase* db, DatabaseSharedState* p) {
-	(DB(db)->setSharedState(p));
-}
-
 // Get network thread busyness (updated every 1s)
 // A value of 0 indicates that the client is more or less idle
 // A value of 1 (or more) indicates that the client is saturated

bindings/c/foundationdb/fdb_c.h

@@ -58,12 +58,20 @@
 #include <stdint.h>
 
 #include "fdb_c_options.g.h"
-#include "fdb_c_types.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/* Pointers to these opaque types represent objects in the FDB API */
+typedef struct FDB_future FDBFuture;
+typedef struct FDB_result FDBResult;
+typedef struct FDB_database FDBDatabase;
+typedef struct FDB_transaction FDBTransaction;
+
+typedef int fdb_error_t;
+typedef int fdb_bool_t;
+
 DLLEXPORT const char* fdb_get_error(fdb_error_t code);
 
 DLLEXPORT fdb_bool_t fdb_error_predicate(int predicate_test, fdb_error_t code);

fdbclient/DatabaseContext.h

@@ -468,11 +468,6 @@ class DatabaseContext : public ReferenceCounted<DatabaseContext>, public FastAll
 	int outstandingWatches;
 	int maxOutstandingWatches;
 
-	// Manage any shared state that may be used by MVC
-	DatabaseSharedState* sharedStatePtr;
-	DatabaseSharedState* initSharedState();
-	void setSharedState(DatabaseSharedState* p);
-
 	// GRV Cache
 	// Database-level read version cache storing the most recent successful GRV as well as the time it was requested.
 	double lastTimedGrv;

fdbclient/FDBTypes.h

@@ -1171,22 +1171,6 @@ struct StorageMigrationType {
 	uint32_t type;
 };
 
-struct GRVCacheSpace {
-	Version cachedRv;
-	double lastTimedGrv;
-
-	GRVCacheSpace() : cachedRv(Version(0)), lastTimedGrv(0.0) {}
-};
-
-// This structure can be extended in the future to include additional features that required a shared state
-struct DatabaseSharedState {
-	Mutex mutexLock;
-	GRVCacheSpace grvCacheSpace;
-	int refCount;
-
-	DatabaseSharedState() : mutexLock(Mutex()), grvCacheSpace(GRVCacheSpace()) {}
-};
-
 inline bool isValidPerpetualStorageWiggleLocality(std::string locality) {
 	int pos = locality.find(':');
 	// locality should be either 0 or in the format '<non_empty_string>:<non_empty_string>'

fdbclient/IClientApi.h

@@ -137,10 +137,6 @@ class IDatabase {
 	// Management API, create snapshot
 	virtual ThreadFuture<Void> createSnapshot(const StringRef& uid, const StringRef& snapshot_command) = 0;
 
-	// Interface to manage shared state across multiple connections to the same Database
-	virtual DatabaseSharedState* createSharedState() = 0;
-	virtual void setSharedState(DatabaseSharedState* p) = 0;
-
 	// used in template functions as the Transaction type that can be created through createTransaction()
 	using TransactionT = ITransaction;
 };

fdbclient/MultiVersionTransaction.actor.cpp

@@ -446,19 +446,6 @@ ThreadFuture<Void> DLDatabase::createSnapshot(const StringRef& uid, const String
 	return toThreadFuture<Void>(api, f, [](FdbCApi::FDBFuture* f, FdbCApi* api) { return Void(); });
 }
 
-DatabaseSharedState* DLDatabase::createSharedState() {
-	if (!api->databaseCreateSharedState) {
-		return nullptr;
-	}
-	return api->databaseCreateSharedState(db);
-}
-
-void DLDatabase::setSharedState(DatabaseSharedState* p) {
-	if (api->databaseSetSharedState) {
-		api->databaseSetSharedState(db, p);
-	}
-}
-
 // Get network thread busyness
 double DLDatabase::getMainThreadBusyness() {
 	if (api->databaseGetMainThreadBusyness != nullptr) {
@@ -736,7 +723,6 @@ Reference<IDatabase> DLApi::createDatabase609(const char* clusterFilePath) {
 Reference<IDatabase> DLApi::createDatabase(const char* clusterFilePath) {
 	if (headerVersion >= 610) {
 		FdbCApi::FDBDatabase* db;
-		// can the FdbCApi wrapper signature be changed to add this ptr?
 		throwIfError(api->createDatabase(clusterFilePath, &db));
 		return Reference<IDatabase>(new DLDatabase(api, db));
 	} else {
@@ -1191,14 +1177,6 @@ MultiVersionDatabase::MultiVersionDatabase(MultiVersionApi* api,
   : dbState(new DatabaseState(clusterFilePath, versionMonitorDb)) {
 	dbState->db = db;
 	dbState->dbVar->set(db);
-	auto stateMapKey = std::make_pair(clusterFilePath, dbState->dbProtocolVersion.get());
-	if (api->clusterSharedStateMap.find(stateMapKey) == api->clusterSharedStateMap.end() ||
-	    api->clusterSharedStateMap[stateMapKey] == nullptr) {
-		DatabaseSharedState* p = db->createSharedState();
-		api->clusterSharedStateMap[stateMapKey] = p;
-	} else {
-		db->setSharedState(api->clusterSharedStateMap[stateMapKey]);
-	}
 	if (openConnectors) {
 		if (!api->localClientDisabled) {
 			dbState->addClient(api->getLocalClient());
@@ -1308,19 +1286,6 @@ ThreadFuture<Void> MultiVersionDatabase::createSnapshot(const StringRef& uid, co
 	return abortableFuture(f, dbState->dbVar->get().onChange);
 }
 
-DatabaseSharedState* MultiVersionDatabase::createSharedState() {
-	if (dbState->db) {
-		return dbState->db->createSharedState();
-	}
-	return nullptr;
-}
-
-void MultiVersionDatabase::setSharedState(DatabaseSharedState* p) {
-	if (dbState->db) {
-		dbState->db->setSharedState(p);
-	}
-}
-
 // Get network thread busyness
 // Return the busyness for the main thread. When using external clients, take the larger of the local client
 // and the external client's busyness.
@@ -1538,15 +1503,6 @@ void MultiVersionDatabase::DatabaseState::updateDatabase(Reference<IDatabase> ne
 		}
 	}
 
-	auto stateMapKey = std::make_pair(clusterFilePath, dbProtocolVersion.get());
-	if (MultiVersionApi::api->clusterSharedStateMap.find(stateMapKey) ==
-	        MultiVersionApi::api->clusterSharedStateMap.end() ||
-	    MultiVersionApi::api->clusterSharedStateMap[stateMapKey] == nullptr) {
-		DatabaseSharedState* p = db->createSharedState();
-		MultiVersionApi::api->clusterSharedStateMap[stateMapKey] = p;
-	} else {
-		db->setSharedState(MultiVersionApi::api->clusterSharedStateMap[stateMapKey]);
-	}
 	dbVar->set(db);
 
 	ASSERT(protocolVersionMonitor.isValid());

fdbclient/MultiVersionTransaction.h

@@ -108,8 +108,6 @@ struct FdbCApi : public ThreadSafeReferenceCounted<FdbCApi> {
 	                                     int uidLength,
 	                                     uint8_t const* snapshotCommmand,
 	                                     int snapshotCommandLength);
-	DatabaseSharedState* (*databaseCreateSharedState)(FDBDatabase* database);
-	void (*databaseSetSharedState)(FDBDatabase* database, DatabaseSharedState* p);
 
 	double (*databaseGetMainThreadBusyness)(FDBDatabase* database);
 	FDBFuture* (*databaseGetServerProtocol)(FDBDatabase* database, uint64_t expectedVersion);
@@ -362,9 +360,6 @@ class DLDatabase : public IDatabase, ThreadSafeReferenceCounted<DLDatabase> {
 	ThreadFuture<Void> forceRecoveryWithDataLoss(const StringRef& dcid) override;
 	ThreadFuture<Void> createSnapshot(const StringRef& uid, const StringRef& snapshot_command) override;
 
-	DatabaseSharedState* createSharedState() override;
-	void setSharedState(DatabaseSharedState* p) override;
-
 private:
 	const Reference<FdbCApi> api;
 	FdbCApi::FDBDatabase*
@@ -593,9 +588,6 @@ class MultiVersionDatabase final : public IDatabase, ThreadSafeReferenceCounted<
 	ThreadFuture<Void> forceRecoveryWithDataLoss(const StringRef& dcid) override;
 	ThreadFuture<Void> createSnapshot(const StringRef& uid, const StringRef& snapshot_command) override;
 
-	DatabaseSharedState* createSharedState() override;
-	void setSharedState(DatabaseSharedState* p) override;
-
 	// private:
 
 	struct LegacyVersionMonitor;
@@ -718,8 +710,6 @@ class MultiVersionApi : public IClientApi {
 
 	bool callbackOnMainThread;
 	bool localClientDisabled;
-	// Map of (clusterFilePath + protocolVersion) -> DatabaseSharedState pointer
-	std::map<std::pair<std::string, ProtocolVersion>, DatabaseSharedState*> clusterSharedStateMap;
 
 	static bool apiVersionAtLeast(int minVersion);