Skip to content

Commit b59e216

Browse files
authored
Merge pull request ClickHouse#80388 from azat/context-fwd-decl
Context forward declaration
2 parents 8f87184 + 5e42320 commit b59e216

File tree

162 files changed

+253
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+253
-110
lines changed

programs/client/Client.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <IO/ReadHelpers.h>
2222
#include <IO/WriteBufferFromOStream.h>
2323
#include <IO/WriteHelpers.h>
24+
#include <Interpreters/Context.h>
2425

2526
#include <AggregateFunctions/registerAggregateFunctions.h>
2627
#include <Formats/FormatFactory.h>

src/Client/LocalConnection.h

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

33
#include "Connection.h"
4-
#include <Interpreters/Context.h>
4+
#include <Interpreters/Context_fwd.h>
55
#include <QueryPipeline/BlockIO.h>
66
#include <Interpreters/Session.h>
77
#include <Interpreters/ProfileEventsExt.h>

src/Common/DateLUT.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
#include <mutex>
1212
#include <unordered_map>
1313

14-
namespace DB
15-
{
16-
class Context;
17-
using ContextPtr = std::shared_ptr<const Context>;
18-
}
19-
2014
class DateLUTImpl;
2115

2216

src/Common/NamedCollections/NamedCollections.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include <Interpreters/Context.h>
2+
33
#include <Common/NamedCollections/NamedCollections_fwd.h>
44
#include <Parsers/ASTCreateNamedCollectionQuery.h>
55
#include <Parsers/ASTAlterNamedCollectionQuery.h>

src/Common/NamedCollections/NamedCollectionsFactory.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <Common/NamedCollections/NamedCollectionsMetadataStorage.h>
77
#include <Common/ZooKeeper/KeeperException.h>
88
#include <Core/BackgroundSchedulePool.h>
9+
#include <Interpreters/Context.h>
910

1011
namespace DB
1112
{

src/Common/NamedCollections/NamedCollectionsMetadataStorage.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <Parsers/ASTAlterNamedCollectionQuery.h>
44
#include <Parsers/ASTDropNamedCollectionQuery.h>
55
#include <Common/NamedCollections/NamedCollections.h>
6+
#include <Interpreters/Context_fwd.h>
67

78
namespace DB
89
{

src/Common/NamedCollections/NamedCollections_fwd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#pragma once
2+
#include <memory>
23
#include <map>
34

45
namespace DB

src/Common/ProgressIndication.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
#include "ProgressIndication.h"
22
#include <algorithm>
33
#include <cstddef>
4-
#include <iostream>
54
#include <mutex>
65
#include <numeric>
7-
#include <filesystem>
8-
#include <cmath>
96
#include <IO/WriteBufferFromFileDescriptor.h>
107
#include <base/types.h>
11-
#include "Common/formatReadable.h"
8+
#include <Common/formatReadable.h>
129
#include <Common/TerminalSize.h>
1310
#include <Common/UnicodeBar.h>
1411
#include <IO/WriteBufferFromString.h>
1512
#include <IO/Operators.h>
13+
#include <Interpreters/Context.h>
1614

1715
/// http://en.wikipedia.org/wiki/ANSI_escape_code
1816
#define CLEAR_TO_END_OF_LINE "\033[K"

src/Common/ProgressIndication.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
#pragma once
22

33
#include <IO/Progress.h>
4-
#include <Interpreters/Context.h>
4+
#include <Interpreters/Context_fwd.h>
55
#include <base/types.h>
66
#include <Common/Stopwatch.h>
77
#include <Common/EventRateMeter.h>
88

99
#include <iostream>
1010
#include <mutex>
11-
#include <queue>
1211
#include <unistd.h>
1312
#include <unordered_map>
14-
#include <unordered_set>
1513

1614
namespace DB
1715
{

src/Common/ReplicasReconnector.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <Core/ServerSettings.h>
33
#include <Common/ReplicasReconnector.h>
44
#include <Common/logger_useful.h>
5+
#include <Interpreters/Context.h>
56

67

78
namespace DB

0 commit comments

Comments
 (0)