Skip to content

Commit 31438de

Browse files
committed
refactor(client-cpp): rename IoTDBDate and move tests
Rename public Date type from IoTdbDate to IoTDBDate across headers, RPC/session code, and ITs. Move tests from src/test to a top-level test directory and update CMake, Maven, and README paths accordingly.
1 parent 2877b2d commit 31438de

23 files changed

Lines changed: 52 additions & 52 deletions

iotdb-client/client-cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ endforeach()
168168

169169
if(BUILD_TESTING)
170170
enable_testing()
171-
add_subdirectory(src/test)
171+
add_subdirectory(test)
172172
endif()
173173

174174
message(STATUS "iotdb_session configuration summary:")

iotdb-client/client-cpp/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ iotdb-client/client-cpp/
3636
├── src/include/ # public API headers (installed to include/)
3737
├── src/session/ # Session / Table / C API implementation (.cpp)
3838
├── src/rpc/ # Thrift RPC layer (private, not installed)
39-
├── src/test/ # Catch2-based integration tests
39+
├── test/ # Catch2-based integration tests
4040
└── pom.xml # Maven wrapper (cmake-maven-plugin)
4141
```
4242

@@ -282,7 +282,7 @@ mvn -P with-cpp -pl iotdb-client/client-cpp -am verify
282282
Running ctest directly (after a `mvn ... package` build) is also supported:
283283

284284
```bash
285-
cd iotdb-client/client-cpp/target/build/src/test
285+
cd iotdb-client/client-cpp/target/build/test
286286
ctest --output-on-failure
287287
```
288288

iotdb-client/client-cpp/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<phase>integration-test</phase>
118118
<configuration>
119119
<config>${cmake.build.type}</config>
120-
<projectDirectory>${cmake.project.dir}/src/test</projectDirectory>
120+
<projectDirectory>${cmake.project.dir}/test</projectDirectory>
121121
<skipTests>${maven.test.skip}</skipTests>
122122
</configuration>
123123
</execution>
@@ -322,7 +322,7 @@
322322
<include>src/**/*.cpp</include>
323323
</includes>
324324
<excludes>
325-
<exclude>src/test/catch2/**</exclude>
325+
<exclude>test/catch2/**</exclude>
326326
</excludes>
327327
<clangFormat>
328328
<version>${clang.format.version}</version>

iotdb-client/client-cpp/src/include/Common.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class Field {
155155
TSDataType::TSDataType dataType = TSDataType::UNKNOWN;
156156
Optional<bool> boolV;
157157
Optional<int> intV;
158-
Optional<IoTdbDate> dateV;
158+
Optional<IoTDBDate> dateV;
159159
Optional<int64_t> longV;
160160
Optional<float> floatV;
161161
Optional<double> doubleV;
@@ -203,7 +203,7 @@ class MyStringBuffer {
203203
void clear();
204204
bool hasRemaining();
205205
int getInt();
206-
IoTdbDate getDate();
206+
IoTDBDate getDate();
207207
int64_t getInt64();
208208
float getFloat();
209209
double getDouble();
@@ -212,7 +212,7 @@ class MyStringBuffer {
212212
std::string getString();
213213

214214
void putInt(int ins);
215-
void putDate(IoTdbDate date);
215+
void putDate(IoTDBDate date);
216216
void putInt64(int64_t ins);
217217
void putFloat(float ins);
218218
void putDouble(double ins);

iotdb-client/client-cpp/src/include/Date.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424

2525
constexpr int32_t EMPTY_DATE_INT = 10000101;
2626

27-
class IoTdbDate {
27+
class IoTDBDate {
2828
public:
29-
IoTdbDate() : valid_(false), year_(0), month_(0), day_(0) {}
29+
IoTDBDate() : valid_(false), year_(0), month_(0), day_(0) {}
3030

31-
IoTdbDate(int year, int month, int day) : valid_(true), year_(year), month_(month), day_(day) {}
31+
IoTDBDate(int year, int month, int day) : valid_(true), year_(year), month_(month), day_(day) {}
3232

33-
static IoTdbDate notADate() {
34-
return IoTdbDate();
33+
static IoTDBDate notADate() {
34+
return IoTDBDate();
3535
}
3636

3737
bool is_not_a_date() const {
@@ -52,12 +52,12 @@ class IoTdbDate {
5252

5353
std::string toIsoExtendedString() const;
5454

55-
friend bool operator==(const IoTdbDate& lhs, const IoTdbDate& rhs) {
55+
friend bool operator==(const IoTDBDate& lhs, const IoTDBDate& rhs) {
5656
return lhs.valid_ == rhs.valid_ && lhs.year_ == rhs.year_ && lhs.month_ == rhs.month_ &&
5757
lhs.day_ == rhs.day_;
5858
}
5959

60-
friend bool operator!=(const IoTdbDate& lhs, const IoTdbDate& rhs) {
60+
friend bool operator!=(const IoTDBDate& lhs, const IoTDBDate& rhs) {
6161
return !(lhs == rhs);
6262
}
6363

@@ -68,7 +68,7 @@ class IoTdbDate {
6868
int day_;
6969
};
7070

71-
int32_t parseDateExpressionToInt(const IoTdbDate& date);
72-
IoTdbDate parseIntToDate(int32_t dateInt);
71+
int32_t parseDateExpressionToInt(const IoTDBDate& date);
72+
IoTDBDate parseIntToDate(int32_t dateInt);
7373

7474
#endif

iotdb-client/client-cpp/src/include/Session.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class Tablet {
265265
break;
266266
}
267267
case TSDataType::DATE: {
268-
safe_cast<T, IoTdbDate>(value, ((IoTdbDate*)values[schemaId])[rowIndex]);
268+
safe_cast<T, IoTDBDate>(value, ((IoTDBDate*)values[schemaId])[rowIndex]);
269269
break;
270270
}
271271
case TSDataType::TIMESTAMP:
@@ -373,7 +373,7 @@ class Tablet {
373373
case TSDataType::INT32:
374374
return &(reinterpret_cast<int32_t*>(values[schemaId])[rowIndex]);
375375
case TSDataType::DATE:
376-
return &(reinterpret_cast<IoTdbDate*>(values[schemaId])[rowIndex]);
376+
return &(reinterpret_cast<IoTDBDate*>(values[schemaId])[rowIndex]);
377377
case TSDataType::TIMESTAMP:
378378
case TSDataType::INT64:
379379
return &(reinterpret_cast<int64_t*>(values[schemaId])[rowIndex]);

iotdb-client/client-cpp/src/include/SessionDataSet.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ class SessionDataSet {
109109
Optional<int64_t> getTimestampByIndex(int32_t columnIndex);
110110
Optional<int64_t> getTimestamp(const std::string& columnName);
111111

112-
Optional<IoTdbDate> getDateByIndex(int32_t columnIndex);
113-
Optional<IoTdbDate> getDate(const std::string& columnName);
112+
Optional<IoTDBDate> getDateByIndex(int32_t columnIndex);
113+
Optional<IoTDBDate> getDate(const std::string& columnName);
114114

115115
int32_t findColumn(const std::string& columnName);
116116
const std::vector<std::string>& getColumnNames() const;

iotdb-client/client-cpp/src/rpc/IoTDBRpcDataSet.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,20 +473,20 @@ Optional<int64_t> IoTDBRpcDataSet::getTimestampByTsBlockColumnIndex(int32_t tsBl
473473
return getLongByTsBlockColumnIndex(tsBlockColumnIndex);
474474
}
475475

476-
Optional<IoTdbDate> IoTDBRpcDataSet::getDateByIndex(int32_t columnIndex) {
476+
Optional<IoTDBDate> IoTDBRpcDataSet::getDateByIndex(int32_t columnIndex) {
477477
int32_t index = getTsBlockColumnIndexForColumnIndex(columnIndex);
478478
return getDateByTsBlockColumnIndex(index);
479479
}
480480

481-
Optional<IoTdbDate> IoTDBRpcDataSet::getDate(const std::string& columnName) {
481+
Optional<IoTDBDate> IoTDBRpcDataSet::getDate(const std::string& columnName) {
482482
int32_t index = getTsBlockColumnIndexForColumnName(columnName);
483483
return getDateByTsBlockColumnIndex(index);
484484
}
485485

486-
Optional<IoTdbDate> IoTDBRpcDataSet::getDateByTsBlockColumnIndex(int32_t tsBlockColumnIndex) {
486+
Optional<IoTDBDate> IoTDBRpcDataSet::getDateByTsBlockColumnIndex(int32_t tsBlockColumnIndex) {
487487
auto value = getIntByTsBlockColumnIndex(tsBlockColumnIndex);
488488
if (!value.is_initialized()) {
489-
return Optional<IoTdbDate>::none();
489+
return Optional<IoTDBDate>::none();
490490
}
491491
return parseIntToDate(value.value());
492492
}

iotdb-client/client-cpp/src/rpc/IoTDBRpcDataSet.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ class IoTDBRpcDataSet {
7777
Optional<std::string> getString(const std::string& columnName);
7878
Optional<int64_t> getTimestampByIndex(int32_t columnIndex);
7979
Optional<int64_t> getTimestamp(const std::string& columnName);
80-
Optional<IoTdbDate> getDateByIndex(int32_t columnIndex);
81-
Optional<IoTdbDate> getDate(const std::string& columnName);
80+
Optional<IoTDBDate> getDateByIndex(int32_t columnIndex);
81+
Optional<IoTDBDate> getDate(const std::string& columnName);
8282

8383
TSDataType::TSDataType getDataTypeByIndex(int32_t columnIndex);
8484
TSDataType::TSDataType getDataType(const std::string& columnName);
@@ -114,7 +114,7 @@ class IoTDBRpcDataSet {
114114
Optional<int64_t> getLongByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
115115
std::shared_ptr<Binary> getBinaryByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
116116
Optional<std::string> getStringByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
117-
Optional<IoTdbDate> getDateByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
117+
Optional<IoTDBDate> getDateByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
118118
Optional<int64_t> getTimestampByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
119119

120120
std::string sql_;

iotdb-client/client-cpp/src/session/Common.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ int MyStringBuffer::getInt() {
129129
return *(int*)getOrderedByte(4);
130130
}
131131

132-
IoTdbDate MyStringBuffer::getDate() {
132+
IoTDBDate MyStringBuffer::getDate() {
133133
return parseIntToDate(getInt());
134134
}
135135

@@ -199,7 +199,7 @@ void MyStringBuffer::putInt(int ins) {
199199
putOrderedByte((char*)&ins, 4);
200200
}
201201

202-
void MyStringBuffer::putDate(IoTdbDate date) {
202+
void MyStringBuffer::putDate(IoTDBDate date) {
203203
putInt(parseDateExpressionToInt(date));
204204
}
205205

0 commit comments

Comments
 (0)