Browse Source

Supported all language sdk.

sdk-team 5 năm trước cách đây
mục cha
commit
9663b548cf

+ 4 - 0
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`.
 

+ 10 - 0
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<DBInstance::PolarDBXNode> 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<DBInstance> getDBInstances()const;
 
 			protected:
@@ -71,6 +80,7 @@ namespace AlibabaCloud
 			private:
 				int pageSize_;
 				int pageNumber_;
+				int totalNumber_;
 				std::vector<DBInstance> dBInstances_;
 
 			};

+ 21 - 0
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::DBInstance> DescribeDBInstancesResult::getDBInstances()const
 {
 	return dBInstances_;

+ 6 - 6
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);

+ 6 - 6
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);

+ 6 - 6
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);

+ 6 - 6
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);

+ 6 - 6
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);