Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aggregates: combine sum/mean aggregators. #4440

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Aggregates: combine sum/mean aggregators. #4440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dbae23
Aggregates: combine sum/mean aggregators.
KiterLuc Oct 20, 2023
ee1a278
Fix all link compile.
KiterLuc Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion test/src/test-cppapi-aggregates.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include "tiledb/sm/cpp_api/tiledb"
#include "tiledb/sm/cpp_api/tiledb_experimental"
#include "tiledb/sm/query/readers/aggregators/count_aggregator.h"
#include "tiledb/sm/query/readers/aggregators/mean_aggregator.h"
#include "tiledb/sm/query/readers/aggregators/min_max_aggregator.h"
#include "tiledb/sm/query/readers/aggregators/sum_aggregator.h"

Expand Down
1 change: 0 additions & 1 deletion tiledb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ set(TILEDB_CORE_SOURCES
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/query/query_condition.cc
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/query/query_remote_buffer_storage.cc
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/query/readers/aggregators/count_aggregator.cc
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/query/readers/aggregators/mean_aggregator.cc
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/query/readers/aggregators/min_max_aggregator.cc
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/query/readers/aggregators/operation.cc
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/query/readers/aggregators/output_buffer_validator.cc
Expand Down
8 changes: 0 additions & 8 deletions tiledb/sm/query/query.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,14 +743,6 @@ class Query {
default_channel_aggregates_.emplace(output_field_name, aggregator);
}

/**
* Get all aggregates from the default channel.
*/
std::unordered_map<std::string, shared_ptr<IAggregator>>
get_default_channel_aggregates() {
return default_channel_aggregates_;
}

/** Returns an aggregate based on the output field. */
std::optional<shared_ptr<IAggregator>> get_aggregate(
std::string output_field_name) const;
Expand Down
2 changes: 1 addition & 1 deletion tiledb/sm/query/readers/aggregators/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ include(object_library)
# `aggregators` object library
#
commence(object_library aggregators)
this_target_sources(count_aggregator.cc mean_aggregator.cc min_max_aggregator.cc operation.cc output_buffer_validator.cc safe_sum.cc sum_aggregator.cc)
this_target_sources(count_aggregator.cc min_max_aggregator.cc operation.cc output_buffer_validator.cc safe_sum.cc sum_aggregator.cc)
this_target_object_libraries(baseline array_schema)
conclude(object_library)

Expand Down
2 changes: 0 additions & 2 deletions tiledb/sm/query/readers/aggregators/aggregate_with_count.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
* @section DESCRIPTION
*
* This file defines class AggregateWithCount.
*
* TODO: Add more benchmark coverage for this class (sc-33758).
*/

#ifndef TILEDB_AGGREGATE_WITH_COUNT_H
Expand Down
153 changes: 0 additions & 153 deletions tiledb/sm/query/readers/aggregators/mean_aggregator.cc
View file
Open in desktop

This file was deleted.

157 changes: 0 additions & 157 deletions tiledb/sm/query/readers/aggregators/mean_aggregator.h
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions tiledb/sm/query/readers/aggregators/safe_sum.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
* @section DESCRIPTION
*
* This file implements class SafeSum.
*
* TODO: Testing for this class is not done (sc-33762).
*/

#include "tiledb/sm/query/readers/aggregators/safe_sum.h"
Expand Down
Loading
Loading