From 9663b548cf786509887d9910a6c8fd2061116af8 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Fri, 27 Nov 2020 09:58:46 +0000 Subject: [PATCH] Supported all language sdk. --- CHANGELOG | 4 ++++ .../model/DescribeDBInstancesResult.h | 10 +++++++++ .../src/model/DescribeDBInstancesResult.cc | 21 +++++++++++++++++++ polardbx/src/model/DescribeDbListResult.cc | 12 +++++------ .../DescribeInstanceDbPerformanceResult.cc | 12 +++++------ .../DescribeInstancePerformanceResult.cc | 12 +++++------ ...escribeInstanceStoragePerformanceResult.cc | 12 +++++------ polardbx/src/model/DescribeRegionsResult.cc | 12 +++++------ 8 files changed, 65 insertions(+), 30 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 66fe8c8b3..2b5f5f589 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2020-11-27 Version: patch +- Supported all language sdk. +- Fixed some bugs for polardbx. + 2020-11-27 Version: patch - Generated 2018-01-11 for `rtc`. diff --git a/polardbx/include/alibabacloud/polardbx/model/DescribeDBInstancesResult.h b/polardbx/include/alibabacloud/polardbx/model/DescribeDBInstancesResult.h index b61342d0a..20ab3fff4 100644 --- a/polardbx/include/alibabacloud/polardbx/model/DescribeDBInstancesResult.h +++ b/polardbx/include/alibabacloud/polardbx/model/DescribeDBInstancesResult.h @@ -34,6 +34,13 @@ namespace AlibabaCloud public: struct DBInstance { + struct PolarDBXNode + { + std::string classCode; + std::string zoneId; + std::string id; + std::string regionId; + }; std::string status; std::string description; std::string zoneId; @@ -45,6 +52,7 @@ namespace AlibabaCloud std::string payType; std::string dBType; std::string lockMode; + std::vector nodes; int storageUsed; std::string nodeClass; std::string dBVersion; @@ -64,6 +72,7 @@ namespace AlibabaCloud ~DescribeDBInstancesResult(); int getPageSize()const; int getPageNumber()const; + int getTotalNumber()const; std::vector getDBInstances()const; protected: @@ -71,6 +80,7 @@ namespace AlibabaCloud private: int pageSize_; int pageNumber_; + int totalNumber_; std::vector dBInstances_; }; diff --git a/polardbx/src/model/DescribeDBInstancesResult.cc b/polardbx/src/model/DescribeDBInstancesResult.cc index 6f29b4007..ecae09403 100644 --- a/polardbx/src/model/DescribeDBInstancesResult.cc +++ b/polardbx/src/model/DescribeDBInstancesResult.cc @@ -85,6 +85,20 @@ void DescribeDBInstancesResult::parse(const std::string &payload) dBInstancesObject.commodityCode = valueDBInstancesDBInstance["CommodityCode"].asString(); if(!valueDBInstancesDBInstance["Type"].isNull()) dBInstancesObject.type = valueDBInstancesDBInstance["Type"].asString(); + auto allNodesNode = valueDBInstancesDBInstance["Nodes"]["PolarDBXNode"]; + for (auto valueDBInstancesDBInstanceNodesPolarDBXNode : allNodesNode) + { + DBInstance::PolarDBXNode nodesObject; + if(!valueDBInstancesDBInstanceNodesPolarDBXNode["Id"].isNull()) + nodesObject.id = valueDBInstancesDBInstanceNodesPolarDBXNode["Id"].asString(); + if(!valueDBInstancesDBInstanceNodesPolarDBXNode["ClassCode"].isNull()) + nodesObject.classCode = valueDBInstancesDBInstanceNodesPolarDBXNode["ClassCode"].asString(); + if(!valueDBInstancesDBInstanceNodesPolarDBXNode["RegionId"].isNull()) + nodesObject.regionId = valueDBInstancesDBInstanceNodesPolarDBXNode["RegionId"].asString(); + if(!valueDBInstancesDBInstanceNodesPolarDBXNode["ZoneId"].isNull()) + nodesObject.zoneId = valueDBInstancesDBInstanceNodesPolarDBXNode["ZoneId"].asString(); + dBInstancesObject.nodes.push_back(nodesObject); + } auto allReadDBInstances = value["ReadDBInstances"]["ReadDBInstance"]; for (auto value : allReadDBInstances) dBInstancesObject.readDBInstances.push_back(value.asString()); @@ -94,6 +108,8 @@ void DescribeDBInstancesResult::parse(const std::string &payload) pageNumber_ = std::stoi(value["PageNumber"].asString()); if(!value["PageSize"].isNull()) pageSize_ = std::stoi(value["PageSize"].asString()); + if(!value["TotalNumber"].isNull()) + totalNumber_ = std::stoi(value["TotalNumber"].asString()); } @@ -107,6 +123,11 @@ int DescribeDBInstancesResult::getPageNumber()const return pageNumber_; } +int DescribeDBInstancesResult::getTotalNumber()const +{ + return totalNumber_; +} + std::vector DescribeDBInstancesResult::getDBInstances()const { return dBInstances_; diff --git a/polardbx/src/model/DescribeDbListResult.cc b/polardbx/src/model/DescribeDbListResult.cc index 0c75ecaba..584102402 100644 --- a/polardbx/src/model/DescribeDbListResult.cc +++ b/polardbx/src/model/DescribeDbListResult.cc @@ -51,14 +51,14 @@ void DescribeDbListResult::parse(const std::string &payload) dataObject.dBInstanceName = valueDataDB["DBInstanceName"].asString(); if(!valueDataDB["CharacterSetName"].isNull()) dataObject.characterSetName = valueDataDB["CharacterSetName"].asString(); - auto allAccountsNode = allDataNode["Accounts"]["Account"]; - for (auto allDataNodeAccountsAccount : allAccountsNode) + auto allAccountsNode = valueDataDB["Accounts"]["Account"]; + for (auto valueDataDBAccountsAccount : allAccountsNode) { DB::Account accountsObject; - if(!allDataNodeAccountsAccount["AccountName"].isNull()) - accountsObject.accountName = allDataNodeAccountsAccount["AccountName"].asString(); - if(!allDataNodeAccountsAccount["AccountPrivilege"].isNull()) - accountsObject.accountPrivilege = allDataNodeAccountsAccount["AccountPrivilege"].asString(); + if(!valueDataDBAccountsAccount["AccountName"].isNull()) + accountsObject.accountName = valueDataDBAccountsAccount["AccountName"].asString(); + if(!valueDataDBAccountsAccount["AccountPrivilege"].isNull()) + accountsObject.accountPrivilege = valueDataDBAccountsAccount["AccountPrivilege"].asString(); dataObject.accounts.push_back(accountsObject); } data_.push_back(dataObject); diff --git a/polardbx/src/model/DescribeInstanceDbPerformanceResult.cc b/polardbx/src/model/DescribeInstanceDbPerformanceResult.cc index 3ccfe91de..8f252bba3 100644 --- a/polardbx/src/model/DescribeInstanceDbPerformanceResult.cc +++ b/polardbx/src/model/DescribeInstanceDbPerformanceResult.cc @@ -48,14 +48,14 @@ void DescribeInstanceDbPerformanceResult::parse(const std::string &payload) performanceItemObject.measurement = dataNodePerformanceItemsPerformanceItem["Measurement"].asString(); if(!dataNodePerformanceItemsPerformanceItem["MetricName"].isNull()) performanceItemObject.metricName = dataNodePerformanceItemsPerformanceItem["MetricName"].asString(); - auto allPointsNode = allPerformanceItemsNode["Points"]["Point"]; - for (auto allPerformanceItemsNodePointsPoint : allPointsNode) + auto allPointsNode = dataNodePerformanceItemsPerformanceItem["Points"]["Point"]; + for (auto dataNodePerformanceItemsPerformanceItemPointsPoint : allPointsNode) { Data::PerformanceItem::Point pointsObject; - if(!allPerformanceItemsNodePointsPoint["Timestamp"].isNull()) - pointsObject.timestamp = std::stol(allPerformanceItemsNodePointsPoint["Timestamp"].asString()); - if(!allPerformanceItemsNodePointsPoint["Value"].isNull()) - pointsObject.value = allPerformanceItemsNodePointsPoint["Value"].asString(); + if(!dataNodePerformanceItemsPerformanceItemPointsPoint["Timestamp"].isNull()) + pointsObject.timestamp = std::stol(dataNodePerformanceItemsPerformanceItemPointsPoint["Timestamp"].asString()); + if(!dataNodePerformanceItemsPerformanceItemPointsPoint["Value"].isNull()) + pointsObject.value = dataNodePerformanceItemsPerformanceItemPointsPoint["Value"].asString(); performanceItemObject.points.push_back(pointsObject); } data_.performanceItems.push_back(performanceItemObject); diff --git a/polardbx/src/model/DescribeInstancePerformanceResult.cc b/polardbx/src/model/DescribeInstancePerformanceResult.cc index ee3a573da..d7da178e1 100644 --- a/polardbx/src/model/DescribeInstancePerformanceResult.cc +++ b/polardbx/src/model/DescribeInstancePerformanceResult.cc @@ -48,14 +48,14 @@ void DescribeInstancePerformanceResult::parse(const std::string &payload) performanceItemObject.measurement = dataNodePerformanceItemsPerformanceItem["Measurement"].asString(); if(!dataNodePerformanceItemsPerformanceItem["MetricName"].isNull()) performanceItemObject.metricName = dataNodePerformanceItemsPerformanceItem["MetricName"].asString(); - auto allPointsNode = allPerformanceItemsNode["Points"]["Point"]; - for (auto allPerformanceItemsNodePointsPoint : allPointsNode) + auto allPointsNode = dataNodePerformanceItemsPerformanceItem["Points"]["Point"]; + for (auto dataNodePerformanceItemsPerformanceItemPointsPoint : allPointsNode) { Data::PerformanceItem::Point pointsObject; - if(!allPerformanceItemsNodePointsPoint["Timestamp"].isNull()) - pointsObject.timestamp = std::stol(allPerformanceItemsNodePointsPoint["Timestamp"].asString()); - if(!allPerformanceItemsNodePointsPoint["Value"].isNull()) - pointsObject.value = allPerformanceItemsNodePointsPoint["Value"].asString(); + if(!dataNodePerformanceItemsPerformanceItemPointsPoint["Timestamp"].isNull()) + pointsObject.timestamp = std::stol(dataNodePerformanceItemsPerformanceItemPointsPoint["Timestamp"].asString()); + if(!dataNodePerformanceItemsPerformanceItemPointsPoint["Value"].isNull()) + pointsObject.value = dataNodePerformanceItemsPerformanceItemPointsPoint["Value"].asString(); performanceItemObject.points.push_back(pointsObject); } data_.performanceItems.push_back(performanceItemObject); diff --git a/polardbx/src/model/DescribeInstanceStoragePerformanceResult.cc b/polardbx/src/model/DescribeInstanceStoragePerformanceResult.cc index f8369aebb..7270c8ea8 100644 --- a/polardbx/src/model/DescribeInstanceStoragePerformanceResult.cc +++ b/polardbx/src/model/DescribeInstanceStoragePerformanceResult.cc @@ -48,14 +48,14 @@ void DescribeInstanceStoragePerformanceResult::parse(const std::string &payload) performanceItemObject.measurement = dataNodePerformanceItemsPerformanceItem["Measurement"].asString(); if(!dataNodePerformanceItemsPerformanceItem["MetricName"].isNull()) performanceItemObject.metricName = dataNodePerformanceItemsPerformanceItem["MetricName"].asString(); - auto allPointsNode = allPerformanceItemsNode["Points"]["Point"]; - for (auto allPerformanceItemsNodePointsPoint : allPointsNode) + auto allPointsNode = dataNodePerformanceItemsPerformanceItem["Points"]["Point"]; + for (auto dataNodePerformanceItemsPerformanceItemPointsPoint : allPointsNode) { Data::PerformanceItem::Point pointsObject; - if(!allPerformanceItemsNodePointsPoint["Timestamp"].isNull()) - pointsObject.timestamp = std::stol(allPerformanceItemsNodePointsPoint["Timestamp"].asString()); - if(!allPerformanceItemsNodePointsPoint["Value"].isNull()) - pointsObject.value = allPerformanceItemsNodePointsPoint["Value"].asString(); + if(!dataNodePerformanceItemsPerformanceItemPointsPoint["Timestamp"].isNull()) + pointsObject.timestamp = std::stol(dataNodePerformanceItemsPerformanceItemPointsPoint["Timestamp"].asString()); + if(!dataNodePerformanceItemsPerformanceItemPointsPoint["Value"].isNull()) + pointsObject.value = dataNodePerformanceItemsPerformanceItemPointsPoint["Value"].asString(); performanceItemObject.points.push_back(pointsObject); } data_.performanceItems.push_back(performanceItemObject); diff --git a/polardbx/src/model/DescribeRegionsResult.cc b/polardbx/src/model/DescribeRegionsResult.cc index 61d6317b4..7c4c1f3a8 100644 --- a/polardbx/src/model/DescribeRegionsResult.cc +++ b/polardbx/src/model/DescribeRegionsResult.cc @@ -47,14 +47,14 @@ void DescribeRegionsResult::parse(const std::string &payload) regionsObject.regionId = valueRegionsRegion["RegionId"].asString(); if(!valueRegionsRegion["SupportPolarx20"].isNull()) regionsObject.supportPolarx20 = valueRegionsRegion["SupportPolarx20"].asString() == "true"; - auto allZonesNode = allRegionsNode["Zones"]["Zone"]; - for (auto allRegionsNodeZonesZone : allZonesNode) + auto allZonesNode = valueRegionsRegion["Zones"]["Zone"]; + for (auto valueRegionsRegionZonesZone : allZonesNode) { Region::Zone zonesObject; - if(!allRegionsNodeZonesZone["ZoneId"].isNull()) - zonesObject.zoneId = allRegionsNodeZonesZone["ZoneId"].asString(); - if(!allRegionsNodeZonesZone["VpcEnabled"].isNull()) - zonesObject.vpcEnabled = allRegionsNodeZonesZone["VpcEnabled"].asString() == "true"; + if(!valueRegionsRegionZonesZone["ZoneId"].isNull()) + zonesObject.zoneId = valueRegionsRegionZonesZone["ZoneId"].asString(); + if(!valueRegionsRegionZonesZone["VpcEnabled"].isNull()) + zonesObject.vpcEnabled = valueRegionsRegionZonesZone["VpcEnabled"].asString() == "true"; regionsObject.zones.push_back(zonesObject); } regions_.push_back(regionsObject);