diff --git a/CHANGELOG b/CHANGELOG index 7d57cfb9f..c49ec173f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2021-04-13 Version: 1.36.678 +- Supported ConfigureDtsJob SynchronizationDirection. +- Fixed DescribePreCheckStatus JobProgress bootTime. + 2021-04-13 Version: 1.36.677 - Release AddFaceVideoTemplate DeleteFaceVideoTemplate QueryFaceVideoTemplate MergeVideoModelFace. diff --git a/VERSION b/VERSION index aad0aa81e..fa57b7022 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.677 \ No newline at end of file +1.36.678 \ No newline at end of file diff --git a/dts/include/alibabacloud/dts/model/ConfigureDtsJobRequest.h b/dts/include/alibabacloud/dts/model/ConfigureDtsJobRequest.h index 3d1cafd1a..e707e5379 100644 --- a/dts/include/alibabacloud/dts/model/ConfigureDtsJobRequest.h +++ b/dts/include/alibabacloud/dts/model/ConfigureDtsJobRequest.h @@ -71,6 +71,8 @@ namespace AlibabaCloud void setDtsJobName(const std::string& dtsJobName); std::string getDtsInstanceId()const; void setDtsInstanceId(const std::string& dtsInstanceId); + std::string getSynchronizationDirection()const; + void setSynchronizationDirection(const std::string& synchronizationDirection); std::string getSourceEndpointRegion()const; void setSourceEndpointRegion(const std::string& sourceEndpointRegion); bool getDelayNotice()const; @@ -131,6 +133,7 @@ namespace AlibabaCloud std::string sourceEndpointInstanceType_; std::string dtsJobName_; std::string dtsInstanceId_; + std::string synchronizationDirection_; std::string sourceEndpointRegion_; bool delayNotice_; std::string destinationEndpointInstanceType_; diff --git a/dts/include/alibabacloud/dts/model/DescribeDtsJobDetailRequest.h b/dts/include/alibabacloud/dts/model/DescribeDtsJobDetailRequest.h index 68c60b2b8..152afa62d 100644 --- a/dts/include/alibabacloud/dts/model/DescribeDtsJobDetailRequest.h +++ b/dts/include/alibabacloud/dts/model/DescribeDtsJobDetailRequest.h @@ -37,9 +37,15 @@ namespace AlibabaCloud std::string getDtsJobId()const; void setDtsJobId(const std::string& dtsJobId); + std::string getDtsInstanceID()const; + void setDtsInstanceID(const std::string& dtsInstanceID); + std::string getSynchronizationDirection()const; + void setSynchronizationDirection(const std::string& synchronizationDirection); private: std::string dtsJobId_; + std::string dtsInstanceID_; + std::string synchronizationDirection_; }; } diff --git a/dts/include/alibabacloud/dts/model/DescribeDtsJobDetailResult.h b/dts/include/alibabacloud/dts/model/DescribeDtsJobDetailResult.h index b62d396e6..704613f8c 100644 --- a/dts/include/alibabacloud/dts/model/DescribeDtsJobDetailResult.h +++ b/dts/include/alibabacloud/dts/model/DescribeDtsJobDetailResult.h @@ -71,57 +71,59 @@ namespace AlibabaCloud DescribeDtsJobDetailResult(); explicit DescribeDtsJobDetailResult(const std::string &payload); ~DescribeDtsJobDetailResult(); - std::string getStatus()const; - std::string getDbObject()const; - std::string getCreateTime()const; std::string getDtsJobName()const; std::string getDynamicMessage()const; - std::string getPayType()const; - std::string getErrMessage()const; - int getCode()const; std::string getDtsInstanceID()const; MigrationMode getMigrationMode()const; bool getSuccess()const; int getDelay()const; - std::string getErrCode()const; std::string getDtsJobClass()const; - int getCheckpoint()const; std::string getDtsJobId()const; - std::string getDtsJobDirection()const; std::string getFinishTime()const; + int getHttpStatusCode()const; + std::string getStatus()const; + std::string getDbObject()const; + std::string getCreateTime()const; + std::string getPayType()const; + std::string getErrMessage()const; + int getCode()const; + std::string getErrCode()const; + int getCheckpoint()const; + std::string getDtsJobDirection()const; DestinationEndpoint getDestinationEndpoint()const; SourceEndpoint getSourceEndpoint()const; - int getHttpStatusCode()const; std::string getExpireTime()const; std::string getErrorMessage()const; + std::string getSynchronizationDirection()const; std::string getReserved()const; protected: void parse(const std::string &payload); private: - std::string status_; - std::string dbObject_; - std::string createTime_; std::string dtsJobName_; std::string dynamicMessage_; - std::string payType_; - std::string errMessage_; - int code_; std::string dtsInstanceID_; MigrationMode migrationMode_; bool success_; int delay_; - std::string errCode_; std::string dtsJobClass_; - int checkpoint_; std::string dtsJobId_; - std::string dtsJobDirection_; std::string finishTime_; + int httpStatusCode_; + std::string status_; + std::string dbObject_; + std::string createTime_; + std::string payType_; + std::string errMessage_; + int code_; + std::string errCode_; + int checkpoint_; + std::string dtsJobDirection_; DestinationEndpoint destinationEndpoint_; SourceEndpoint sourceEndpoint_; - int httpStatusCode_; std::string expireTime_; std::string errorMessage_; + std::string synchronizationDirection_; std::string reserved_; }; diff --git a/dts/include/alibabacloud/dts/model/DescribePreCheckStatusResult.h b/dts/include/alibabacloud/dts/model/DescribePreCheckStatusResult.h index 142436715..ec3fb373c 100644 --- a/dts/include/alibabacloud/dts/model/DescribePreCheckStatusResult.h +++ b/dts/include/alibabacloud/dts/model/DescribePreCheckStatusResult.h @@ -46,14 +46,14 @@ namespace AlibabaCloud std::string destSchema; std::string errMsg; std::string targetNames; - long bootTime; + std::string bootTime; std::vector logs; std::string names; std::string item; bool canSkip; std::string repairMethod; int delaySeconds; - long finishTime; + std::string finishTime; int orderNum; long diffRow; std::string parentObj; diff --git a/dts/src/model/ConfigureDtsJobRequest.cc b/dts/src/model/ConfigureDtsJobRequest.cc index bd321897e..15efe3c38 100644 --- a/dts/src/model/ConfigureDtsJobRequest.cc +++ b/dts/src/model/ConfigureDtsJobRequest.cc @@ -225,6 +225,17 @@ void ConfigureDtsJobRequest::setDtsInstanceId(const std::string& dtsInstanceId) setParameter("DtsInstanceId", dtsInstanceId); } +std::string ConfigureDtsJobRequest::getSynchronizationDirection()const +{ + return synchronizationDirection_; +} + +void ConfigureDtsJobRequest::setSynchronizationDirection(const std::string& synchronizationDirection) +{ + synchronizationDirection_ = synchronizationDirection; + setParameter("SynchronizationDirection", synchronizationDirection); +} + std::string ConfigureDtsJobRequest::getSourceEndpointRegion()const { return sourceEndpointRegion_; diff --git a/dts/src/model/DescribeDtsJobDetailRequest.cc b/dts/src/model/DescribeDtsJobDetailRequest.cc index 78a9db9bb..91cdd8d0a 100644 --- a/dts/src/model/DescribeDtsJobDetailRequest.cc +++ b/dts/src/model/DescribeDtsJobDetailRequest.cc @@ -38,3 +38,25 @@ void DescribeDtsJobDetailRequest::setDtsJobId(const std::string& dtsJobId) setParameter("DtsJobId", dtsJobId); } +std::string DescribeDtsJobDetailRequest::getDtsInstanceID()const +{ + return dtsInstanceID_; +} + +void DescribeDtsJobDetailRequest::setDtsInstanceID(const std::string& dtsInstanceID) +{ + dtsInstanceID_ = dtsInstanceID; + setParameter("DtsInstanceID", dtsInstanceID); +} + +std::string DescribeDtsJobDetailRequest::getSynchronizationDirection()const +{ + return synchronizationDirection_; +} + +void DescribeDtsJobDetailRequest::setSynchronizationDirection(const std::string& synchronizationDirection) +{ + synchronizationDirection_ = synchronizationDirection; + setParameter("SynchronizationDirection", synchronizationDirection); +} + diff --git a/dts/src/model/DescribeDtsJobDetailResult.cc b/dts/src/model/DescribeDtsJobDetailResult.cc index 9b6d29ab9..3fde517e0 100644 --- a/dts/src/model/DescribeDtsJobDetailResult.cc +++ b/dts/src/model/DescribeDtsJobDetailResult.cc @@ -134,24 +134,11 @@ void DescribeDtsJobDetailResult::parse(const std::string &payload) errorMessage_ = value["ErrorMessage"].asString(); if(!value["DbObject"].isNull()) dbObject_ = value["DbObject"].asString(); + if(!value["SynchronizationDirection"].isNull()) + synchronizationDirection_ = value["SynchronizationDirection"].asString(); } -std::string DescribeDtsJobDetailResult::getStatus()const -{ - return status_; -} - -std::string DescribeDtsJobDetailResult::getDbObject()const -{ - return dbObject_; -} - -std::string DescribeDtsJobDetailResult::getCreateTime()const -{ - return createTime_; -} - std::string DescribeDtsJobDetailResult::getDtsJobName()const { return dtsJobName_; @@ -162,21 +149,6 @@ std::string DescribeDtsJobDetailResult::getDynamicMessage()const return dynamicMessage_; } -std::string DescribeDtsJobDetailResult::getPayType()const -{ - return payType_; -} - -std::string DescribeDtsJobDetailResult::getErrMessage()const -{ - return errMessage_; -} - -int DescribeDtsJobDetailResult::getCode()const -{ - return code_; -} - std::string DescribeDtsJobDetailResult::getDtsInstanceID()const { return dtsInstanceID_; @@ -197,36 +169,71 @@ int DescribeDtsJobDetailResult::getDelay()const return delay_; } -std::string DescribeDtsJobDetailResult::getErrCode()const -{ - return errCode_; -} - std::string DescribeDtsJobDetailResult::getDtsJobClass()const { return dtsJobClass_; } -int DescribeDtsJobDetailResult::getCheckpoint()const -{ - return checkpoint_; -} - std::string DescribeDtsJobDetailResult::getDtsJobId()const { return dtsJobId_; } -std::string DescribeDtsJobDetailResult::getDtsJobDirection()const -{ - return dtsJobDirection_; -} - std::string DescribeDtsJobDetailResult::getFinishTime()const { return finishTime_; } +int DescribeDtsJobDetailResult::getHttpStatusCode()const +{ + return httpStatusCode_; +} + +std::string DescribeDtsJobDetailResult::getStatus()const +{ + return status_; +} + +std::string DescribeDtsJobDetailResult::getDbObject()const +{ + return dbObject_; +} + +std::string DescribeDtsJobDetailResult::getCreateTime()const +{ + return createTime_; +} + +std::string DescribeDtsJobDetailResult::getPayType()const +{ + return payType_; +} + +std::string DescribeDtsJobDetailResult::getErrMessage()const +{ + return errMessage_; +} + +int DescribeDtsJobDetailResult::getCode()const +{ + return code_; +} + +std::string DescribeDtsJobDetailResult::getErrCode()const +{ + return errCode_; +} + +int DescribeDtsJobDetailResult::getCheckpoint()const +{ + return checkpoint_; +} + +std::string DescribeDtsJobDetailResult::getDtsJobDirection()const +{ + return dtsJobDirection_; +} + DescribeDtsJobDetailResult::DestinationEndpoint DescribeDtsJobDetailResult::getDestinationEndpoint()const { return destinationEndpoint_; @@ -237,11 +244,6 @@ DescribeDtsJobDetailResult::SourceEndpoint DescribeDtsJobDetailResult::getSource return sourceEndpoint_; } -int DescribeDtsJobDetailResult::getHttpStatusCode()const -{ - return httpStatusCode_; -} - std::string DescribeDtsJobDetailResult::getExpireTime()const { return expireTime_; @@ -252,6 +254,11 @@ std::string DescribeDtsJobDetailResult::getErrorMessage()const return errorMessage_; } +std::string DescribeDtsJobDetailResult::getSynchronizationDirection()const +{ + return synchronizationDirection_; +} + std::string DescribeDtsJobDetailResult::getReserved()const { return reserved_; diff --git a/dts/src/model/DescribePreCheckStatusResult.cc b/dts/src/model/DescribePreCheckStatusResult.cc index 94ed7af78..14c08dd1b 100644 --- a/dts/src/model/DescribePreCheckStatusResult.cc +++ b/dts/src/model/DescribePreCheckStatusResult.cc @@ -44,13 +44,13 @@ void DescribePreCheckStatusResult::parse(const std::string &payload) { ProgressInfo jobProgressObject; if(!valueJobProgressProgressInfo["BootTime"].isNull()) - jobProgressObject.bootTime = std::stol(valueJobProgressProgressInfo["BootTime"].asString()); + jobProgressObject.bootTime = valueJobProgressProgressInfo["BootTime"].asString(); if(!valueJobProgressProgressInfo["CanSkip"].isNull()) jobProgressObject.canSkip = valueJobProgressProgressInfo["CanSkip"].asString() == "true"; if(!valueJobProgressProgressInfo["DelaySeconds"].isNull()) jobProgressObject.delaySeconds = std::stoi(valueJobProgressProgressInfo["DelaySeconds"].asString()); if(!valueJobProgressProgressInfo["FinishTime"].isNull()) - jobProgressObject.finishTime = std::stol(valueJobProgressProgressInfo["FinishTime"].asString()); + jobProgressObject.finishTime = valueJobProgressProgressInfo["FinishTime"].asString(); if(!valueJobProgressProgressInfo["IgnoreFlag"].isNull()) jobProgressObject.ignoreFlag = valueJobProgressProgressInfo["IgnoreFlag"].asString(); if(!valueJobProgressProgressInfo["Item"].isNull())