From 56d84e9fd210a74c0aea7fb4675b76e35e12de76 Mon Sep 17 00:00:00 2001
From: Rafael Telles <rafael@telles.dev>
Date: Fri, 19 Nov 2021 14:27:50 -0300
Subject: [PATCH] Rename directory flight_sql to sql (#210)

---
 cpp/cmake_modules/FindArrowFlightSql.cmake             |  2 +-
 cpp/src/arrow/CMakeLists.txt                           |  2 +-
 .../{flight_sql => sql}/ArrowFlightSqlConfig.cmake.in  |  0
 .../arrow/flight/{flight_sql => sql}/CMakeLists.txt    |  4 ++--
 cpp/src/arrow/flight/{flight_sql => sql}/api.h         |  2 +-
 .../flight/{flight_sql => sql}/arrow-flight-sql.pc.in  |  0
 cpp/src/arrow/flight/{flight_sql => sql}/client.cc     |  4 ++--
 cpp/src/arrow/flight/{flight_sql => sql}/client.h      |  0
 .../arrow/flight/{flight_sql => sql}/client_test.cc    |  4 ++--
 .../{flight_sql => sql}/example/sqlite_server.cc       | 10 +++++-----
 .../flight/{flight_sql => sql}/example/sqlite_server.h |  8 ++++----
 .../{flight_sql => sql}/example/sqlite_statement.cc    |  4 ++--
 .../{flight_sql => sql}/example/sqlite_statement.h     |  0
 .../example/sqlite_statement_batch_reader.cc           |  4 ++--
 .../example/sqlite_statement_batch_reader.h            |  2 +-
 .../example/sqlite_tables_schema_batch_reader.cc       |  8 ++++----
 .../example/sqlite_tables_schema_batch_reader.h        |  4 ++--
 cpp/src/arrow/flight/{flight_sql => sql}/server.cc     |  6 +++---
 cpp/src/arrow/flight/{flight_sql => sql}/server.h      |  4 ++--
 .../arrow/flight/{flight_sql => sql}/server_test.cc    |  8 ++++----
 .../flight/{flight_sql => sql}/sql_info_internal.cc    |  2 +-
 .../flight/{flight_sql => sql}/sql_info_internal.h     |  2 +-
 .../arrow/flight/{flight_sql => sql}/sql_info_types.h  |  0
 .../arrow/flight/{flight_sql => sql}/test_app_cli.cc   |  2 +-
 .../flight/{flight_sql => sql}/test_server_cli.cc      |  2 +-
 25 files changed, 42 insertions(+), 42 deletions(-)
 rename cpp/src/arrow/flight/{flight_sql => sql}/ArrowFlightSqlConfig.cmake.in (100%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/CMakeLists.txt (96%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/api.h (94%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/arrow-flight-sql.pc.in (100%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/client.cc (99%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/client.h (100%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/client_test.cc (99%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/example/sqlite_server.cc (98%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/example/sqlite_server.h (98%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/example/sqlite_statement.cc (97%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/example/sqlite_statement.h (100%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/example/sqlite_statement_batch_reader.cc (98%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/example/sqlite_statement_batch_reader.h (97%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/example/sqlite_tables_schema_batch_reader.cc (93%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/example/sqlite_tables_schema_batch_reader.h (93%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/server.cc (99%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/server.h (99%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/server_test.cc (99%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/sql_info_internal.cc (98%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/sql_info_internal.h (98%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/sql_info_types.h (100%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/test_app_cli.cc (99%)
 rename cpp/src/arrow/flight/{flight_sql => sql}/test_server_cli.cc (97%)

diff --git a/cpp/cmake_modules/FindArrowFlightSql.cmake b/cpp/cmake_modules/FindArrowFlightSql.cmake
index 35141749b1f76..cbca81cac441c 100644
--- a/cpp/cmake_modules/FindArrowFlightSql.cmake
+++ b/cpp/cmake_modules/FindArrowFlightSql.cmake
@@ -51,7 +51,7 @@ if(ARROW_FOUND)
   arrow_find_package(ARROW_FLIGHT_SQL
                      "${ARROW_HOME}"
                      arrow_flight_sql
-                     arrow/flight/flight_sql/api.h
+                     arrow/flight/sql/api.h
                      ArrowFlightSql
                      arrow-flight-sql)
   if(NOT ARROW_FLIGHT_SQL_VERSION)
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
index 01b646d4e76c8..502629a92a4eb 100644
--- a/cpp/src/arrow/CMakeLists.txt
+++ b/cpp/src/arrow/CMakeLists.txt
@@ -733,7 +733,7 @@ if(ARROW_FLIGHT)
 endif()
 
 if(ARROW_FLIGHT_SQL)
-  add_subdirectory(flight/flight_sql)
+  add_subdirectory(flight/sql)
 endif()
 
 if(ARROW_HIVESERVER2)
diff --git a/cpp/src/arrow/flight/flight_sql/ArrowFlightSqlConfig.cmake.in b/cpp/src/arrow/flight/sql/ArrowFlightSqlConfig.cmake.in
similarity index 100%
rename from cpp/src/arrow/flight/flight_sql/ArrowFlightSqlConfig.cmake.in
rename to cpp/src/arrow/flight/sql/ArrowFlightSqlConfig.cmake.in
diff --git a/cpp/src/arrow/flight/flight_sql/CMakeLists.txt b/cpp/src/arrow/flight/sql/CMakeLists.txt
similarity index 96%
rename from cpp/src/arrow/flight/flight_sql/CMakeLists.txt
rename to cpp/src/arrow/flight/sql/CMakeLists.txt
index dcbb5cea1aaa8..656b1123dcf79 100644
--- a/cpp/src/arrow/flight/flight_sql/CMakeLists.txt
+++ b/cpp/src/arrow/flight/sql/CMakeLists.txt
@@ -17,7 +17,7 @@
 
 add_custom_target(arrow_flight_sql)
 
-arrow_install_all_headers("arrow/flight/flight_sql")
+arrow_install_all_headers("arrow/flight/sql")
 
 set(FLIGHT_SQL_PROTO_PATH "${ARROW_SOURCE_DIR}/../format")
 set(FLIGHT_SQL_PROTO ${ARROW_SOURCE_DIR}/../format/FlightSql.proto)
@@ -49,7 +49,7 @@ add_arrow_lib(arrow_flight_sql
               SOURCES
               ${ARROW_FLIGHT_SQL_SRCS}
               PRECOMPILED_HEADERS
-              "$<$<COMPILE_LANGUAGE:CXX>:arrow/flight/flight_sql/pch.h>"
+              "$<$<COMPILE_LANGUAGE:CXX>:arrow/flight/sql/pch.h>"
               DEPENDENCIES
               flight_sql_protobuf_gen
               SHARED_LINK_FLAGS
diff --git a/cpp/src/arrow/flight/flight_sql/api.h b/cpp/src/arrow/flight/sql/api.h
similarity index 94%
rename from cpp/src/arrow/flight/flight_sql/api.h
rename to cpp/src/arrow/flight/sql/api.h
index 8d5124ee86d1d..3b909eedf29c5 100644
--- a/cpp/src/arrow/flight/flight_sql/api.h
+++ b/cpp/src/arrow/flight/sql/api.h
@@ -17,4 +17,4 @@
 
 #pragma once
 
-#include "arrow/flight/flight_sql/client.h"
+#include "arrow/flight/sql/client.h"
diff --git a/cpp/src/arrow/flight/flight_sql/arrow-flight-sql.pc.in b/cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in
similarity index 100%
rename from cpp/src/arrow/flight/flight_sql/arrow-flight-sql.pc.in
rename to cpp/src/arrow/flight/sql/arrow-flight-sql.pc.in
diff --git a/cpp/src/arrow/flight/flight_sql/client.cc b/cpp/src/arrow/flight/sql/client.cc
similarity index 99%
rename from cpp/src/arrow/flight/flight_sql/client.cc
rename to cpp/src/arrow/flight/sql/client.cc
index e565c872cee08..9a800b256afbe 100644
--- a/cpp/src/arrow/flight/flight_sql/client.cc
+++ b/cpp/src/arrow/flight/sql/client.cc
@@ -15,12 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/flight/flight_sql/client.h"
+#include "arrow/flight/sql/client.h"
 
 #include <google/protobuf/any.pb.h>
 
 #include "arrow/buffer.h"
-#include "arrow/flight/flight_sql/FlightSql.pb.h"
+#include "arrow/flight/sql/FlightSql.pb.h"
 #include "arrow/flight/types.h"
 #include "arrow/io/memory.h"
 #include "arrow/ipc/reader.h"
diff --git a/cpp/src/arrow/flight/flight_sql/client.h b/cpp/src/arrow/flight/sql/client.h
similarity index 100%
rename from cpp/src/arrow/flight/flight_sql/client.h
rename to cpp/src/arrow/flight/sql/client.h
diff --git a/cpp/src/arrow/flight/flight_sql/client_test.cc b/cpp/src/arrow/flight/sql/client_test.cc
similarity index 99%
rename from cpp/src/arrow/flight/flight_sql/client_test.cc
rename to cpp/src/arrow/flight/sql/client_test.cc
index 0397ff9148918..0c6ec1c6cd6fd 100644
--- a/cpp/src/arrow/flight/flight_sql/client_test.cc
+++ b/cpp/src/arrow/flight/sql/client_test.cc
@@ -23,8 +23,8 @@
 
 #include <utility>
 
-#include "arrow/flight/flight_sql/FlightSql.pb.h"
-#include "arrow/flight/flight_sql/api.h"
+#include "arrow/flight/sql/FlightSql.pb.h"
+#include "arrow/flight/sql/api.h"
 #include "arrow/testing/gtest_util.h"
 
 namespace pb = arrow::flight::protocol;
diff --git a/cpp/src/arrow/flight/flight_sql/example/sqlite_server.cc b/cpp/src/arrow/flight/sql/example/sqlite_server.cc
similarity index 98%
rename from cpp/src/arrow/flight/flight_sql/example/sqlite_server.cc
rename to cpp/src/arrow/flight/sql/example/sqlite_server.cc
index 6d150bd814bed..8854b9c53112e 100644
--- a/cpp/src/arrow/flight/flight_sql/example/sqlite_server.cc
+++ b/cpp/src/arrow/flight/sql/example/sqlite_server.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/flight/flight_sql/example/sqlite_server.h"
+#include "arrow/flight/sql/example/sqlite_server.h"
 
 #include <sqlite3.h>
 
@@ -24,10 +24,10 @@
 #include <boost/uuid/uuid_io.hpp>
 
 #include "arrow/api.h"
-#include "arrow/flight/flight_sql/example/sqlite_statement.h"
-#include "arrow/flight/flight_sql/example/sqlite_statement_batch_reader.h"
-#include "arrow/flight/flight_sql/example/sqlite_tables_schema_batch_reader.h"
-#include "arrow/flight/flight_sql/server.h"
+#include "arrow/flight/sql/example/sqlite_statement.h"
+#include "arrow/flight/sql/example/sqlite_statement_batch_reader.h"
+#include "arrow/flight/sql/example/sqlite_tables_schema_batch_reader.h"
+#include "arrow/flight/sql/server.h"
 
 namespace arrow {
 namespace flight {
diff --git a/cpp/src/arrow/flight/flight_sql/example/sqlite_server.h b/cpp/src/arrow/flight/sql/example/sqlite_server.h
similarity index 98%
rename from cpp/src/arrow/flight/flight_sql/example/sqlite_server.h
rename to cpp/src/arrow/flight/sql/example/sqlite_server.h
index ec126cf429687..6eb890d5ddf11 100644
--- a/cpp/src/arrow/flight/flight_sql/example/sqlite_server.h
+++ b/cpp/src/arrow/flight/sql/example/sqlite_server.h
@@ -26,10 +26,10 @@
 #include <string>
 
 #include "arrow/api.h"
-#include "arrow/flight/flight_sql/FlightSql.pb.h"
-#include "arrow/flight/flight_sql/example/sqlite_statement.h"
-#include "arrow/flight/flight_sql/example/sqlite_statement_batch_reader.h"
-#include "arrow/flight/flight_sql/server.h"
+#include "arrow/flight/sql/FlightSql.pb.h"
+#include "arrow/flight/sql/example/sqlite_statement.h"
+#include "arrow/flight/sql/example/sqlite_statement_batch_reader.h"
+#include "arrow/flight/sql/server.h"
 
 namespace arrow {
 namespace flight {
diff --git a/cpp/src/arrow/flight/flight_sql/example/sqlite_statement.cc b/cpp/src/arrow/flight/sql/example/sqlite_statement.cc
similarity index 97%
rename from cpp/src/arrow/flight/flight_sql/example/sqlite_statement.cc
rename to cpp/src/arrow/flight/sql/example/sqlite_statement.cc
index c08323bb21a4c..3d7c5efeb23eb 100644
--- a/cpp/src/arrow/flight/flight_sql/example/sqlite_statement.cc
+++ b/cpp/src/arrow/flight/sql/example/sqlite_statement.cc
@@ -15,13 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/flight/flight_sql/example/sqlite_statement.h"
+#include "arrow/flight/sql/example/sqlite_statement.h"
 
 #include <sqlite3.h>
 
 #include <boost/algorithm/string.hpp>
 
-#include "arrow/flight/flight_sql/example/sqlite_server.h"
+#include "arrow/flight/sql/example/sqlite_server.h"
 
 namespace arrow {
 namespace flight {
diff --git a/cpp/src/arrow/flight/flight_sql/example/sqlite_statement.h b/cpp/src/arrow/flight/sql/example/sqlite_statement.h
similarity index 100%
rename from cpp/src/arrow/flight/flight_sql/example/sqlite_statement.h
rename to cpp/src/arrow/flight/sql/example/sqlite_statement.h
diff --git a/cpp/src/arrow/flight/flight_sql/example/sqlite_statement_batch_reader.cc b/cpp/src/arrow/flight/sql/example/sqlite_statement_batch_reader.cc
similarity index 98%
rename from cpp/src/arrow/flight/flight_sql/example/sqlite_statement_batch_reader.cc
rename to cpp/src/arrow/flight/sql/example/sqlite_statement_batch_reader.cc
index 4071c729a8a2b..c6ac34bfddba0 100644
--- a/cpp/src/arrow/flight/flight_sql/example/sqlite_statement_batch_reader.cc
+++ b/cpp/src/arrow/flight/sql/example/sqlite_statement_batch_reader.cc
@@ -15,12 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/flight/flight_sql/example/sqlite_statement_batch_reader.h"
+#include "arrow/flight/sql/example/sqlite_statement_batch_reader.h"
 
 #include <sqlite3.h>
 
 #include "arrow/builder.h"
-#include "arrow/flight/flight_sql/example/sqlite_statement.h"
+#include "arrow/flight/sql/example/sqlite_statement.h"
 
 #define STRING_BUILDER_CASE(TYPE_CLASS, STMT, COLUMN)                             \
   case TYPE_CLASS##Type::type_id: {                                               \
diff --git a/cpp/src/arrow/flight/flight_sql/example/sqlite_statement_batch_reader.h b/cpp/src/arrow/flight/sql/example/sqlite_statement_batch_reader.h
similarity index 97%
rename from cpp/src/arrow/flight/flight_sql/example/sqlite_statement_batch_reader.h
rename to cpp/src/arrow/flight/sql/example/sqlite_statement_batch_reader.h
index 84064a8daaab0..8a6bc6078e711 100644
--- a/cpp/src/arrow/flight/flight_sql/example/sqlite_statement_batch_reader.h
+++ b/cpp/src/arrow/flight/sql/example/sqlite_statement_batch_reader.h
@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include "arrow/flight/flight_sql/example/sqlite_statement.h"
+#include "arrow/flight/sql/example/sqlite_statement.h"
 #include "arrow/record_batch.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/flight/flight_sql/example/sqlite_tables_schema_batch_reader.cc b/cpp/src/arrow/flight/sql/example/sqlite_tables_schema_batch_reader.cc
similarity index 93%
rename from cpp/src/arrow/flight/flight_sql/example/sqlite_tables_schema_batch_reader.cc
rename to cpp/src/arrow/flight/sql/example/sqlite_tables_schema_batch_reader.cc
index d9f16dce94cce..7fb68a709f82f 100644
--- a/cpp/src/arrow/flight/flight_sql/example/sqlite_tables_schema_batch_reader.cc
+++ b/cpp/src/arrow/flight/sql/example/sqlite_tables_schema_batch_reader.cc
@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/flight/flight_sql/example/sqlite_tables_schema_batch_reader.h"
+#include "arrow/flight/sql/example/sqlite_tables_schema_batch_reader.h"
 
 #include <sqlite3.h>
 
 #include <sstream>
 
-#include "arrow/flight/flight_sql/example/sqlite_server.h"
-#include "arrow/flight/flight_sql/example/sqlite_statement.h"
-#include "arrow/flight/flight_sql/server.h"
+#include "arrow/flight/sql/example/sqlite_server.h"
+#include "arrow/flight/sql/example/sqlite_statement.h"
+#include "arrow/flight/sql/server.h"
 #include "arrow/ipc/writer.h"
 #include "arrow/record_batch.h"
 
diff --git a/cpp/src/arrow/flight/flight_sql/example/sqlite_tables_schema_batch_reader.h b/cpp/src/arrow/flight/sql/example/sqlite_tables_schema_batch_reader.h
similarity index 93%
rename from cpp/src/arrow/flight/flight_sql/example/sqlite_tables_schema_batch_reader.h
rename to cpp/src/arrow/flight/sql/example/sqlite_tables_schema_batch_reader.h
index dce725e7a2b84..ecba88efb2fc0 100644
--- a/cpp/src/arrow/flight/flight_sql/example/sqlite_tables_schema_batch_reader.h
+++ b/cpp/src/arrow/flight/sql/example/sqlite_tables_schema_batch_reader.h
@@ -22,8 +22,8 @@
 #include <memory>
 #include <string>
 
-#include "arrow/flight/flight_sql/example/sqlite_statement.h"
-#include "arrow/flight/flight_sql/example/sqlite_statement_batch_reader.h"
+#include "arrow/flight/sql/example/sqlite_statement.h"
+#include "arrow/flight/sql/example/sqlite_statement_batch_reader.h"
 #include "arrow/record_batch.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/flight/flight_sql/server.cc b/cpp/src/arrow/flight/sql/server.cc
similarity index 99%
rename from cpp/src/arrow/flight/flight_sql/server.cc
rename to cpp/src/arrow/flight/sql/server.cc
index 58742f0f070ac..f07222a937e67 100644
--- a/cpp/src/arrow/flight/flight_sql/server.cc
+++ b/cpp/src/arrow/flight/sql/server.cc
@@ -18,14 +18,14 @@
 // Interfaces to use for defining Flight RPC servers. API should be considered
 // experimental for now
 
-#include "arrow/flight/flight_sql/server.h"
+#include "arrow/flight/sql/server.h"
 
 #include <google/protobuf/any.pb.h>
 
 #include "arrow/api.h"
 #include "arrow/buffer.h"
-#include "arrow/flight/flight_sql/FlightSql.pb.h"
-#include "arrow/flight/flight_sql/sql_info_internal.h"
+#include "arrow/flight/sql/FlightSql.pb.h"
+#include "arrow/flight/sql/sql_info_internal.h"
 #include "arrow/type.h"
 #include "arrow/util/logging.h"
 
diff --git a/cpp/src/arrow/flight/flight_sql/server.h b/cpp/src/arrow/flight/sql/server.h
similarity index 99%
rename from cpp/src/arrow/flight/flight_sql/server.h
rename to cpp/src/arrow/flight/sql/server.h
index 8ab589f056e9b..f1757fc27bece 100644
--- a/cpp/src/arrow/flight/flight_sql/server.h
+++ b/cpp/src/arrow/flight/sql/server.h
@@ -24,9 +24,9 @@
 #include <string>
 #include <unordered_map>
 
-#include "arrow/flight/flight_sql/server.h"
-#include "arrow/flight/flight_sql/sql_info_types.h"
 #include "arrow/flight/server.h"
+#include "arrow/flight/sql/server.h"
+#include "arrow/flight/sql/sql_info_types.h"
 #include "arrow/util/optional.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/flight/flight_sql/server_test.cc b/cpp/src/arrow/flight/sql/server_test.cc
similarity index 99%
rename from cpp/src/arrow/flight/flight_sql/server_test.cc
rename to cpp/src/arrow/flight/sql/server_test.cc
index d99209b898bd3..a044f2ad4f291 100644
--- a/cpp/src/arrow/flight/flight_sql/server_test.cc
+++ b/cpp/src/arrow/flight/sql/server_test.cc
@@ -15,16 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/flight/flight_sql/server.h"
+#include "arrow/flight/sql/server.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include "arrow/api.h"
 #include "arrow/flight/api.h"
-#include "arrow/flight/flight_sql/FlightSql.pb.h"
-#include "arrow/flight/flight_sql/api.h"
-#include "arrow/flight/flight_sql/example/sqlite_server.h"
+#include "arrow/flight/sql/FlightSql.pb.h"
+#include "arrow/flight/sql/api.h"
+#include "arrow/flight/sql/example/sqlite_server.h"
 #include "arrow/flight/test_util.h"
 #include "arrow/flight/types.h"
 #include "arrow/testing/gtest_util.h"
diff --git a/cpp/src/arrow/flight/flight_sql/sql_info_internal.cc b/cpp/src/arrow/flight/sql/sql_info_internal.cc
similarity index 98%
rename from cpp/src/arrow/flight/flight_sql/sql_info_internal.cc
rename to cpp/src/arrow/flight/sql/sql_info_internal.cc
index 2a19ccdddde13..ece963654aa38 100644
--- a/cpp/src/arrow/flight/flight_sql/sql_info_internal.cc
+++ b/cpp/src/arrow/flight/sql/sql_info_internal.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/flight/flight_sql/sql_info_internal.h"
+#include "arrow/flight/sql/sql_info_internal.h"
 
 #include "arrow/api.h"
 #include "arrow/buffer.h"
diff --git a/cpp/src/arrow/flight/flight_sql/sql_info_internal.h b/cpp/src/arrow/flight/sql/sql_info_internal.h
similarity index 98%
rename from cpp/src/arrow/flight/flight_sql/sql_info_internal.h
rename to cpp/src/arrow/flight/sql/sql_info_internal.h
index 6d500e9ec8ce7..4f08b109303b0 100644
--- a/cpp/src/arrow/flight/flight_sql/sql_info_internal.h
+++ b/cpp/src/arrow/flight/sql/sql_info_internal.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "arrow/flight/flight_sql/sql_info_types.h"
+#include "arrow/flight/sql/sql_info_types.h"
 
 namespace arrow {
 namespace flight {
diff --git a/cpp/src/arrow/flight/flight_sql/sql_info_types.h b/cpp/src/arrow/flight/sql/sql_info_types.h
similarity index 100%
rename from cpp/src/arrow/flight/flight_sql/sql_info_types.h
rename to cpp/src/arrow/flight/sql/sql_info_types.h
diff --git a/cpp/src/arrow/flight/flight_sql/test_app_cli.cc b/cpp/src/arrow/flight/sql/test_app_cli.cc
similarity index 99%
rename from cpp/src/arrow/flight/flight_sql/test_app_cli.cc
rename to cpp/src/arrow/flight/sql/test_app_cli.cc
index 9d89c86b251d3..5e3f9d7a660fb 100644
--- a/cpp/src/arrow/flight/flight_sql/test_app_cli.cc
+++ b/cpp/src/arrow/flight/sql/test_app_cli.cc
@@ -24,7 +24,7 @@
 #include "arrow/array/builder_binary.h"
 #include "arrow/array/builder_primitive.h"
 #include "arrow/flight/api.h"
-#include "arrow/flight/flight_sql/api.h"
+#include "arrow/flight/sql/api.h"
 #include "arrow/io/memory.h"
 #include "arrow/pretty_print.h"
 #include "arrow/status.h"
diff --git a/cpp/src/arrow/flight/flight_sql/test_server_cli.cc b/cpp/src/arrow/flight/sql/test_server_cli.cc
similarity index 97%
rename from cpp/src/arrow/flight/flight_sql/test_server_cli.cc
rename to cpp/src/arrow/flight/sql/test_server_cli.cc
index 22c7610c8dd12..8074ab534bd24 100644
--- a/cpp/src/arrow/flight/flight_sql/test_server_cli.cc
+++ b/cpp/src/arrow/flight/sql/test_server_cli.cc
@@ -21,8 +21,8 @@
 #include <memory>
 #include <string>
 
-#include "arrow/flight/flight_sql/example/sqlite_server.h"
 #include "arrow/flight/server.h"
+#include "arrow/flight/sql/example/sqlite_server.h"
 #include "arrow/flight/test_integration.h"
 #include "arrow/flight/test_util.h"
 #include "arrow/io/test_common.h"