Skip to content

Commit 6f164a0

Browse files
Nitin Gargmeta-codesync[bot]
authored andcommitted
Migrate external consumers to namespaced MySQL include targets
Summary: Migrate mysql_raft, squangle, and dbproxy to use fbcode-relative includes with _namespaced targets instead of short includes with header_namespace. Changes: - mysql_raft: Update all source files and BUCK to use _namespaced deps - squangle/mysql_client/mysql_protocol: Update to _namespaced deps - dbproxy: Update frontend target to use _namespaced deps - Expand visibility on _namespaced targets in mysql/server/include to include external consumers (dbproxy, squangle, mysql_raft) - Fix duplicate container_utils_namespaced target in sql-common/BUCK - Convert remaining short includes to fbcode-relative paths in mysql_raft - Fix mysql_raft autodeps and convert remaining short includes - Convert sql-common/oci to per-header targets - Fix autodeps dependency issues for namespaced header targets: - Break cycle between mysql:namespaced_headers and components/services:namespaced_headers - Add per-file targets (service_plugin_registry, service_srv_session_bits) instead of aggregate deps - Remove sql:sql_log and sql_error_main deps from log_builtins to break cycle - Fix autodeps2 issues in mysql_raft/BUCK and mysql_raft/log/BUCK: - Add missing _namespaced deps for header includes - Expand visibility on mysql_mutex_bits_namespaced and my_io_bits_namespaced - Fix dependency cycle in sys_vars_shared_namespaced: - Remove unnecessary sql_table.h include from sys_vars_shared.h - This breaks the cycle: rpc_ddl_precheck_leader -> sys_vars_shared_namespaced -> sql_ddl_main -> rpc_ddl_precheck_leader This is part of the autodeps migration to standardize MySQL header includes. Reviewed By: nathan-liyiming Differential Revision: D92447494 fbshipit-source-id: 7e2b4d1b121fe434aae9535a65a8333718f78ec7
1 parent 4a21638 commit 6f164a0

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

third-party/squangle/src/squangle/mysql_client/mysql_protocol/MysqlConnection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
*/
88

99
#include <folly/Exception.h>
10-
#include <mysql_async.h>
1110
#include <memory>
1211
#include <string>
12+
#include "mysql/server/include/mysql_async.h" // @manual=//mysql/server/include:mysql_async_namespaced
1313

1414
#include "squangle/base/ExceptionUtil.h"
1515
#include "squangle/mysql_client/ConnectionOptions.h"

third-party/squangle/src/squangle/mysql_client/mysql_protocol/MysqlConnection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#pragma once
1010

1111
#include <fmt/format.h>
12-
#include <mysql.h>
12+
#include "mysql/server/include/mysql.h" // @manual=//mysql/server/include:mysql_namespaced
1313

1414
#include "squangle/base/Base.h"
1515
#include "squangle/base/ConnectionKey.h"

0 commit comments

Comments
 (0)