From d37523f568c29d3c6b9c92e700848b958b142710 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Mon, 17 Jun 2024 09:06:30 +0000 Subject: [PATCH] CreateDBInstance add DNStorageSpace --- VERSION | 2 +- .../polardbx/model/CreateDBInstanceRequest.h | 3 ++ .../model/DescribeBackupSetListRequest.h | 12 +++---- .../model/DescribeDBInstanceAttributeResult.h | 1 + .../DescribeScaleOutMigrateTaskListRequest.h | 6 ++-- .../model/SwitchDBInstanceHARequest.h | 12 +++---- .../model/UpdateDBInstanceSSLRequest.h | 6 ++-- polardbx/src/model/CreateDBInstanceRequest.cc | 9 +++++ .../src/model/DescribeBackupSetListRequest.cc | 36 +++++++++---------- .../DescribeDBInstanceAttributeResult.cc | 2 ++ .../DescribeScaleOutMigrateTaskListRequest.cc | 10 +++--- .../src/model/SwitchDBInstanceHARequest.cc | 36 +++++++++---------- .../src/model/UpdateDBInstanceSSLRequest.cc | 18 +++++----- 13 files changed, 84 insertions(+), 69 deletions(-) diff --git a/VERSION b/VERSION index 2b81c35d9..4877f6df2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1931 \ No newline at end of file +1.36.1932 \ No newline at end of file diff --git a/polardbx/include/alibabacloud/polardbx/model/CreateDBInstanceRequest.h b/polardbx/include/alibabacloud/polardbx/model/CreateDBInstanceRequest.h index 3b32f68b9..a3e7904bd 100644 --- a/polardbx/include/alibabacloud/polardbx/model/CreateDBInstanceRequest.h +++ b/polardbx/include/alibabacloud/polardbx/model/CreateDBInstanceRequest.h @@ -74,6 +74,8 @@ public: void setDnClass(const std::string &dnClass); int getUsedTime() const; void setUsedTime(int usedTime); + std::string getDnStorageSpace() const; + void setDnStorageSpace(const std::string &dnStorageSpace); std::string getPrimaryZone() const; void setPrimaryZone(const std::string &primaryZone); std::string getSeries() const; @@ -106,6 +108,7 @@ private: int dBNodeCount_; std::string dnClass_; int usedTime_; + std::string dnStorageSpace_; std::string primaryZone_; std::string series_; std::string vPCId_; diff --git a/polardbx/include/alibabacloud/polardbx/model/DescribeBackupSetListRequest.h b/polardbx/include/alibabacloud/polardbx/model/DescribeBackupSetListRequest.h index f699d5522..eabcf2c27 100644 --- a/polardbx/include/alibabacloud/polardbx/model/DescribeBackupSetListRequest.h +++ b/polardbx/include/alibabacloud/polardbx/model/DescribeBackupSetListRequest.h @@ -32,27 +32,27 @@ public: ~DescribeBackupSetListRequest(); std::string getDBInstanceName() const; void setDBInstanceName(const std::string &dBInstanceName); - long getEndTime() const; - void setEndTime(long endTime); long getStartTime() const; void setStartTime(long startTime); - std::string getDestCrossRegion() const; - void setDestCrossRegion(const std::string &destCrossRegion); int getPageNumber() const; void setPageNumber(int pageNumber); std::string getRegionId() const; void setRegionId(const std::string ®ionId); int getPageSize() const; void setPageSize(int pageSize); + long getEndTime() const; + void setEndTime(long endTime); + std::string getDestCrossRegion() const; + void setDestCrossRegion(const std::string &destCrossRegion); private: std::string dBInstanceName_; - long endTime_; long startTime_; - std::string destCrossRegion_; int pageNumber_; std::string regionId_; int pageSize_; + long endTime_; + std::string destCrossRegion_; }; } // namespace Model } // namespace Polardbx diff --git a/polardbx/include/alibabacloud/polardbx/model/DescribeDBInstanceAttributeResult.h b/polardbx/include/alibabacloud/polardbx/model/DescribeDBInstanceAttributeResult.h index 05cb3470f..10b4e3f5c 100644 --- a/polardbx/include/alibabacloud/polardbx/model/DescribeDBInstanceAttributeResult.h +++ b/polardbx/include/alibabacloud/polardbx/model/DescribeDBInstanceAttributeResult.h @@ -65,6 +65,7 @@ namespace AlibabaCloud std::string dBInstanceType; std::string cnNodeClassCode; std::string dBType; + std::string specCategory; std::string tertiaryZone; std::string dBVersion; std::vector columnarReadDBInstances; diff --git a/polardbx/include/alibabacloud/polardbx/model/DescribeScaleOutMigrateTaskListRequest.h b/polardbx/include/alibabacloud/polardbx/model/DescribeScaleOutMigrateTaskListRequest.h index 696cf78c2..53ffc0244 100644 --- a/polardbx/include/alibabacloud/polardbx/model/DescribeScaleOutMigrateTaskListRequest.h +++ b/polardbx/include/alibabacloud/polardbx/model/DescribeScaleOutMigrateTaskListRequest.h @@ -34,8 +34,8 @@ public: void setDBInstanceName(const std::string &dBInstanceName); long getResourceOwnerId() const; void setResourceOwnerId(long resourceOwnerId); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); + std::string getRegionId() const; + void setRegionId(const std::string ®ionId); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -46,7 +46,7 @@ public: private: std::string dBInstanceName_; long resourceOwnerId_; - std::string accessKeyId_; + std::string regionId_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; diff --git a/polardbx/include/alibabacloud/polardbx/model/SwitchDBInstanceHARequest.h b/polardbx/include/alibabacloud/polardbx/model/SwitchDBInstanceHARequest.h index 7d94d9d21..fcd01020e 100644 --- a/polardbx/include/alibabacloud/polardbx/model/SwitchDBInstanceHARequest.h +++ b/polardbx/include/alibabacloud/polardbx/model/SwitchDBInstanceHARequest.h @@ -32,24 +32,24 @@ public: ~SwitchDBInstanceHARequest(); std::string getDBInstanceName() const; void setDBInstanceName(const std::string &dBInstanceName); - std::string getTargetPrimaryRegionId() const; - void setTargetPrimaryRegionId(const std::string &targetPrimaryRegionId); std::string getSwitchTimeMode() const; void setSwitchTimeMode(const std::string &switchTimeMode); std::string getRegionId() const; void setRegionId(const std::string ®ionId); - std::string getTargetPrimaryAzoneId() const; - void setTargetPrimaryAzoneId(const std::string &targetPrimaryAzoneId); std::string getSwitchTime() const; void setSwitchTime(const std::string &switchTime); + std::string getTargetPrimaryRegionId() const; + void setTargetPrimaryRegionId(const std::string &targetPrimaryRegionId); + std::string getTargetPrimaryAzoneId() const; + void setTargetPrimaryAzoneId(const std::string &targetPrimaryAzoneId); private: std::string dBInstanceName_; - std::string targetPrimaryRegionId_; std::string switchTimeMode_; std::string regionId_; - std::string targetPrimaryAzoneId_; std::string switchTime_; + std::string targetPrimaryRegionId_; + std::string targetPrimaryAzoneId_; }; } // namespace Model } // namespace Polardbx diff --git a/polardbx/include/alibabacloud/polardbx/model/UpdateDBInstanceSSLRequest.h b/polardbx/include/alibabacloud/polardbx/model/UpdateDBInstanceSSLRequest.h index b2537649b..18a15a500 100644 --- a/polardbx/include/alibabacloud/polardbx/model/UpdateDBInstanceSSLRequest.h +++ b/polardbx/include/alibabacloud/polardbx/model/UpdateDBInstanceSSLRequest.h @@ -34,18 +34,18 @@ public: void setDBInstanceName(const std::string &dBInstanceName); std::string getCertCommonName() const; void setCertCommonName(const std::string &certCommonName); - bool getEnableSSL() const; - void setEnableSSL(bool enableSSL); std::string getRegionId() const; void setRegionId(const std::string ®ionId); + bool getEnableSSL() const; + void setEnableSSL(bool enableSSL); bool getForce() const; void setForce(bool force); private: std::string dBInstanceName_; std::string certCommonName_; - bool enableSSL_; std::string regionId_; + bool enableSSL_; bool force_; }; } // namespace Model diff --git a/polardbx/src/model/CreateDBInstanceRequest.cc b/polardbx/src/model/CreateDBInstanceRequest.cc index ebfcbe239..d34dabc77 100644 --- a/polardbx/src/model/CreateDBInstanceRequest.cc +++ b/polardbx/src/model/CreateDBInstanceRequest.cc @@ -223,6 +223,15 @@ void CreateDBInstanceRequest::setUsedTime(int usedTime) { setParameter(std::string("UsedTime"), std::to_string(usedTime)); } +std::string CreateDBInstanceRequest::getDnStorageSpace() const { + return dnStorageSpace_; +} + +void CreateDBInstanceRequest::setDnStorageSpace(const std::string &dnStorageSpace) { + dnStorageSpace_ = dnStorageSpace; + setParameter(std::string("DnStorageSpace"), dnStorageSpace); +} + std::string CreateDBInstanceRequest::getPrimaryZone() const { return primaryZone_; } diff --git a/polardbx/src/model/DescribeBackupSetListRequest.cc b/polardbx/src/model/DescribeBackupSetListRequest.cc index 8293d88f1..71e7376a2 100644 --- a/polardbx/src/model/DescribeBackupSetListRequest.cc +++ b/polardbx/src/model/DescribeBackupSetListRequest.cc @@ -34,15 +34,6 @@ void DescribeBackupSetListRequest::setDBInstanceName(const std::string &dBInstan setParameter(std::string("DBInstanceName"), dBInstanceName); } -long DescribeBackupSetListRequest::getEndTime() const { - return endTime_; -} - -void DescribeBackupSetListRequest::setEndTime(long endTime) { - endTime_ = endTime; - setParameter(std::string("EndTime"), std::to_string(endTime)); -} - long DescribeBackupSetListRequest::getStartTime() const { return startTime_; } @@ -52,15 +43,6 @@ void DescribeBackupSetListRequest::setStartTime(long startTime) { setParameter(std::string("StartTime"), std::to_string(startTime)); } -std::string DescribeBackupSetListRequest::getDestCrossRegion() const { - return destCrossRegion_; -} - -void DescribeBackupSetListRequest::setDestCrossRegion(const std::string &destCrossRegion) { - destCrossRegion_ = destCrossRegion; - setParameter(std::string("DestCrossRegion"), destCrossRegion); -} - int DescribeBackupSetListRequest::getPageNumber() const { return pageNumber_; } @@ -88,3 +70,21 @@ void DescribeBackupSetListRequest::setPageSize(int pageSize) { setParameter(std::string("PageSize"), std::to_string(pageSize)); } +long DescribeBackupSetListRequest::getEndTime() const { + return endTime_; +} + +void DescribeBackupSetListRequest::setEndTime(long endTime) { + endTime_ = endTime; + setParameter(std::string("EndTime"), std::to_string(endTime)); +} + +std::string DescribeBackupSetListRequest::getDestCrossRegion() const { + return destCrossRegion_; +} + +void DescribeBackupSetListRequest::setDestCrossRegion(const std::string &destCrossRegion) { + destCrossRegion_ = destCrossRegion; + setParameter(std::string("DestCrossRegion"), destCrossRegion); +} + diff --git a/polardbx/src/model/DescribeDBInstanceAttributeResult.cc b/polardbx/src/model/DescribeDBInstanceAttributeResult.cc index ad478e702..9bb029ad0 100644 --- a/polardbx/src/model/DescribeDBInstanceAttributeResult.cc +++ b/polardbx/src/model/DescribeDBInstanceAttributeResult.cc @@ -128,6 +128,8 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload) dBInstance_.columnarInstanceName = dBInstanceNode["ColumnarInstanceName"].asString(); if(!dBInstanceNode["CanNotCreateColumnar"].isNull()) dBInstance_.canNotCreateColumnar = dBInstanceNode["CanNotCreateColumnar"].asString() == "true"; + if(!dBInstanceNode["SpecCategory"].isNull()) + dBInstance_.specCategory = dBInstanceNode["SpecCategory"].asString(); auto allDBNodesNode = dBInstanceNode["DBNodes"]["DBNode"]; for (auto dBInstanceNodeDBNodesDBNode : allDBNodesNode) { diff --git a/polardbx/src/model/DescribeScaleOutMigrateTaskListRequest.cc b/polardbx/src/model/DescribeScaleOutMigrateTaskListRequest.cc index d4a2439f8..17a57c969 100644 --- a/polardbx/src/model/DescribeScaleOutMigrateTaskListRequest.cc +++ b/polardbx/src/model/DescribeScaleOutMigrateTaskListRequest.cc @@ -43,13 +43,13 @@ void DescribeScaleOutMigrateTaskListRequest::setResourceOwnerId(long resourceOwn setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId)); } -std::string DescribeScaleOutMigrateTaskListRequest::getAccessKeyId() const { - return accessKeyId_; +std::string DescribeScaleOutMigrateTaskListRequest::getRegionId() const { + return regionId_; } -void DescribeScaleOutMigrateTaskListRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); +void DescribeScaleOutMigrateTaskListRequest::setRegionId(const std::string ®ionId) { + regionId_ = regionId; + setParameter(std::string("RegionId"), regionId); } std::string DescribeScaleOutMigrateTaskListRequest::getResourceOwnerAccount() const { diff --git a/polardbx/src/model/SwitchDBInstanceHARequest.cc b/polardbx/src/model/SwitchDBInstanceHARequest.cc index 8b5bf6c8e..026b4b248 100644 --- a/polardbx/src/model/SwitchDBInstanceHARequest.cc +++ b/polardbx/src/model/SwitchDBInstanceHARequest.cc @@ -34,15 +34,6 @@ void SwitchDBInstanceHARequest::setDBInstanceName(const std::string &dBInstanceN setParameter(std::string("DBInstanceName"), dBInstanceName); } -std::string SwitchDBInstanceHARequest::getTargetPrimaryRegionId() const { - return targetPrimaryRegionId_; -} - -void SwitchDBInstanceHARequest::setTargetPrimaryRegionId(const std::string &targetPrimaryRegionId) { - targetPrimaryRegionId_ = targetPrimaryRegionId; - setParameter(std::string("TargetPrimaryRegionId"), targetPrimaryRegionId); -} - std::string SwitchDBInstanceHARequest::getSwitchTimeMode() const { return switchTimeMode_; } @@ -61,15 +52,6 @@ void SwitchDBInstanceHARequest::setRegionId(const std::string ®ionId) { setParameter(std::string("RegionId"), regionId); } -std::string SwitchDBInstanceHARequest::getTargetPrimaryAzoneId() const { - return targetPrimaryAzoneId_; -} - -void SwitchDBInstanceHARequest::setTargetPrimaryAzoneId(const std::string &targetPrimaryAzoneId) { - targetPrimaryAzoneId_ = targetPrimaryAzoneId; - setParameter(std::string("TargetPrimaryAzoneId"), targetPrimaryAzoneId); -} - std::string SwitchDBInstanceHARequest::getSwitchTime() const { return switchTime_; } @@ -79,3 +61,21 @@ void SwitchDBInstanceHARequest::setSwitchTime(const std::string &switchTime) { setParameter(std::string("SwitchTime"), switchTime); } +std::string SwitchDBInstanceHARequest::getTargetPrimaryRegionId() const { + return targetPrimaryRegionId_; +} + +void SwitchDBInstanceHARequest::setTargetPrimaryRegionId(const std::string &targetPrimaryRegionId) { + targetPrimaryRegionId_ = targetPrimaryRegionId; + setParameter(std::string("TargetPrimaryRegionId"), targetPrimaryRegionId); +} + +std::string SwitchDBInstanceHARequest::getTargetPrimaryAzoneId() const { + return targetPrimaryAzoneId_; +} + +void SwitchDBInstanceHARequest::setTargetPrimaryAzoneId(const std::string &targetPrimaryAzoneId) { + targetPrimaryAzoneId_ = targetPrimaryAzoneId; + setParameter(std::string("TargetPrimaryAzoneId"), targetPrimaryAzoneId); +} + diff --git a/polardbx/src/model/UpdateDBInstanceSSLRequest.cc b/polardbx/src/model/UpdateDBInstanceSSLRequest.cc index ba9331c09..3be1ef5cf 100644 --- a/polardbx/src/model/UpdateDBInstanceSSLRequest.cc +++ b/polardbx/src/model/UpdateDBInstanceSSLRequest.cc @@ -43,15 +43,6 @@ void UpdateDBInstanceSSLRequest::setCertCommonName(const std::string &certCommon setParameter(std::string("CertCommonName"), certCommonName); } -bool UpdateDBInstanceSSLRequest::getEnableSSL() const { - return enableSSL_; -} - -void UpdateDBInstanceSSLRequest::setEnableSSL(bool enableSSL) { - enableSSL_ = enableSSL; - setParameter(std::string("EnableSSL"), enableSSL ? "true" : "false"); -} - std::string UpdateDBInstanceSSLRequest::getRegionId() const { return regionId_; } @@ -61,6 +52,15 @@ void UpdateDBInstanceSSLRequest::setRegionId(const std::string ®ionId) { setParameter(std::string("RegionId"), regionId); } +bool UpdateDBInstanceSSLRequest::getEnableSSL() const { + return enableSSL_; +} + +void UpdateDBInstanceSSLRequest::setEnableSSL(bool enableSSL) { + enableSSL_ = enableSSL; + setParameter(std::string("EnableSSL"), enableSSL ? "true" : "false"); +} + bool UpdateDBInstanceSSLRequest::getForce() const { return force_; }