Rename directory flight_sql to sql (apache#210)

rafael-telles · Nov 19, 2021 · df80ab6 · df80ab6
1 parent ce60a27
commit df80ab6
Show file tree

Hide file tree

Showing 25 changed files with 42 additions and 42 deletions.
diff --git 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
@@ -727,7 +727,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/.../flight_sql/ArrowFlightSqlConfig.cmake.in → .../flight/sql/ArrowFlightSqlConfig.cmake.in b/.../flight_sql/ArrowFlightSqlConfig.cmake.in → .../flight/sql/ArrowFlightSqlConfig.cmake.in
diff --git a/...rc/arrow/flight/flight_sql/CMakeLists.txt → cpp/src/arrow/flight/sql/CMakeLists.txt b/...rc/arrow/flight/flight_sql/CMakeLists.txt → 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 → cpp/src/arrow/flight/sql/api.h b/cpp/src/arrow/flight/flight_sql/api.h → 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/.../flight/flight_sql/arrow-flight-sql.pc.in → ...c/arrow/flight/sql/arrow-flight-sql.pc.in b/.../flight/flight_sql/arrow-flight-sql.pc.in → ...c/arrow/flight/sql/arrow-flight-sql.pc.in
diff --git a/cpp/src/arrow/flight/flight_sql/client.cc → cpp/src/arrow/flight/sql/client.cc b/cpp/src/arrow/flight/flight_sql/client.cc → 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 → cpp/src/arrow/flight/sql/client.h b/cpp/src/arrow/flight/flight_sql/client.h → cpp/src/arrow/flight/sql/client.h
diff --git a/...rc/arrow/flight/flight_sql/client_test.cc → cpp/src/arrow/flight/sql/client_test.cc b/...rc/arrow/flight/flight_sql/client_test.cc → 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/...light/flight_sql/example/sqlite_server.cc → ...arrow/flight/sql/example/sqlite_server.cc b/...light/flight_sql/example/sqlite_server.cc → ...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/...flight/flight_sql/example/sqlite_server.h → .../arrow/flight/sql/example/sqlite_server.h b/...flight/flight_sql/example/sqlite_server.h → .../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/...ht/flight_sql/example/sqlite_statement.cc → ...ow/flight/sql/example/sqlite_statement.cc b/...ht/flight_sql/example/sqlite_statement.cc → ...ow/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/...ght/flight_sql/example/sqlite_statement.h → ...row/flight/sql/example/sqlite_statement.h b/...ght/flight_sql/example/sqlite_statement.h → ...row/flight/sql/example/sqlite_statement.h
diff --git a/.../example/sqlite_statement_batch_reader.cc → .../example/sqlite_statement_batch_reader.cc b/.../example/sqlite_statement_batch_reader.cc → .../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/...l/example/sqlite_statement_batch_reader.h → ...l/example/sqlite_statement_batch_reader.h b/...l/example/sqlite_statement_batch_reader.h → ...l/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/...mple/sqlite_tables_schema_batch_reader.cc → ...mple/sqlite_tables_schema_batch_reader.cc b/...mple/sqlite_tables_schema_batch_reader.cc → ...mple/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/...ample/sqlite_tables_schema_batch_reader.h → ...ample/sqlite_tables_schema_batch_reader.h b/...ample/sqlite_tables_schema_batch_reader.h → ...ample/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 → cpp/src/arrow/flight/sql/server.cc b/cpp/src/arrow/flight/flight_sql/server.cc → 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 → cpp/src/arrow/flight/sql/server.h b/cpp/src/arrow/flight/flight_sql/server.h → 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/...rc/arrow/flight/flight_sql/server_test.cc → cpp/src/arrow/flight/sql/server_test.cc b/...rc/arrow/flight/flight_sql/server_test.cc → 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/...ow/flight/flight_sql/sql_info_internal.cc → ...src/arrow/flight/sql/sql_info_internal.cc b/...ow/flight/flight_sql/sql_info_internal.cc → ...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/...row/flight/flight_sql/sql_info_internal.h → cpp/src/arrow/flight/sql/sql_info_internal.h b/...row/flight/flight_sql/sql_info_internal.h → 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/.../arrow/flight/flight_sql/sql_info_types.h → cpp/src/arrow/flight/sql/sql_info_types.h b/.../arrow/flight/flight_sql/sql_info_types.h → cpp/src/arrow/flight/sql/sql_info_types.h
diff --git a/...c/arrow/flight/flight_sql/test_app_cli.cc → cpp/src/arrow/flight/sql/test_app_cli.cc b/...c/arrow/flight/flight_sql/test_app_cli.cc → 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/...rrow/flight/flight_sql/test_server_cli.cc → cpp/src/arrow/flight/sql/test_server_cli.cc b/...rrow/flight/flight_sql/test_server_cli.cc → 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"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,4 @@

		#pragma once

		#include "arrow/flight/flight_sql/client.h"
		#include "arrow/flight/sql/client.h"