Skip to content

Commit 863b506

Browse files
knonomuraknonomura
committed
modify indent
1 parent 8b64447 commit 863b506

15 files changed

Lines changed: 221 additions & 290 deletions

‎src/ExpirationInfo.h‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -28,45 +28,40 @@ class ExpirationInfo {
2828
* Contains information about expiration configuration
2929
*/
3030
GSTimeSeriesProperties mTimeSeriesProps;
31-
public:
32-
ExpirationInfo(const GSTimeSeriesProperties* timeSeriesProps) {
33-
mTimeSeriesProps.rowExpirationTime = timeSeriesProps->rowExpirationTime;
34-
mTimeSeriesProps.rowExpirationTimeUnit = timeSeriesProps->rowExpirationTimeUnit;
35-
mTimeSeriesProps.expirationDivisionCount = timeSeriesProps->expirationDivisionCount;
36-
mTimeSeriesProps.compressionList = NULL;
37-
mTimeSeriesProps.compressionListSize = 0;
38-
mTimeSeriesProps.compressionMethod = GS_COMPRESSION_NO ;
39-
mTimeSeriesProps.compressionWindowSize = 0;
40-
mTimeSeriesProps.compressionWindowSizeUnit = GS_TIME_UNIT_YEAR;
41-
};
42-
ExpirationInfo(int time, GSTimeUnit unit, int division_count) {
43-
mTimeSeriesProps.rowExpirationTime = time;
44-
mTimeSeriesProps.rowExpirationTimeUnit = unit;
45-
mTimeSeriesProps.expirationDivisionCount = division_count;
46-
mTimeSeriesProps.compressionList = NULL;
47-
mTimeSeriesProps.compressionListSize = 0;
48-
mTimeSeriesProps.compressionMethod = GS_COMPRESSION_NO ;
49-
mTimeSeriesProps.compressionWindowSize = 0;
50-
mTimeSeriesProps.compressionWindowSizeUnit = GS_TIME_UNIT_YEAR;
51-
};
5231

53-
~ExpirationInfo() {};
54-
55-
int get_time() {return mTimeSeriesProps.rowExpirationTime;};
56-
57-
void set_time(int time) {mTimeSeriesProps.rowExpirationTime = time;};
58-
59-
GSTimeUnit get_time_unit() {return mTimeSeriesProps.rowExpirationTimeUnit;};
60-
61-
void set_time_unit(GSTimeUnit unit) {mTimeSeriesProps.rowExpirationTimeUnit = unit;};
62-
63-
int get_division_count() {return mTimeSeriesProps.expirationDivisionCount;};
32+
public:
33+
ExpirationInfo(const GSTimeSeriesProperties* timeSeriesProps) {
34+
mTimeSeriesProps.rowExpirationTime = timeSeriesProps->rowExpirationTime;
35+
mTimeSeriesProps.rowExpirationTimeUnit = timeSeriesProps->rowExpirationTimeUnit;
36+
mTimeSeriesProps.expirationDivisionCount = timeSeriesProps->expirationDivisionCount;
37+
mTimeSeriesProps.compressionList = NULL;
38+
mTimeSeriesProps.compressionListSize = 0;
39+
mTimeSeriesProps.compressionMethod = GS_COMPRESSION_NO ;
40+
mTimeSeriesProps.compressionWindowSize = 0;
41+
mTimeSeriesProps.compressionWindowSizeUnit = GS_TIME_UNIT_YEAR;
42+
};
43+
ExpirationInfo(int time, GSTimeUnit unit, int division_count) {
44+
mTimeSeriesProps.rowExpirationTime = time;
45+
mTimeSeriesProps.rowExpirationTimeUnit = unit;
46+
mTimeSeriesProps.expirationDivisionCount = division_count;
47+
mTimeSeriesProps.compressionList = NULL;
48+
mTimeSeriesProps.compressionListSize = 0;
49+
mTimeSeriesProps.compressionMethod = GS_COMPRESSION_NO ;
50+
mTimeSeriesProps.compressionWindowSize = 0;
51+
mTimeSeriesProps.compressionWindowSizeUnit = GS_TIME_UNIT_YEAR;
52+
};
53+
~ExpirationInfo() {};
54+
int get_time() {return mTimeSeriesProps.rowExpirationTime;};
55+
void set_time(int time) {mTimeSeriesProps.rowExpirationTime = time;};
56+
GSTimeUnit get_time_unit() {return mTimeSeriesProps.rowExpirationTimeUnit;};
57+
void set_time_unit(GSTimeUnit unit) {mTimeSeriesProps.rowExpirationTimeUnit = unit;};
58+
int get_division_count() {return mTimeSeriesProps.expirationDivisionCount;};
59+
void set_division_count(int division_count) {mTimeSeriesProps.expirationDivisionCount = division_count;};
60+
GSTimeSeriesProperties* gs_ts() {
61+
return &mTimeSeriesProps;
62+
};
63+
};
6464

65-
void set_division_count(int division_count) {mTimeSeriesProps.expirationDivisionCount = division_count;};
65+
} /* namespace griddb */
6666

67-
GSTimeSeriesProperties* gs_ts() {
68-
return &mTimeSeriesProps;
69-
};
70-
};
71-
}
7267
#endif

‎src/GSException.h‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ using namespace std;
2525

2626
namespace griddb {
2727

28-
/**
29-
* This class creates exception corresponding to error code
30-
*/
31-
class GSException : public exception {
32-
bool mIsTimeout;
33-
int32_t mCode;
34-
string mMessage;
35-
void *mResource;
28+
/**
29+
* This class creates exception corresponding to error code
30+
*/
31+
class GSException : public exception {
32+
bool mIsTimeout;
33+
int32_t mCode;
34+
string mMessage;
35+
void *mResource;
36+
3637
public:
3738
GSException(int32_t code) : exception(), mCode(code), mResource(NULL) {
3839
mMessage = "Error with number " + to_string((long long int)mCode);
@@ -44,7 +45,6 @@ namespace griddb {
4445
mIsTimeout = false;
4546
}
4647
}
47-
4848
GSException(const char* message) : exception(),
4949
mCode(-1), mMessage(message), mResource(NULL) {
5050
if (mCode != -1) {
@@ -55,7 +55,6 @@ namespace griddb {
5555
mIsTimeout = false;
5656
}
5757
}
58-
5958
GSException(void *resource, const char* message) : exception(),
6059
mCode(-1), mMessage(message), mResource(resource) {
6160
if (mCode != -1) {
@@ -66,7 +65,6 @@ namespace griddb {
6665
mIsTimeout = false;
6766
}
6867
}
69-
7068
GSException(void *resource, int32_t code) : exception(),
7169
mCode(code), mResource(resource) {
7270
mMessage = "Error with number " + to_string((long long int)mCode);
@@ -78,7 +76,6 @@ namespace griddb {
7876
mIsTimeout = false;
7977
}
8078
}
81-
8279
GSException(int32_t code, const char* message) : exception(),
8380
mCode(code), mMessage(message), mResource(NULL) {
8481
if (mCode != -1) {
@@ -89,7 +86,6 @@ namespace griddb {
8986
mIsTimeout = false;
9087
}
9188
}
92-
9389
GSException(void *resource, int32_t code, const char* message) : exception(),
9490
mCode(code), mMessage(message), mResource(resource) {
9591
if (mCode != -1) {
@@ -100,24 +96,19 @@ namespace griddb {
10096
mIsTimeout = false;
10197
}
10298
}
103-
10499
GSException(const GSException* exception) {
105100
mCode = exception->mCode;
106101
mIsTimeout = exception->mIsTimeout;
107102
mMessage = exception->mMessage;
108103
mResource = exception->mResource;
109104
}
110-
111105
~GSException() throw() {}
112-
113106
int32_t get_code() {
114107
return mCode;
115108
}
116-
117109
virtual const char* what() const throw() {
118110
return mMessage.c_str();
119111
}
120-
121112
/*
122113
* Check timeout. Convert from C-API: gsIsTimeoutError
123114
*/
@@ -130,14 +121,12 @@ namespace griddb {
130121
size_t get_error_stack_size() {
131122
return gsGetErrorStackSize(mResource);
132123
}
133-
134124
/**
135125
* Get error stack code. Convert from C-API: gsGetErrorCode.
136126
*/
137127
GSResult get_error_code(size_t stack_index) {
138128
return gsGetErrorCode(mResource, stack_index);
139129
}
140-
141130
/**
142131
* Get error message. Convert from C-API: gsFormatErrorMessage.
143132
*/
@@ -148,7 +137,6 @@ namespace griddb {
148137
delete [] strBuf;
149138
return ret;
150139
}
151-
152140
/**
153141
* Get error location. Convert from C-API: gsFormatErrorLocation.
154142
*/
@@ -159,8 +147,8 @@ namespace griddb {
159147
delete [] strBuf;
160148
return ret;
161149
}
162-
};
150+
};
163151

164-
}
152+
} /* namespace griddb */
165153

166154
#endif

‎src/PartitionController.cpp‎

Lines changed: 14 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,20 @@
1919
namespace griddb {
2020

2121
PartitionController::PartitionController(GSPartitionController *controller) :
22-
mController(controller) {
22+
mController(controller) {
2323
}
24-
2524
/**
2625
* Destructor. Convert from C-API:gsClosePartitionController
2726
*/
2827
PartitionController::~PartitionController() {
2928
close();
3029
}
31-
3230
void PartitionController::close() {
3331
if (mController != NULL) {
3432
gsClosePartitionController(&mController);
3533
mController = NULL;
3634
}
3735
}
38-
3936
/**
4037
* Get partition count. Convert from C-Api: gsGetPartitionCount
4138
*/
@@ -49,78 +46,64 @@ namespace griddb {
4946
}
5047
return value;
5148
}
52-
5349
/**
5450
* Get container partition count. Convert from C-Api: gsGetPartitionContainerCount
5551
*/
56-
int64_t PartitionController::get_container_count(
57-
int32_t partition_index) {
52+
int64_t PartitionController::get_container_count(int32_t partition_index) {
5853
int64_t value;
59-
GSResult ret = gsGetPartitionContainerCount(mController, partition_index,
60-
&value);
54+
GSResult ret = gsGetPartitionContainerCount(mController, partition_index,&value);
6155

6256
// Check ret, if error, throw exception
6357
if (ret != GS_RESULT_OK) {
6458
throw GSException(mController, ret);
6559
}
6660
return value;
6761
}
68-
6962
/**
7063
* Get list partition container names case there is limit. Convert from C-Api: gsGetPartitionContainerNames
7164
*/
72-
void PartitionController::get_container_names(int32_t partitionIndex,
73-
int64_t start, const GSChar * const ** stringList, size_t *size,
74-
int64_t limit) {
65+
void PartitionController::get_container_names(int32_t partitionIndex, int64_t start,
66+
const GSChar * const ** stringList, size_t *size, int64_t limit) {
7567
int64_t* limitPtr;
7668
if (limit >= 0) {
7769
limitPtr = &limit;
7870
} else {
7971
limitPtr = NULL;
8072
}
81-
GSResult ret = gsGetPartitionContainerNames(mController, partitionIndex,
82-
start, limitPtr, stringList, size);
73+
GSResult ret = gsGetPartitionContainerNames(mController, partitionIndex, start, limitPtr, stringList, size);
8374

8475
if (ret != GS_RESULT_OK) {
8576
throw GSException(mController, ret);
8677
}
8778
}
88-
8979
/**
9080
* Get get_partition hosts. Convert from C-Api: gsGetPartitionHosts
9181
*/
92-
void PartitionController::get_partition_hosts(int32_t partitionIndex,
93-
const GSChar * const **stringList, size_t *size) {
94-
GSResult ret = gsGetPartitionHosts(mController, partitionIndex, stringList,
95-
size);
82+
void PartitionController::get_partition_hosts(int32_t partitionIndex, const GSChar * const **stringList, size_t *size) {
83+
GSResult ret = gsGetPartitionHosts(mController, partitionIndex, stringList, size);
9684

9785
// Check ret, if error, throw exception
9886
if (ret != GS_RESULT_OK) {
9987
throw GSException(mController, ret);
10088
}
10189
}
102-
10390
/**
10491
* Get get_partition index of container. Convert from C-Api: gsGetPartitionIndexOfContainer
10592
*/
106-
int32_t PartitionController::get_partition_index_of_container(
107-
const GSChar* container_name) {
93+
int32_t PartitionController::get_partition_index_of_container(const GSChar* container_name) {
10894
int32_t value;
109-
GSResult ret = gsGetPartitionIndexOfContainer(mController, container_name,
110-
&value);
95+
GSResult ret = gsGetPartitionIndexOfContainer(mController, container_name, &value);
11196

11297
// Check ret, if error, throw exception
11398
if (ret != GS_RESULT_OK) {
11499
throw GSException(mController, ret);
115100
}
116101
return value;
117102
}
118-
119103
/**
120104
* Get get_partition owner host. Convert from C-Api: gsGetPartitionOwnerHost
121105
*/
122-
string PartitionController::get_partition_owner_host(
123-
int32_t partitionIndex) {
106+
string PartitionController::get_partition_owner_host(int32_t partitionIndex) {
124107
const GSChar *address;
125108
GSResult ret = gsGetPartitionOwnerHost(mController, partitionIndex, &address);
126109

@@ -134,10 +117,8 @@ namespace griddb {
134117
/**
135118
* Get get_partition backup hosts. Convert from C-Api: gsGetPartitionBackupHosts
136119
*/
137-
void PartitionController::get_partition_backup_hosts(
138-
int32_t partitionIndex, const GSChar *const **stringList, size_t *size) {
139-
GSResult ret = gsGetPartitionBackupHosts(mController, partitionIndex,
140-
stringList, size);
120+
void PartitionController::get_partition_backup_hosts(int32_t partitionIndex, const GSChar *const **stringList, size_t *size) {
121+
GSResult ret = gsGetPartitionBackupHosts(mController, partitionIndex, stringList, size);
141122

142123
// Check ret, if error, throw exception
143124
if (ret != GS_RESULT_OK) {
@@ -148,8 +129,7 @@ namespace griddb {
148129
/**
149130
* Assign host. Convert from C-Api: gsAssignPartitionPreferableHost
150131
*/
151-
void PartitionController::assign_partition_preferable_host(
152-
int32_t partitionIndex, const GSChar* host) {
132+
void PartitionController::assign_partition_preferable_host(int32_t partitionIndex, const GSChar* host) {
153133
GSResult ret = gsAssignPartitionPreferableHost(mController, partitionIndex, host);
154134
if (ret != GS_RESULT_OK) {
155135
throw new GSException(ret);

‎src/PartitionController.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,27 @@
2323

2424
namespace griddb {
2525

26-
class PartitionController {
27-
GSPartitionController *mController;
28-
friend class Store;
26+
class PartitionController {
27+
GSPartitionController *mController;
28+
29+
friend class Store;
30+
2931
public:
3032
~PartitionController();
3133
void close();
32-
3334
int32_t get_partition_count();
3435
int64_t get_container_count(int32_t partition_index);
3536
void get_container_names(int32_t partition_index, int64_t start,
3637
const GSChar * const ** stringList, size_t *size, int64_t limit=-1);
3738
int32_t get_partition_index_of_container(const GSChar *container_name);
38-
3939
void get_partition_hosts(int32_t partitionIndex,
4040
const GSChar * const **stringList, size_t *size);
4141
string get_partition_owner_host(int32_t partitionIndex);
4242
void get_partition_backup_hosts(int32_t partitionIndex,
4343
const GSChar * const ** stringList, size_t *size);
4444
void assign_partition_preferable_host(int32_t partitionIndex,
4545
const GSChar *host);
46+
4647
private:
4748
PartitionController(GSPartitionController *controller);
4849
};

0 commit comments

Comments
 (0)