Skip to content

Commit b06fc81

Browse files
hongzhi-gaoJackieTien97
authored andcommitted
fix cpp-client-gettimestamp (#16124)
(cherry picked from commit 105926a)
1 parent 777c033 commit b06fc81

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,18 +462,18 @@ std::string IoTDBRpcDataSet::getStringByTsBlockColumnIndexAndDataType(int32_t in
462462
}
463463
}
464464

465-
int64_t IoTDBRpcDataSet::getTimestampByIndex(int32_t columnIndex) {
465+
boost::optional<int64_t> IoTDBRpcDataSet::getTimestampByIndex(int32_t columnIndex) {
466466
int32_t index = getTsBlockColumnIndexForColumnIndex(columnIndex);
467467
return getTimestampByTsBlockColumnIndex(index);
468468
}
469469

470-
int64_t IoTDBRpcDataSet::getTimestamp(const std::string& columnName) {
470+
boost::optional<int64_t> IoTDBRpcDataSet::getTimestamp(const std::string& columnName) {
471471
int32_t index = getTsBlockColumnIndexForColumnName(columnName);
472472
return getTimestampByTsBlockColumnIndex(index);
473473
}
474474

475-
int64_t IoTDBRpcDataSet::getTimestampByTsBlockColumnIndex(int32_t tsBlockColumnIndex) {
476-
return getLongByTsBlockColumnIndex(tsBlockColumnIndex).value();
475+
boost::optional<int64_t> IoTDBRpcDataSet::getTimestampByTsBlockColumnIndex(int32_t tsBlockColumnIndex) {
476+
return getLongByTsBlockColumnIndex(tsBlockColumnIndex);
477477
}
478478

479479
boost::optional<boost::gregorian::date> IoTDBRpcDataSet::getDateByIndex(int32_t columnIndex) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ class IoTDBRpcDataSet {
8383
std::shared_ptr<Binary> getBinary(const std::string& columnName);
8484
boost::optional<std::string> getStringByIndex(int32_t columnIndex);
8585
boost::optional<std::string> getString(const std::string& columnName);
86-
int64_t getTimestampByIndex(int32_t columnIndex);
87-
int64_t getTimestamp(const std::string& columnName);
86+
boost::optional<int64_t> getTimestampByIndex(int32_t columnIndex);
87+
boost::optional<int64_t> getTimestamp(const std::string& columnName);
8888
boost::optional<boost::gregorian::date> getDateByIndex(int32_t columnIndex);
8989
boost::optional<boost::gregorian::date> getDate(const std::string& columnName);
9090

@@ -122,7 +122,7 @@ class IoTDBRpcDataSet {
122122
std::shared_ptr<Binary> getBinaryByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
123123
boost::optional<std::string> getStringByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
124124
boost::optional<boost::gregorian::date> getDateByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
125-
int64_t getTimestampByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
125+
boost::optional<int64_t> getTimestampByTsBlockColumnIndex(int32_t tsBlockColumnIndex);
126126

127127
std::string sql_;
128128
bool isClosed_;

iotdb-client/client-cpp/src/test/cpp/sessionRelationalIT.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ TEST_CASE("Test RelationalTabletTsblockRead", "[testRelationalTabletTsblockRead]
199199
REQUIRE_FALSE(dataIter.getFloatByIndex(5).is_initialized());
200200
REQUIRE_FALSE(dataIter.getDoubleByIndex(6).is_initialized());
201201
REQUIRE_FALSE(dataIter.getStringByIndex(7).is_initialized());
202-
REQUIRE_FALSE(dataIter.getLongByIndex(8).is_initialized());
202+
REQUIRE_FALSE(dataIter.getTimestampByIndex(8).is_initialized());
203203
REQUIRE_FALSE(dataIter.getDateByIndex(9).is_initialized());
204204
REQUIRE_FALSE(dataIter.getStringByIndex(10).is_initialized());
205205
REQUIRE_FALSE(dataIter.getStringByIndex(11).is_initialized());
@@ -211,7 +211,7 @@ TEST_CASE("Test RelationalTabletTsblockRead", "[testRelationalTabletTsblockRead]
211211
REQUIRE(fabs(dataIter.getFloatByIndex(5).value() - rowNum * 1.1f) < 0.1f);
212212
REQUIRE(fabs(dataIter.getDoubleByIndex(6).value() - rowNum * 1.1f) < 0.1);
213213
REQUIRE(dataIter.getStringByIndex(7).value() == "text_" + to_string(rowNum));
214-
REQUIRE(dataIter.getLongByIndex(8).value() == static_cast<int64_t>(timestamp));
214+
REQUIRE(dataIter.getTimestampByIndex(8).value() == static_cast<int64_t>(timestamp));
215215
REQUIRE(dataIter.getDateByIndex(9).value() == boost::gregorian::date(2025, 5, 15));
216216
REQUIRE(dataIter.getStringByIndex(10).value() == "blob_" + to_string(rowNum));
217217
REQUIRE(dataIter.getStringByIndex(11).value() == "string_" + to_string(rowNum));

0 commit comments

Comments
 (0)