Skip to content

Commit 16db788

Browse files
aalkinaalkin
committed
comment more unused code
1 parent 665114d commit 16db788

File tree

4 files changed

+93
-93
lines changed

4 files changed

+93
-93
lines changed

‎Framework/Core/include/Framework/ASoA.h‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,8 +1091,8 @@ struct DefaultIndexPolicy : IndexPolicyBase {
10911091
int64_t mMaxRow = 0;
10921092
};
10931093

1094-
template <OriginEnc ORIGIN, typename... C>
1095-
class Table;
1094+
// template <OriginEnc ORIGIN, typename... C>
1095+
// class Table;
10961096

10971097
template <aod::aod_hash L, aod::aod_hash D, aod::origin_hash O, typename... T>
10981098
class TableNG;
@@ -1545,8 +1545,8 @@ constexpr bool are_bindings_compatible_v(framework::pack<Os...>&&)
15451545
}
15461546
}
15471547

1548-
template <typename T>
1549-
concept soa_table = soa::is_base_of_template_origin_v<soa::Table, T>;
1548+
// template <typename T>
1549+
// concept soa_table = soa::is_base_of_template_origin_v<soa::Table, T>;
15501550

15511551
template <typename T>
15521552
concept ng_table = framework::is_base_of_template_v<soa::TableNG, T>;
@@ -1691,11 +1691,11 @@ static constexpr auto hasColumnForKey(framework::pack<C...>, std::string const&
16911691
return ((C::inherited_t::mLabel == key) || ...);
16921692
}
16931693

1694-
template <soa::soa_table T>
1695-
static constexpr std::pair<bool, std::string> hasKey(std::string const& key)
1696-
{
1697-
return {hasColumnForKey(typename T::persistent_columns_t{}, key), getLabelFromType<T>()};
1698-
}
1694+
// template <soa::soa_table T>
1695+
// static constexpr std::pair<bool, std::string> hasKey(std::string const& key)
1696+
// {
1697+
// return {hasColumnForKey(typename T::persistent_columns_t{}, key), getLabelFromType<T>()};
1698+
// }
16991699

17001700
template <TableRef ref>
17011701
static constexpr std::pair<bool, std::string> hasKey(std::string const& key)
@@ -2054,11 +2054,11 @@ auto doSliceByCachedUnsorted(T const* table, framework::expressions::BindingNode
20542054
}
20552055
}
20562056

2057-
template <soa::soa_table T>
2058-
auto select(T const& t, framework::expressions::Filter const& f)
2059-
{
2060-
return Filtered<T>({t.asArrowTable()}, selectionToVector(framework::expressions::createSelection(t.asArrowTable(), f)));
2061-
}
2057+
// template <soa::soa_table T>
2058+
// auto select(T const& t, framework::expressions::Filter const& f)
2059+
// {
2060+
// return Filtered<T>({t.asArrowTable()}, selectionToVector(framework::expressions::createSelection(t.asArrowTable(), f)));
2061+
// }
20622062

20632063
template <with_originals T>
20642064
auto select(T const& t, framework::expressions::Filter const& f)
@@ -2948,27 +2948,27 @@ using InPlaceTable = TableNG<o2::aod::Hash<"TEST"_h>, o2::aod::Hash<D>, o2::aod:
29482948
// RowViewSentinel mEnd;
29492949
// };
29502950

2951-
template <OriginEnc, typename T>
2952-
struct PackToTable {
2953-
static_assert(framework::always_static_assert_v<T>, "Not a pack");
2954-
};
2951+
// template <OriginEnc, typename T>
2952+
// struct PackToTable {
2953+
// static_assert(framework::always_static_assert_v<T>, "Not a pack");
2954+
// };
29552955

2956-
template <OriginEnc ORIGIN, typename... C>
2957-
struct PackToTable<ORIGIN, framework::pack<C...>> {
2958-
using table = o2::soa::Table<ORIGIN, C...>;
2959-
};
2956+
// template <OriginEnc ORIGIN, typename... C>
2957+
// struct PackToTable<ORIGIN, framework::pack<C...>> {
2958+
// using table = o2::soa::Table<ORIGIN, C...>;
2959+
// };
29602960

2961-
template <OriginEnc ORIGIN, typename... T>
2962-
struct TableWrap {
2963-
using all_columns = framework::concatenated_pack_unique_t<typename T::columns...>;
2964-
using table_t = typename PackToTable<ORIGIN, all_columns>::table;
2965-
};
2961+
// template <OriginEnc ORIGIN, typename... T>
2962+
// struct TableWrap {
2963+
// using all_columns = framework::concatenated_pack_unique_t<typename T::columns...>;
2964+
// using table_t = typename PackToTable<ORIGIN, all_columns>::table;
2965+
// };
29662966

2967-
template <OriginEnc ORIGIN, typename... T>
2968-
struct TableIntersect {
2969-
using all_columns = framework::full_intersected_pack_t<typename T::columns...>;
2970-
using table_t = typename PackToTable<ORIGIN, all_columns>::table;
2971-
};
2967+
// template <OriginEnc ORIGIN, typename... T>
2968+
// struct TableIntersect {
2969+
// using all_columns = framework::full_intersected_pack_t<typename T::columns...>;
2970+
// using table_t = typename PackToTable<ORIGIN, all_columns>::table;
2971+
// };
29722972

29732973
/// Template trait which allows to map a given
29742974
/// Table type to its O2 DataModel origin and description
@@ -3242,11 +3242,11 @@ consteval auto getIndexTargets()
32423242
return T::originals;
32433243
}
32443244

3245-
template <o2::soa::soa_table T>
3246-
consteval auto getIndexTargets()
3247-
{
3248-
return std::array<o2::soa::TableRef, 0>{};
3249-
}
3245+
// template <o2::soa::soa_table T>
3246+
// consteval auto getIndexTargets()
3247+
// {
3248+
// return std::array<o2::soa::TableRef, 0>{};
3249+
// }
32503250

32513251
#define DECLARE_SOA_SLICE_INDEX_COLUMN_FULL_CUSTOM(_Name_, _Getter_, _Type_, _Table_, _Label_, _Suffix_) \
32523252
struct _Name_##IdSlice : o2::soa::Column<_Type_[2], _Name_##IdSlice> { \

‎Framework/Core/include/Framework/ASoAHelpers.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,15 +1348,15 @@ auto combinations(const BP& binningPolicy, int categoryNeighbours, const T1& out
13481348
}
13491349
}
13501350

1351-
template <soa::soa_table... T2s>
1352-
auto combinations(const o2::framework::expressions::Filter& filter, const T2s&... tables)
1353-
{
1354-
if constexpr (isSameType<T2s...>()) {
1355-
return CombinationsGenerator<CombinationsStrictlyUpperIndexPolicy<Filtered<T2s>...>>(CombinationsStrictlyUpperIndexPolicy(tables.select(filter)...));
1356-
} else {
1357-
return CombinationsGenerator<CombinationsUpperIndexPolicy<Filtered<T2s>...>>(CombinationsUpperIndexPolicy(tables.select(filter)...));
1358-
}
1359-
}
1351+
// template <soa::soa_table... T2s>
1352+
// auto combinations(const o2::framework::expressions::Filter& filter, const T2s&... tables)
1353+
// {
1354+
// if constexpr (isSameType<T2s...>()) {
1355+
// return CombinationsGenerator<CombinationsStrictlyUpperIndexPolicy<Filtered<T2s>...>>(CombinationsStrictlyUpperIndexPolicy(tables.select(filter)...));
1356+
// } else {
1357+
// return CombinationsGenerator<CombinationsUpperIndexPolicy<Filtered<T2s>...>>(CombinationsUpperIndexPolicy(tables.select(filter)...));
1358+
// }
1359+
// }
13601360

13611361
template <soa::ng_table... T2s>
13621362
auto combinations(const o2::framework::expressions::Filter& filter, const T2s&... tables)
@@ -1376,11 +1376,11 @@ CombinationsGenerator<P2<T2s...>> combinations(const P2<T2s...>& policy)
13761376
return CombinationsGenerator<P2<T2s...>>(policy);
13771377
}
13781378

1379-
template <template <typename...> typename P2, soa::soa_table... T2s>
1380-
CombinationsGenerator<P2<Filtered<T2s>...>> combinations(P2<T2s...>&&, const o2::framework::expressions::Filter& filter, const T2s&... tables)
1381-
{
1382-
return CombinationsGenerator<P2<Filtered<T2s>...>>(P2<Filtered<T2s>...>(tables.select(filter)...));
1383-
}
1379+
// template <template <typename...> typename P2, soa::soa_table... T2s>
1380+
// CombinationsGenerator<P2<Filtered<T2s>...>> combinations(P2<T2s...>&&, const o2::framework::expressions::Filter& filter, const T2s&... tables)
1381+
// {
1382+
// return CombinationsGenerator<P2<Filtered<T2s>...>>(P2<Filtered<T2s>...>(tables.select(filter)...));
1383+
// }
13841384

13851385
template <template <typename...> typename P2, soa::ng_table... T2s>
13861386
CombinationsGenerator<P2<Filtered<T2s>...>> combinations(P2<T2s...>&&, const o2::framework::expressions::Filter& filter, const T2s&... tables)

‎Framework/Core/include/Framework/AnalysisTask.h‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ struct AnalysisDataProcessorBuilder {
9494
// return getInputSpecs(typename T::sources_t{});
9595
// }
9696

97-
template <soa::soa_table T>
98-
static inline auto getSources()
99-
requires soa::extension_table<std::decay_t<T>>
100-
{
101-
return getInputSpecs(typename aod::MetadataTrait<T>::metadata::sources{});
102-
}
97+
// template <soa::soa_table T>
98+
// static inline auto getSources()
99+
// requires soa::extension_table<std::decay_t<T>>
100+
// {
101+
// return getInputSpecs(typename aod::MetadataTrait<T>::metadata::sources{});
102+
// }
103103

104104
template <soa::with_sources T>
105105
static inline auto getSources()
@@ -226,16 +226,16 @@ struct AnalysisDataProcessorBuilder {
226226
...);
227227
}
228228

229-
template <soa::soa_table T>
230-
static auto extractTableFromRecord(InputRecord& record)
231-
requires soa::has_metadata<T>
232-
{
233-
auto table = record.get<TableConsumer>(aod::MetadataTrait<T>::metadata::tableLabel())->asArrowTable();
234-
if (table->num_rows() == 0) {
235-
table = makeEmptyTable<T>(aod::MetadataTrait<T>::metadata::tableLabel());
236-
}
237-
return table;
238-
}
229+
// template <soa::soa_table T>
230+
// static auto extractTableFromRecord(InputRecord& record)
231+
// requires soa::has_metadata<T>
232+
// {
233+
// auto table = record.get<TableConsumer>(aod::MetadataTrait<T>::metadata::tableLabel())->asArrowTable();
234+
// if (table->num_rows() == 0) {
235+
// table = makeEmptyTable<T>(aod::MetadataTrait<T>::metadata::tableLabel());
236+
// }
237+
// return table;
238+
// }
239239

240240
template <typename T>
241241
static auto extractTableFromRecord(InputRecord& record) requires soa::is_type_with_originals_v<T>
@@ -253,11 +253,11 @@ struct AnalysisDataProcessorBuilder {
253253
return table;
254254
}
255255

256-
template <soa::soa_table T, typename... Os>
257-
static auto extractFromRecord(InputRecord& record, pack<Os...> const&)
258-
{
259-
return T{{extractTableFromRecord<Os>(record)...}};
260-
}
256+
// template <soa::soa_table T, typename... Os>
257+
// static auto extractFromRecord(InputRecord& record, pack<Os...> const&)
258+
// {
259+
// return T{{extractTableFromRecord<Os>(record)...}};
260+
// }
261261

262262
// template <soa::soa_iterator T, typename... Os>
263263
// static auto extractFromRecord(InputRecord& record, pack<Os...> const&)
@@ -343,15 +343,15 @@ struct AnalysisDataProcessorBuilder {
343343
}
344344
}
345345

346-
template <soa::soa_table T, int AI>
347-
static auto extract(InputRecord& record, std::vector<ExpressionInfo>& infos, size_t phash)
348-
{
349-
if constexpr (soa::ng_filtered_table<T>) {
350-
return extractFilteredFromRecord<T>(record, *std::find_if(infos.begin(), infos.end(), [&phash](ExpressionInfo const& i) { return (i.processHash == phash && i.argumentIndex == AI); }), soa::make_originals_from_type<T>());
351-
} else {
352-
return extractFromRecord<T>(record, soa::make_originals_from_type<T>());
353-
}
354-
}
346+
// template <soa::soa_table T, int AI>
347+
// static auto extract(InputRecord& record, std::vector<ExpressionInfo>& infos, size_t phash)
348+
// {
349+
// if constexpr (soa::ng_filtered_table<T>) {
350+
// return extractFilteredFromRecord<T>(record, *std::find_if(infos.begin(), infos.end(), [&phash](ExpressionInfo const& i) { return (i.processHash == phash && i.argumentIndex == AI); }), soa::make_originals_from_type<T>());
351+
// } else {
352+
// return extractFromRecord<T>(record, soa::make_originals_from_type<T>());
353+
// }
354+
// }
355355

356356
template <soa::ng_table T, int AI>
357357
static auto extract(InputRecord& record, std::vector<ExpressionInfo>& infos, size_t phash)

‎Framework/Core/include/Framework/TableBuilder.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -923,18 +923,18 @@ auto spawner(std::shared_ptr<arrow::Table> const& fullTable, const char* name)
923923
return spawnerHelper(fullTable, new_schema, framework::pack_size(expression_pack_t{}), projectors.data(), fields, name);
924924
}
925925

926-
template <soa::OriginEnc ORIGIN, typename... C>
927-
auto spawner(framework::pack<C...> columns, std::vector<std::shared_ptr<arrow::Table>>&& tables, const char* name)
928-
{
929-
auto fullTable = soa::ArrowHelpers::joinTables(std::move(tables));
930-
if (fullTable->num_rows() == 0) {
931-
return makeEmptyTable<soa::Table<ORIGIN, C...>>(name);
932-
}
933-
static auto fields = o2::soa::createFieldsFromColumns(columns);
934-
static auto new_schema = std::make_shared<arrow::Schema>(fields);
935-
std::array<expressions::Projector, sizeof...(C)> projectors{{std::move(C::Projector())...}};
936-
return spawnerHelper(fullTable, new_schema, sizeof...(C), projectors.data(), fields, name);
937-
}
926+
// template <soa::OriginEnc ORIGIN, typename... C>
927+
// auto spawner(framework::pack<C...> columns, std::vector<std::shared_ptr<arrow::Table>>&& tables, const char* name)
928+
// {
929+
// auto fullTable = soa::ArrowHelpers::joinTables(std::move(tables));
930+
// if (fullTable->num_rows() == 0) {
931+
// return makeEmptyTable<soa::Table<ORIGIN, C...>>(name);
932+
// }
933+
// static auto fields = o2::soa::createFieldsFromColumns(columns);
934+
// static auto new_schema = std::make_shared<arrow::Schema>(fields);
935+
// std::array<expressions::Projector, sizeof...(C)> projectors{{std::move(C::Projector())...}};
936+
// return spawnerHelper(fullTable, new_schema, sizeof...(C), projectors.data(), fields, name);
937+
// }
938938

939939
template <typename... C>
940940
auto spawner(framework::pack<C...> columns, std::vector<std::shared_ptr<arrow::Table>>&& tables, const char* name)

0 commit comments

Comments
 (0)