From 5b8f4d9be17eb3f78dbed2b1c9405eac76e0710c Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Thu, 3 Feb 2022 15:33:58 -0800
Subject: [PATCH] Move SimpleIni.h to fdbclient

---
 fdbclient/CMakeLists.txt                  | 2 ++
 {fdbmonitor => fdbclient}/ConvertUTF.h    | 0
 {fdbmonitor => fdbclient}/SimpleIni.h     | 2 +-
 fdbmonitor/CMakeLists.txt                 | 2 +-
 fdbmonitor/fdbmonitor.cpp                 | 2 +-
 fdbserver/SimulatedCluster.actor.cpp      | 2 +-
 fdbserver/fdbserver.actor.cpp             | 2 +-
 fdbserver/workloads/SaveAndKill.actor.cpp | 2 +-
 fdbserver/workloads/SnapTest.actor.cpp    | 2 +-
 9 files changed, 9 insertions(+), 7 deletions(-)
 rename {fdbmonitor => fdbclient}/ConvertUTF.h (100%)
 rename {fdbmonitor => fdbclient}/SimpleIni.h (99%)

diff --git a/fdbclient/CMakeLists.txt b/fdbclient/CMakeLists.txt
index eae0df0599..e442c0d86f 100644
--- a/fdbclient/CMakeLists.txt
+++ b/fdbclient/CMakeLists.txt
@@ -47,6 +47,7 @@ set(FDBCLIENT_SRCS
   ConfigKnobs.h
   ConfigTransactionInterface.cpp
   ConfigTransactionInterface.h
+  ConvertUTF.h
   CoordinationInterface.h
   DatabaseBackupAgent.actor.cpp
   DatabaseConfiguration.cpp
@@ -120,6 +121,7 @@ set(FDBCLIENT_SRCS
   ServerKnobs.cpp
   ServerKnobs.h
   SimpleConfigTransaction.h
+  SimpleIni.h
   SnapshotCache.h
   SpecialKeySpace.actor.cpp
   SpecialKeySpace.actor.h
diff --git a/fdbmonitor/ConvertUTF.h b/fdbclient/ConvertUTF.h
similarity index 100%
rename from fdbmonitor/ConvertUTF.h
rename to fdbclient/ConvertUTF.h
diff --git a/fdbmonitor/SimpleIni.h b/fdbclient/SimpleIni.h
similarity index 99%
rename from fdbmonitor/SimpleIni.h
rename to fdbclient/SimpleIni.h
index cb934787cc..994892d325 100644
--- a/fdbmonitor/SimpleIni.h
+++ b/fdbclient/SimpleIni.h
@@ -2541,7 +2541,7 @@ public:
 #define SI_NoCase SI_GenericNoCase
 
 #include <wchar.h>
-#include "ConvertUTF.h"
+#include "fdbclient/ConvertUTF.h"
 
 /**
  * Converts UTF-8 to a wchar_t (or equivalent) using the Unicode reference
diff --git a/fdbmonitor/CMakeLists.txt b/fdbmonitor/CMakeLists.txt
index a59fbac83a..70f57cb00b 100644
--- a/fdbmonitor/CMakeLists.txt
+++ b/fdbmonitor/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(FDBMONITOR_SRCS ConvertUTF.h SimpleIni.h fdbmonitor.cpp)
+set(FDBMONITOR_SRCS fdbmonitor.cpp)
 
 add_executable(fdbmonitor ${FDBMONITOR_SRCS})
 strip_debug_symbols(fdbmonitor)
diff --git a/fdbmonitor/fdbmonitor.cpp b/fdbmonitor/fdbmonitor.cpp
index a0834dbdb4..a54dcd6736 100644
--- a/fdbmonitor/fdbmonitor.cpp
+++ b/fdbmonitor/fdbmonitor.cpp
@@ -76,8 +76,8 @@
 #include <grp.h>
 
 #include "flow/SimpleOpt.h"
-#include "SimpleIni.h"
 
+#include "fdbclient/SimpleIni.h"
 #include "fdbclient/versions.h"
 
 #ifdef __linux__
diff --git a/fdbserver/SimulatedCluster.actor.cpp b/fdbserver/SimulatedCluster.actor.cpp
index 97bc397cd7..a49207457c 100644
--- a/fdbserver/SimulatedCluster.actor.cpp
+++ b/fdbserver/SimulatedCluster.actor.cpp
@@ -34,7 +34,7 @@
 #include "fdbclient/ClusterInterface.h"
 #include "fdbserver/Knobs.h"
 #include "fdbserver/CoordinationInterface.h"
-#include "fdbmonitor/SimpleIni.h"
+#include "fdbclient/SimpleIni.h"
 #include "fdbrpc/AsyncFileNonDurable.actor.h"
 #include "fdbclient/ManagementAPI.actor.h"
 #include "fdbclient/NativeAPI.actor.h"
diff --git a/fdbserver/fdbserver.actor.cpp b/fdbserver/fdbserver.actor.cpp
index 61e1de3442..8bcd61c943 100644
--- a/fdbserver/fdbserver.actor.cpp
+++ b/fdbserver/fdbserver.actor.cpp
@@ -43,7 +43,7 @@
 #include "fdbclient/versions.h"
 #include "fdbclient/BuildFlags.h"
 #include "fdbclient/WellKnownEndpoints.h"
-#include "fdbmonitor/SimpleIni.h"
+#include "fdbclient/SimpleIni.h"
 #include "fdbrpc/AsyncFileCached.actor.h"
 #include "fdbrpc/Net2FileSystem.h"
 #include "fdbrpc/PerfMetric.h"
diff --git a/fdbserver/workloads/SaveAndKill.actor.cpp b/fdbserver/workloads/SaveAndKill.actor.cpp
index a47a28ea1c..43d3e0d2b3 100644
--- a/fdbserver/workloads/SaveAndKill.actor.cpp
+++ b/fdbserver/workloads/SaveAndKill.actor.cpp
@@ -24,7 +24,7 @@
 #include "fdbrpc/simulator.h"
 
 #undef state
-#include "fdbmonitor/SimpleIni.h"
+#include "fdbclient/SimpleIni.h"
 #define state
 #undef max
 #undef min
diff --git a/fdbserver/workloads/SnapTest.actor.cpp b/fdbserver/workloads/SnapTest.actor.cpp
index 9b20eb024d..718ab09b51 100644
--- a/fdbserver/workloads/SnapTest.actor.cpp
+++ b/fdbserver/workloads/SnapTest.actor.cpp
@@ -4,7 +4,7 @@
 #include "fdbclient/ReadYourWrites.h"
 #include "fdbclient/SystemData.h"
 #include "fdbrpc/ContinuousSample.h"
-#include "fdbmonitor/SimpleIni.h"
+#include "fdbclient/SimpleIni.h"
 #include "fdbserver/Status.h"
 #include "fdbserver/TesterInterface.actor.h"
 #include "fdbserver/WorkerInterface.actor.h"