Skip to content

Commit cf3801c

Browse files
jvolmerjvolmer
authored
[COR-55] Get rid of graph tracers (#22175)
* Get rid of graph tracers * Get rid of now unnecessary template parameters * Get rid of graph helpers
1 parent 195ccd1 commit cf3801c

Some content is hidden

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

44 files changed

+586
-3415
lines changed

‎arangod/Aql/ExecutionBlockImpl.tpp‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -137,117 +137,61 @@ using SingleServerProviderStep = ::arangodb::graph::SingleServerProviderStep;
137137
using KPath = arangodb::graph::KPathEnumerator<
138138
arangodb::graph::SingleServerProvider<SingleServerProviderStep>>;
139139

140-
using KPathTracer = arangodb::graph::TracedKPathEnumerator<
141-
arangodb::graph::SingleServerProvider<SingleServerProviderStep>>;
142-
143140
using AllShortestPaths = arangodb::graph::AllShortestPathsEnumerator<
144141
arangodb::graph::SingleServerProvider<
145142
arangodb::graph::SingleServerProviderStep>>;
146-
using AllShortestPathsTracer =
147-
arangodb::graph::TracedAllShortestPathsEnumerator<
148-
arangodb::graph::SingleServerProvider<
149-
arangodb::graph::SingleServerProviderStep>>;
150143

151144
using KShortestPaths = arangodb::graph::KShortestPathsEnumerator<
152145
arangodb::graph::SingleServerProvider<SingleServerProviderStep>>;
153146

154-
using KShortestPathsTracer = arangodb::graph::TracedKShortestPathsEnumerator<
155-
arangodb::graph::SingleServerProvider<SingleServerProviderStep>>;
156-
157147
using YenPaths = arangodb::graph::YenEnumeratorWithProvider<
158148
arangodb::graph::SingleServerProvider<
159149
arangodb::graph::SingleServerProviderStep>>;
160150

161-
using YenPathsTracer = arangodb::graph::TracedYenEnumeratorWithProvider<
162-
arangodb::graph::SingleServerProvider<
163-
arangodb::graph::SingleServerProviderStep>>;
164-
165151
using YenPathsCluster = arangodb::graph::YenEnumeratorWithProvider<
166152
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
167153

168-
using YenPathsClusterTracer = arangodb::graph::TracedYenEnumeratorWithProvider<
169-
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
170-
171154
using WeightedYenPaths = arangodb::graph::WeightedYenEnumeratorWithProvider<
172155
arangodb::graph::SingleServerProvider<
173156
arangodb::graph::SingleServerProviderStep>>;
174157

175-
using WeightedYenPathsTracer =
176-
arangodb::graph::TracedWeightedYenEnumeratorWithProvider<
177-
arangodb::graph::SingleServerProvider<
178-
arangodb::graph::SingleServerProviderStep>>;
179-
180158
using WeightedYenPathsCluster =
181159
arangodb::graph::WeightedYenEnumeratorWithProvider<
182160
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
183161

184-
using WeightedYenPathsClusterTracer =
185-
arangodb::graph::TracedWeightedYenEnumeratorWithProvider<
186-
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
187-
188162
using WeightedKShortestPaths =
189163
arangodb::graph::WeightedKShortestPathsEnumerator<
190164
arangodb::graph::SingleServerProvider<SingleServerProviderStep>>;
191165

192-
using WeightedKShortestPathsTracer =
193-
arangodb::graph::TracedWeightedKShortestPathsEnumerator<
194-
arangodb::graph::SingleServerProvider<SingleServerProviderStep>>;
195-
196166
using ShortestPath = arangodb::graph::ShortestPathEnumerator<
197167
arangodb::graph::SingleServerProvider<
198168
arangodb::graph::SingleServerProviderStep>>;
199-
using ShortestPathTracer = arangodb::graph::TracedShortestPathEnumerator<
200-
arangodb::graph::SingleServerProvider<
201-
arangodb::graph::SingleServerProviderStep>>;
202169

203170
using WeightedShortestPath =
204171
arangodb::graph::WeightedShortestPathEnumeratorAlias<
205172
arangodb::graph::SingleServerProvider<
206173
arangodb::graph::SingleServerProviderStep>>;
207-
using WeightedShortestPathTracer =
208-
arangodb::graph::TracedWeightedShortestPathEnumeratorAlias<
209-
arangodb::graph::SingleServerProvider<
210-
arangodb::graph::SingleServerProviderStep>>;
211174

212175
/* ClusterProvider Section */
213176
using KPathCluster = arangodb::graph::KPathEnumerator<
214177
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
215178

216-
using KPathClusterTracer = arangodb::graph::TracedKPathEnumerator<
217-
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
218-
219179
using AllShortestPathsCluster = arangodb::graph::AllShortestPathsEnumerator<
220180
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
221-
using AllShortestPathsClusterTracer =
222-
arangodb::graph::TracedAllShortestPathsEnumerator<
223-
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
224181

225182
using KShortestPathsCluster = arangodb::graph::KShortestPathsEnumerator<
226183
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
227184

228-
using KShortestPathsClusterTracer =
229-
arangodb::graph::TracedKShortestPathsEnumerator<
230-
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
231-
232185
using WeightedKShortestPathsCluster =
233186
arangodb::graph::WeightedKShortestPathsEnumerator<
234187
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
235188

236-
using WeightedKShortestPathsClusterTracer =
237-
arangodb::graph::TracedWeightedKShortestPathsEnumerator<
238-
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
239-
240189
using ShortestPathCluster = arangodb::graph::ShortestPathEnumerator<
241190
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
242-
using ShortestPathClusterTracer = arangodb::graph::TracedShortestPathEnumerator<
243-
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
244191

245192
using WeightedShortestPathCluster =
246193
arangodb::graph::WeightedShortestPathEnumeratorAlias<
247194
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
248-
using WeightedShortestPathClusterTracer =
249-
arangodb::graph::TracedWeightedShortestPathEnumeratorAlias<
250-
arangodb::graph::ClusterProvider<arangodb::graph::ClusterProviderStep>>;
251195

252196
namespace arangodb::aql {
253197
struct MultipleRemoteModificationExecutor;
@@ -856,37 +800,21 @@ static SkipRowsRangeVariant constexpr skipRowsType() {
856800
useExecutor ==
857801
(is_one_of_v<
858802
Executor, FilterExecutor, ShortestPathExecutor<ShortestPath>,
859-
ShortestPathExecutor<ShortestPathTracer>,
860803
ShortestPathExecutor<ShortestPathCluster>,
861-
ShortestPathExecutor<ShortestPathClusterTracer>,
862804
ShortestPathExecutor<WeightedShortestPath>,
863-
ShortestPathExecutor<WeightedShortestPathTracer>,
864805
ShortestPathExecutor<WeightedShortestPathCluster>,
865-
ShortestPathExecutor<WeightedShortestPathClusterTracer>,
866806
ReturnExecutor, EnumeratePathsExecutor<KPath>,
867-
EnumeratePathsExecutor<KPathTracer>,
868807
EnumeratePathsExecutor<KPathCluster>,
869-
EnumeratePathsExecutor<KPathClusterTracer>,
870808
EnumeratePathsExecutor<AllShortestPaths>,
871-
EnumeratePathsExecutor<AllShortestPathsTracer>,
872809
EnumeratePathsExecutor<AllShortestPathsCluster>,
873-
EnumeratePathsExecutor<AllShortestPathsClusterTracer>,
874810
EnumeratePathsExecutor<KShortestPaths>,
875-
EnumeratePathsExecutor<KShortestPathsTracer>,
876811
EnumeratePathsExecutor<KShortestPathsCluster>,
877-
EnumeratePathsExecutor<KShortestPathsClusterTracer>,
878812
EnumeratePathsExecutor<WeightedKShortestPaths>,
879-
EnumeratePathsExecutor<WeightedKShortestPathsTracer>,
880813
EnumeratePathsExecutor<WeightedKShortestPathsCluster>,
881-
EnumeratePathsExecutor<WeightedKShortestPathsClusterTracer>,
882814
EnumeratePathsExecutor<YenPaths>,
883-
EnumeratePathsExecutor<YenPathsTracer>,
884815
EnumeratePathsExecutor<YenPathsCluster>,
885-
EnumeratePathsExecutor<YenPathsClusterTracer>,
886816
EnumeratePathsExecutor<WeightedYenPaths>,
887-
EnumeratePathsExecutor<WeightedYenPathsTracer>,
888817
EnumeratePathsExecutor<WeightedYenPathsCluster>,
889-
EnumeratePathsExecutor<WeightedYenPathsClusterTracer>,
890818
ParallelUnsortedGatherExecutor, JoinExecutor,
891819
IdExecutor<SingleRowFetcher<BlockPassthrough::Enable>>,
892820
IdExecutor<ConstFetcher>, HashedCollectExecutor,

0 commit comments

Comments
 (0)