Resolve the simple-looking conflicts

CMakeLists.txt

@@ -18,11 +18,7 @@
 # limitations under the License.
 cmake_minimum_required(VERSION 3.13)
 project(foundationdb
-<<<<<<< HEAD
   VERSION 7.0.0
-=======
-  VERSION 6.3.11
->>>>>>> release-6.3
   DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
   HOMEPAGE_URL "http://www.foundationdb.org/"
   LANGUAGES C CXX ASM)

fdbclient/BackupContainer.h

@@ -40,11 +40,7 @@ Future<Version> timeKeeperVersionFromDatetime(std::string const &datetime, Datab
 // TODO: Move the log file and range file format encoding/decoding stuff to this file and behind interfaces.
 class IBackupFile {
 public:
-<<<<<<< HEAD
+	IBackupFile(const std::string& fileName) : m_fileName(fileName) {}
-	IBackupFile(const std::string& fileName) : m_fileName(fileName), m_offset(0) {}
-=======
-	IBackupFile(std::string fileName) : m_fileName(fileName) {}
->>>>>>> release-6.3
 	virtual ~IBackupFile() {}
 	// Backup files are append-only and cannot have more than 1 append outstanding at once.
 	virtual Future<Void> append(const void *data, int len) = 0;

fdbclient/BackupContainerAzureBlobStore.actor.cpp

@@ -127,6 +127,7 @@ public:
 
 	class BackupFile final : public IBackupFile, ReferenceCounted<BackupFile> {
 		Reference<IAsyncFile> m_file;
+		int64_t m_offset;
 
 	public:
 		BackupFile(const std::string& fileName, Reference<IAsyncFile> file) : IBackupFile(fileName), m_file(file) {}
@@ -142,6 +143,7 @@ public:
 				return Void();
 			});
 		}
+		int64_t size() const override { return m_offset; }
 		void addref() override { ReferenceCounted<BackupFile>::addref(); }
 		void delref() override { ReferenceCounted<BackupFile>::delref(); }
 	};

fdbclient/BackupContainerLocalDirectory.actor.cpp

@@ -50,12 +50,15 @@ public:
 
 	Future<Void> finish() { return finish_impl(Reference<BackupFile>::addRef(this)); }
 
+	int64_t size() const override { return m_offset; }
+
 	void addref() override { return ReferenceCounted<BackupFile>::addref(); }
 	void delref() override { return ReferenceCounted<BackupFile>::delref(); }
 
 private:
 	Reference<IAsyncFile> m_file;
 	std::string m_finalFullPath;
+	int64_t m_offset;
 };
 
 ACTOR static Future<BackupContainerFileSystem::FilesAndSizesT> listFiles_impl(std::string path, std::string m_path) {

fdbclient/BackupContainerS3BlobStore.actor.cpp

@@ -61,11 +61,14 @@ public:
 			});
 		}
 
+		int64_t size() const override { return m_offset; }
+
 		void addref() final { return ReferenceCounted<BackupFile>::addref(); }
 		void delref() final { return ReferenceCounted<BackupFile>::delref(); }
 
 	private:
 		Reference<IAsyncFile> m_file;
+		int64_t m_offset;
 	};
 
 	ACTOR static Future<BackupContainerFileSystem::FilesAndSizesT> listFiles(

fdbclient/DatabaseConfiguration.h

@@ -223,7 +223,6 @@ struct DatabaseConfiguration {
 	bool isExcludedServer(NetworkAddressList) const;
 	std::set<AddressExclusion> getExcludedServers() const;
 
-<<<<<<< HEAD
 	int32_t getDesiredCommitProxies() const {
 		if (commitProxyCount == -1) return autoCommitProxyCount;
 		return commitProxyCount;
@@ -232,15 +231,6 @@ struct DatabaseConfiguration {
 		if (grvProxyCount == -1) return autoGrvProxyCount;
 		return grvProxyCount;
 	}
-	int32_t getDesiredResolvers() const { if(resolverCount == -1) return autoResolverCount; return resolverCount; }
-	int32_t getDesiredLogs() const { if(desiredTLogCount == -1) return autoDesiredTLogCount; return desiredTLogCount; }
-	int32_t getDesiredRemoteLogs() const { if(remoteDesiredTLogCount == -1) return getDesiredLogs(); return remoteDesiredTLogCount;  }
-	int32_t getDesiredSatelliteLogs( Optional<Key> dcId ) const {
-=======
-	int32_t getDesiredProxies() const {
-		if (masterProxyCount == -1) return autoMasterProxyCount;
-		return masterProxyCount;
-	}
 	int32_t getDesiredResolvers() const {
 		if (resolverCount == -1) return autoResolverCount;
 		return resolverCount;
@@ -254,8 +244,6 @@ struct DatabaseConfiguration {
 		return remoteDesiredTLogCount;
 	}
 	int32_t getDesiredSatelliteLogs(Optional<Key> dcId) const {
-
->>>>>>> release-6.3
 		auto desired = getRegion(dcId).satelliteDesiredTLogCount;
 		if (desired == -1) return autoDesiredTLogCount;
 		return desired;

fdbclient/NativeAPI.actor.cpp

@@ -846,11 +846,7 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
                                  bool switchable)
   : connectionFile(connectionFile), clientInfo(clientInfo), clientInfoMonitor(clientInfoMonitor), taskID(taskID),
     clientLocality(clientLocality), enableLocalityLoadBalance(enableLocalityLoadBalance), lockAware(lockAware),
-<<<<<<< HEAD
     apiVersion(apiVersion), switchable(switchable), proxyProvisional(false), cc("TransactionMetrics"),
-=======
-    apiVersion(apiVersion), switchable(switchable), provisional(false), cc("TransactionMetrics"),
->>>>>>> release-6.3
     transactionReadVersions("ReadVersions", cc), transactionReadVersionsThrottled("ReadVersionsThrottled", cc),
     transactionReadVersionsCompleted("ReadVersionsCompleted", cc),
     transactionReadVersionBatches("ReadVersionBatches", cc),
@@ -872,24 +868,14 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<ClusterConnectionF
     transactionsCommitStarted("CommitStarted", cc), transactionsCommitCompleted("CommitCompleted", cc),
     transactionKeyServerLocationRequests("KeyServerLocationRequests", cc),
     transactionKeyServerLocationRequestsCompleted("KeyServerLocationRequestsCompleted", cc),
-<<<<<<< HEAD
-    transactionsTooOld("TooOld", cc), transactionsFutureVersions("FutureVersions", cc),
-    transactionsNotCommitted("NotCommitted", cc), transactionsMaybeCommitted("MaybeCommitted", cc),
-    transactionsResourceConstrained("ResourceConstrained", cc), transactionsThrottled("Throttled", cc),
-    transactionsProcessBehind("ProcessBehind", cc), outstandingWatches(0), latencies(1000), readLatencies(1000),
-    commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000), bytesPerCommit(1000), mvCacheInsertLocation(0),
-    healthMetricsLastUpdated(0), detailedHealthMetricsLastUpdated(0), internal(internal), transactionTracingEnabled(true),
-    smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
-    transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc),
-=======
     transactionStatusRequests("StatusRequests", cc), transactionsTooOld("TooOld", cc),
     transactionsFutureVersions("FutureVersions", cc), transactionsNotCommitted("NotCommitted", cc),
     transactionsMaybeCommitted("MaybeCommitted", cc), transactionsResourceConstrained("ResourceConstrained", cc),
     transactionsThrottled("Throttled", cc), transactionsProcessBehind("ProcessBehind", cc), outstandingWatches(0),
     latencies(1000), readLatencies(1000), commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000),
     bytesPerCommit(1000), mvCacheInsertLocation(0), healthMetricsLastUpdated(0), detailedHealthMetricsLastUpdated(0),
-    internal(internal),
+    internal(internal), transactionTracingEnabled(true), smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
->>>>>>> release-6.3
+    transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc),
     specialKeySpace(std::make_unique<SpecialKeySpace>(specialKeys.begin, specialKeys.end, /* test */ false)) {
 	dbId = deterministicRandom()->randomUniqueID();
 	connected = (clientInfo->get().commitProxies.size() && clientInfo->get().grvProxies.size())
@@ -1057,22 +1043,14 @@ DatabaseContext::DatabaseContext(const Error& err)
     transactionsCommitStarted("CommitStarted", cc), transactionsCommitCompleted("CommitCompleted", cc),
     transactionKeyServerLocationRequests("KeyServerLocationRequests", cc),
     transactionKeyServerLocationRequestsCompleted("KeyServerLocationRequestsCompleted", cc),
-<<<<<<< HEAD
-    transactionsTooOld("TooOld", cc), transactionsFutureVersions("FutureVersions", cc),
-    transactionsNotCommitted("NotCommitted", cc), transactionsMaybeCommitted("MaybeCommitted", cc),
-    transactionsResourceConstrained("ResourceConstrained", cc), transactionsThrottled("Throttled", cc),
-    transactionsProcessBehind("ProcessBehind", cc), latencies(1000), readLatencies(1000), commitLatencies(1000),
-    GRVLatencies(1000), mutationsPerCommit(1000), bytesPerCommit(1000),
-    smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
-    transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc), internal(false), transactionTracingEnabled(true) {}
-=======
     transactionStatusRequests("StatusRequests", cc), transactionsTooOld("TooOld", cc),
     transactionsFutureVersions("FutureVersions", cc), transactionsNotCommitted("NotCommitted", cc),
     transactionsMaybeCommitted("MaybeCommitted", cc), transactionsResourceConstrained("ResourceConstrained", cc),
     transactionsThrottled("Throttled", cc), transactionsProcessBehind("ProcessBehind", cc), latencies(1000),
     readLatencies(1000), commitLatencies(1000), GRVLatencies(1000), mutationsPerCommit(1000), bytesPerCommit(1000),
-    internal(false) {}
+    smoothMidShardSize(CLIENT_KNOBS->SHARD_STAT_SMOOTH_AMOUNT),
->>>>>>> release-6.3
+    transactionsExpensiveClearCostEstCount("ExpensiveClearCostEstCount", cc), internal(false),
+    transactionTracingEnabled(true) {}
 
 Database DatabaseContext::create(Reference<AsyncVar<ClientDBInfo>> clientInfo, Future<Void> clientInfoMonitor, LocalityData clientLocality, bool enableLocalityLoadBalance, TaskPriority taskID, bool lockAware, int apiVersion, bool switchable) {
 	return Database( new DatabaseContext( Reference<AsyncVar<Reference<ClusterConnectionFile>>>(), clientInfo, clientInfoMonitor, taskID, clientLocality, enableLocalityLoadBalance, lockAware, true, apiVersion, switchable ) );

fdbclient/SystemData.h

@@ -194,13 +194,11 @@ UID decodeProcessClassKeyOld( KeyRef const& key );
 extern const KeyRangeRef configKeys;
 extern const KeyRef configKeysPrefix;
 
-<<<<<<< HEAD
-//	The differences between excluded and failed can be found in "command-line-interface.rst"
-//	and in the help message of the fdbcli command "exclude".
-=======
 // Change the value of this key to anything and that will trigger detailed data distribution team info log.
 extern const KeyRef triggerDDTeamInfoPrintKey;
->>>>>>> release-6.3
+
+//	The differences between excluded and failed can be found in "command-line-interface.rst"
+//	and in the help message of the fdbcli command "exclude".
 
 //   "\xff/conf/excluded/1.2.3.4" := ""
 //   "\xff/conf/excluded/1.2.3.4:4000" := ""

fdbserver/Knobs.cpp

@@ -380,11 +380,8 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi
 	init( PROXY_COMPUTE_BUCKETS,                                20000 );
 	init( PROXY_COMPUTE_GROWTH_RATE,                             0.01 );
 	init( TXN_STATE_SEND_AMOUNT,                                    4 );
-<<<<<<< HEAD
 	init( REPORT_TRANSACTION_COST_ESTIMATION_DELAY,               0.1 );
-=======
 	init( PROXY_REJECT_BATCH_QUEUED_TOO_LONG,                    true );
->>>>>>> release-6.3
 
 	init( RESET_MASTER_BATCHES,                                   200 );
 	init( RESET_RESOLVER_BATCHES,                                 200 );

fdbserver/Knobs.h

@@ -311,11 +311,8 @@ public:
 	int PROXY_COMPUTE_BUCKETS;
 	double PROXY_COMPUTE_GROWTH_RATE;
 	int TXN_STATE_SEND_AMOUNT;
-<<<<<<< HEAD
 	double REPORT_TRANSACTION_COST_ESTIMATION_DELAY;
-=======
 	bool PROXY_REJECT_BATCH_QUEUED_TOO_LONG;
->>>>>>> release-6.3
 
 	int RESET_MASTER_BATCHES;
 	int RESET_RESOLVER_BATCHES;

versions.target

@@ -1,12 +1,7 @@
 <?xml version="1.0"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-<<<<<<< HEAD
     <Version>7.0.0</Version>
     <PackageName>7.0</PackageName>
-=======
-    <Version>6.3.11</Version>
-    <PackageName>6.3</PackageName>
->>>>>>> release-6.3
   </PropertyGroup>
 </Project>