Skip to content

Refactoring and bug fixes #11

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

Merged
knonomura merged 6 commits into from
Apr 25, 2019
Merged

Refactoring and bug fixes #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fea5141
Add utility function
mochizk Mar 29, 2019
4ffa905
Move Field class implementation from header file to cpp file
mochizk Mar 29, 2019
af26e3b
Store error info of C client in exception constructor
mochizk Mar 29, 2019
7a0cb00
Refactor and fix bugs of cpp files
mochizk Mar 29, 2019
08fe971
Add comment and fix bugs of griddb_node.js
mochizk Mar 29, 2019
a78c7ab
Refactor and fix bugs of cpp files
mochizk Mar 29, 2019
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
984 changes: 921 additions & 63 deletions griddb_node.js
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions src/AggregationResult.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@

namespace griddb {

/**
* @brief Constructor a new Aggregation Result:: Aggregation Result object
* @param aggResult Stores the result of an aggregation operation
*/
AggregationResult::AggregationResult(GSAggregationResult* aggResult) :
mAggResult(aggResult), timestamp_output_with_float(false) {
}
Expand All @@ -27,7 +31,7 @@ namespace griddb {
}

/**
* Release AggregationResult resource
* @brief Release AggregationResult resource
*/
void AggregationResult::close() {
if (mAggResult != NULL) {
Expand All @@ -37,9 +41,12 @@ namespace griddb {
}

/**
* Obtains the result of aggregating numeric-type values.
* @brief Obtains the result of aggregating numeric-type values.
* @param type Column type
* @param *agValue aggregation result
*/
void AggregationResult::get(GSType type, griddb::Field *agValue) {
assert(agValue != NULL);
void *value;
agValue->type = type;
switch (type) {
Expand All @@ -62,4 +69,5 @@ namespace griddb {
"Value cannot be retrieved from Aggregation result");
}
}

} /* namespace griddb */
3 changes: 2 additions & 1 deletion src/AggregationResult.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#ifndef _AGGREGATIONRESULT_H_
#define _AGGREGATIONRESULT_H_

#include <assert.h>

#include "GSException.h"
#include "Field.h"
#include "gridstore.h"
Expand All @@ -35,7 +37,6 @@ class AggregationResult {
bool timestamp_output_with_float;
~AggregationResult();
void close();

void get(GSType type, griddb::Field *agValue);
AggregationResult(GSAggregationResult* aggResult);

Expand Down
Loading