You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by sh...@apache.org on 2016/07/01 19:19:35 UTC
incubator-quickstep git commit: Minor comment modification
Repository: incubator-quickstep
Updated Branches:
refs/heads/SQL-window-aggregation f9d618a83 -> e17b35477
Minor comment modification
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/e17b3547
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/e17b3547
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/e17b3547
Branch: refs/heads/SQL-window-aggregation
Commit: e17b35477277c41ef3e3dd431c47168e92c1eaba
Parents: f9d618a
Author: shixuan-fan <sh...@apache.org>
Authored: Fri Jul 1 19:19:23 2016 +0000
Committer: shixuan-fan <sh...@apache.org>
Committed: Fri Jul 1 19:19:23 2016 +0000
----------------------------------------------------------------------
query_execution/QueryContext.hpp | 10 ++++++----
relational_operators/WindowAggregationOperator.hpp | 7 ++++++-
2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/e17b3547/query_execution/QueryContext.hpp
----------------------------------------------------------------------
diff --git a/query_execution/QueryContext.hpp b/query_execution/QueryContext.hpp
index ffb5399..9171250 100644
--- a/query_execution/QueryContext.hpp
+++ b/query_execution/QueryContext.hpp
@@ -482,10 +482,11 @@ class QueryContext {
*
* @param id The WindowAggregationOperationState id in the query.
*
- * @return The WindowAggregationOperationState, alreadly created in the
+ * @return The WindowAggregationOperationState, already created in the
* constructor.
**/
- inline WindowAggregationOperationState* getWindowAggregationState(const window_aggregation_state_id id) {
+ inline WindowAggregationOperationState* getWindowAggregationState(
+ const window_aggregation_state_id id) {
DCHECK_LT(id, window_aggregation_states_.size());
DCHECK(window_aggregation_states_[id]);
return window_aggregation_states_[id].get();
@@ -496,10 +497,11 @@ class QueryContext {
*
* @param id The id of the WindowAggregationOperationState to destroy.
*
- * @return The WindowAggregationOperationState, alreadly created in the
+ * @return The WindowAggregationOperationState, already created in the
* constructor.
**/
- inline WindowAggregationOperationState* releaseWindowAggregationState(const window_aggregation_state_id id) {
+ inline WindowAggregationOperationState* releaseWindowAggregationState(
+ const window_aggregation_state_id id) {
DCHECK_LT(id, window_aggregation_states_.size());
DCHECK(window_aggregation_states_[id]);
return window_aggregation_states_[id].release();
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/e17b3547/relational_operators/WindowAggregationOperator.hpp
----------------------------------------------------------------------
diff --git a/relational_operators/WindowAggregationOperator.hpp b/relational_operators/WindowAggregationOperator.hpp
index f782980..443e6c7 100644
--- a/relational_operators/WindowAggregationOperator.hpp
+++ b/relational_operators/WindowAggregationOperator.hpp
@@ -58,6 +58,10 @@ class WindowAggregationOperator : public RelationalOperator {
*
* @param query_id The ID of this query.
* @param input_relation The relation to perform aggregation over.
+ * @param window_aggregation_state_index The index of WindowAggregationState
+ * in QueryContext.
+ * @param output_destination_index The index of InsertDestination in
+ * QueryContext for the output.
**/
WindowAggregationOperator(const std::size_t query_id,
const CatalogRelation &output_relation,
@@ -112,7 +116,8 @@ class WindowAggregationWorkOrder : public WorkOrder {
* @brief Constructor
*
* @param query_id The ID of this query.
- * @param input_block_id The block id.
+ * @param state The WindowAggregationOperatorState to use.
+ * @param output_destination The InsertDestination for output.
**/
WindowAggregationWorkOrder(const std::size_t query_id,
WindowAggregationOperationState *state,