CreateShardingDBInstance add ReadOnlyReplicas in ReplicaSet.

CHANGELOG

@@ -1,3 +1,6 @@
+2021-02-02 Version: patch
+- CreateShardingDBInstance add ReadOnlyReplicas in ReplicaSet.
+
 2021-02-01 Version: patch
 - Support device credential for mqtt.
 

dds/CMakeLists.txt

@@ -89,8 +89,6 @@ set(dds_public_header_model
 	include/alibabacloud/dds/model/DescribeDedicatedClusterInstanceListResult.h
 	include/alibabacloud/dds/model/DescribeErrorLogRecordsRequest.h
 	include/alibabacloud/dds/model/DescribeErrorLogRecordsResult.h
-	include/alibabacloud/dds/model/DescribeIndexRecommendationRequest.h
-	include/alibabacloud/dds/model/DescribeIndexRecommendationResult.h
 	include/alibabacloud/dds/model/DescribeInstanceAutoRenewalAttributeRequest.h
 	include/alibabacloud/dds/model/DescribeInstanceAutoRenewalAttributeResult.h
 	include/alibabacloud/dds/model/DescribeKernelReleaseNotesRequest.h
@@ -270,8 +268,6 @@ set(dds_src
 	src/model/DescribeDedicatedClusterInstanceListResult.cc
 	src/model/DescribeErrorLogRecordsRequest.cc
 	src/model/DescribeErrorLogRecordsResult.cc
-	src/model/DescribeIndexRecommendationRequest.cc
-	src/model/DescribeIndexRecommendationResult.cc
 	src/model/DescribeInstanceAutoRenewalAttributeRequest.cc
 	src/model/DescribeInstanceAutoRenewalAttributeResult.cc
 	src/model/DescribeKernelReleaseNotesRequest.cc

dds/include/alibabacloud/dds/DdsClient.h

@@ -90,8 +90,6 @@
 #include "model/DescribeDedicatedClusterInstanceListResult.h"
 #include "model/DescribeErrorLogRecordsRequest.h"
 #include "model/DescribeErrorLogRecordsResult.h"
-#include "model/DescribeIndexRecommendationRequest.h"
-#include "model/DescribeIndexRecommendationResult.h"
 #include "model/DescribeInstanceAutoRenewalAttributeRequest.h"
 #include "model/DescribeInstanceAutoRenewalAttributeResult.h"
 #include "model/DescribeKernelReleaseNotesRequest.h"
@@ -311,9 +309,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeErrorLogRecordsResult> DescribeErrorLogRecordsOutcome;
 			typedef std::future<DescribeErrorLogRecordsOutcome> DescribeErrorLogRecordsOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::DescribeErrorLogRecordsRequest&, const DescribeErrorLogRecordsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeErrorLogRecordsAsyncHandler;
-			typedef Outcome<Error, Model::DescribeIndexRecommendationResult> DescribeIndexRecommendationOutcome;
-			typedef std::future<DescribeIndexRecommendationOutcome> DescribeIndexRecommendationOutcomeCallable;
-			typedef std::function<void(const DdsClient*, const Model::DescribeIndexRecommendationRequest&, const DescribeIndexRecommendationOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeIndexRecommendationAsyncHandler;
 			typedef Outcome<Error, Model::DescribeInstanceAutoRenewalAttributeResult> DescribeInstanceAutoRenewalAttributeOutcome;
 			typedef std::future<DescribeInstanceAutoRenewalAttributeOutcome> DescribeInstanceAutoRenewalAttributeOutcomeCallable;
 			typedef std::function<void(const DdsClient*, const Model::DescribeInstanceAutoRenewalAttributeRequest&, const DescribeInstanceAutoRenewalAttributeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeInstanceAutoRenewalAttributeAsyncHandler;
@@ -583,9 +578,6 @@ namespace AlibabaCloud
 			DescribeErrorLogRecordsOutcome describeErrorLogRecords(const Model::DescribeErrorLogRecordsRequest &request)const;
 			void describeErrorLogRecordsAsync(const Model::DescribeErrorLogRecordsRequest& request, const DescribeErrorLogRecordsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeErrorLogRecordsOutcomeCallable describeErrorLogRecordsCallable(const Model::DescribeErrorLogRecordsRequest& request) const;
-			DescribeIndexRecommendationOutcome describeIndexRecommendation(const Model::DescribeIndexRecommendationRequest &request)const;
-			void describeIndexRecommendationAsync(const Model::DescribeIndexRecommendationRequest& request, const DescribeIndexRecommendationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeIndexRecommendationOutcomeCallable describeIndexRecommendationCallable(const Model::DescribeIndexRecommendationRequest& request) const;
 			DescribeInstanceAutoRenewalAttributeOutcome describeInstanceAutoRenewalAttribute(const Model::DescribeInstanceAutoRenewalAttributeRequest &request)const;
 			void describeInstanceAutoRenewalAttributeAsync(const Model::DescribeInstanceAutoRenewalAttributeRequest& request, const DescribeInstanceAutoRenewalAttributeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeInstanceAutoRenewalAttributeOutcomeCallable describeInstanceAutoRenewalAttributeCallable(const Model::DescribeInstanceAutoRenewalAttributeRequest& request) const;

dds/include/alibabacloud/dds/model/CreateNodeRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setNodeType(const std::string& nodeType);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
+				int getReadonlyReplicas()const;
+				void setReadonlyReplicas(int readonlyReplicas);
 				std::string getNodeClass()const;
 				void setNodeClass(const std::string& nodeClass);
 				std::string getAccessKeyId()const;
@@ -66,6 +68,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				std::string nodeType_;
 				std::string clientToken_;
+				int readonlyReplicas_;
 				std::string nodeClass_;
 				std::string accessKeyId_;
 				std::string securityToken_;

dds/include/alibabacloud/dds/model/CreateShardingDBInstanceRequest.h

@@ -33,6 +33,7 @@ namespace AlibabaCloud
 			public:
 				struct ReplicaSet
 				{
+					int readonlyReplicas;
 					int storage;
 					std::string _class;
 				};
@@ -84,12 +85,12 @@ namespace AlibabaCloud
 				void setConfigServer(const std::vector<ConfigServer>& configServer);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::vector<Mongos> getMongos()const;
-				void setMongos(const std::vector<Mongos>& mongos);
 				std::string getSecurityIPList()const;
 				void setSecurityIPList(const std::string& securityIPList);
 				std::string getVSwitchId()const;
 				void setVSwitchId(const std::string& vSwitchId);
+				std::vector<Mongos> getMongos()const;
+				void setMongos(const std::vector<Mongos>& mongos);
 				std::string getAccountPassword()const;
 				void setAccountPassword(const std::string& accountPassword);
 				std::string getAutoRenew()const;
@@ -121,9 +122,9 @@ namespace AlibabaCloud
 				std::string ownerAccount_;
 				std::vector<ConfigServer> configServer_;
 				long ownerId_;
-				std::vector<Mongos> mongos_;
 				std::string securityIPList_;
 				std::string vSwitchId_;
+				std::vector<Mongos> mongos_;
 				std::string accountPassword_;
 				std::string autoRenew_;
 				std::string vpcId_;

dds/include/alibabacloud/dds/model/DescribeDBInstanceAttributeResult.h

@@ -51,10 +51,11 @@ namespace AlibabaCloud
 					{
 						std::string nodeClass;
 						std::string nodeDescription;
+						int readonlyReplicas;
 						int maxConnections;
 						int port;
-						std::string nodeId;
 						int nodeStorage;
+						std::string nodeId;
 						std::string connectString;
 						int maxIOPS;
 					};
@@ -64,26 +65,26 @@ namespace AlibabaCloud
 						std::string nodeDescription;
 						int maxConnections;
 						int port;
-						std::string nodeId;
 						int nodeStorage;
+						std::string nodeId;
 						std::string connectString;
 						int maxIOPS;
 					};
+					struct Tag
+					{
+						std::string value;
+						std::string key;
+					};
 					struct ReplicaSet
 					{
-						std::string replicaSetRole;
 						std::string connectionDomain;
+						std::string replicaSetRole;
 						std::string vPCCloudInstanceId;
-						std::string connectionPort;
 						std::string vPCId;
+						std::string connectionPort;
 						std::string networkType;
 						std::string vSwitchId;
 					};
-					struct Tag
-					{
-						std::string value;
-						std::string key;
-					};
 					std::string vPCCloudInstanceIds;
 					std::string resourceGroupId;
 					std::string dBInstanceType;
@@ -97,27 +98,27 @@ namespace AlibabaCloud
 					int dBInstanceStorage;
 					std::string lastDowngradeTime;
 					std::vector<DBInstance::Tag> tags;
-					std::string dBInstanceDescription;
 					std::string engine;
 					std::string maintainStartTime;
+					std::string dBInstanceDescription;
 					std::string replacateId;
 					bool dBInstanceReleaseProtection;
 					std::string engineVersion;
-					std::string zoneId;
-					std::string dBInstanceStatus;
 					std::string replicationFactor;
 					std::string readonlyReplicas;
 					int maxConnections;
+					std::string zoneId;
+					std::string dBInstanceStatus;
 					std::string dBInstanceClass;
 					std::string vPCId;
 					std::string vSwitchId;
 					std::vector<DBInstance::ShardAttribute> shardList;
 					std::string lockMode;
 					int maxIOPS;
-					std::string chargeType;
 					std::string currentKernelVersion;
 					std::string protocolType;
 					std::string vpcAuthMode;
+					std::string chargeType;
 					std::string creationTime;
 					std::vector<DBInstance::ConfigserverAttribute> configserverList;
 					std::string regionId;

dds/include/alibabacloud/dds/model/DescribeDBInstancesResult.h

@@ -44,6 +44,7 @@ namespace AlibabaCloud
 					{
 						std::string nodeClass;
 						std::string nodeDescription;
+						int readonlyReplicas;
 						std::string nodeId;
 						int nodeStorage;
 					};
@@ -53,10 +54,10 @@ namespace AlibabaCloud
 						std::string key;
 					};
 					std::string engineVersion;
-					std::string resourceGroupId;
+					std::string replicationFactor;
 					std::string zoneId;
+					std::string resourceGroupId;
 					std::string dBInstanceStatus;
-					std::string replicationFactor;
 					std::string dBInstanceClass;
 					std::string destroyTime;
 					std::vector<DBInstance::ShardAttribute> shardList;
@@ -64,9 +65,9 @@ namespace AlibabaCloud
 					std::string lockMode;
 					std::vector<DBInstance::MongosAttribute> mongosList;
 					std::string dBInstanceId;
-					std::string chargeType;
 					std::string networkType;
 					std::string vpcAuthMode;
+					std::string chargeType;
 					int dBInstanceStorage;
 					std::string lastDowngradeTime;
 					std::string creationTime;
@@ -74,8 +75,8 @@ namespace AlibabaCloud
 					std::string expireTime;
 					std::string kindCode;
 					std::vector<DBInstance::Tag> tags;
-					std::string dBInstanceDescription;
 					std::string engine;
+					std::string dBInstanceDescription;
 				};
 
 

dds/include/alibabacloud/dds/model/DescribeIndexRecommendationRequest.h

@@ -1,93 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_DDS_MODEL_DESCRIBEINDEXRECOMMENDATIONREQUEST_H_
-#define ALIBABACLOUD_DDS_MODEL_DESCRIBEINDEXRECOMMENDATIONREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/dds/DdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Dds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_DDS_EXPORT DescribeIndexRecommendationRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeIndexRecommendationRequest();
-				~DescribeIndexRecommendationRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getDatabase()const;
-				void setDatabase(const std::string& database);
-				std::string getSecurityToken()const;
-				void setSecurityToken(const std::string& securityToken);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getNodeId()const;
-				void setNodeId(const std::string& nodeId);
-				std::string getTaskId()const;
-				void setTaskId(const std::string& taskId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getOwnerAccount()const;
-				void setOwnerAccount(const std::string& ownerAccount);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				std::string getCollection()const;
-				void setCollection(const std::string& collection);
-				std::string getOperationType()const;
-				void setOperationType(const std::string& operationType);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getInstanceId()const;
-				void setInstanceId(const std::string& instanceId);
-
-            private:
-				long resourceOwnerId_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				std::string database_;
-				std::string securityToken_;
-				int pageSize_;
-				std::string nodeId_;
-				std::string taskId_;
-				std::string resourceOwnerAccount_;
-				std::string ownerAccount_;
-				std::string endTime_;
-				std::string collection_;
-				std::string operationType_;
-				long ownerId_;
-				std::string instanceId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEINDEXRECOMMENDATIONREQUEST_H_

dds/include/alibabacloud/dds/model/DescribeIndexRecommendationResult.h

@@ -1,81 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_DDS_MODEL_DESCRIBEINDEXRECOMMENDATIONRESULT_H_
-#define ALIBABACLOUD_DDS_MODEL_DESCRIBEINDEXRECOMMENDATIONRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/dds/DdsExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Dds
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_DDS_EXPORT DescribeIndexRecommendationResult : public ServiceResult
-			{
-			public:
-				struct Analyzation
-				{
-					struct Recommendation
-					{
-						std::string recmdType;
-						std::string content;
-					};
-					long averageReturnRowCount;
-					std::string query;
-					long totalExecutionTime;
-					std::vector<std::string> indexCombines;
-					long averageDocsExaminedCount;
-					std::string _namespace;
-					std::string operation;
-					long count;
-					std::vector<Analyzation::Recommendation> indexRecommendations;
-					long averageKeysExaminedCount;
-					std::string executionPlan;
-					std::string inMemorySort;
-					std::string database;
-					std::string lastExecutionTime;
-					std::string sort;
-					long averageExecutionTime;
-				};
-
-
-				DescribeIndexRecommendationResult();
-				explicit DescribeIndexRecommendationResult(const std::string &payload);
-				~DescribeIndexRecommendationResult();
-				int getTotalRecordCount()const;
-				int getPageRecordCount()const;
-				std::vector<Analyzation> getAnalyzations()const;
-				int getPageNumber()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				int totalRecordCount_;
-				int pageRecordCount_;
-				std::vector<Analyzation> analyzations_;
-				int pageNumber_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_DDS_MODEL_DESCRIBEINDEXRECOMMENDATIONRESULT_H_

dds/include/alibabacloud/dds/model/DescribeInstanceAutoRenewalAttributeRequest.h

@@ -37,16 +37,16 @@ namespace AlibabaCloud
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getPageNumber()const;
-				void setPageNumber(const std::string& pageNumber);
+				long getPageNumber()const;
+				void setPageNumber(long pageNumber);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
-				std::string getPageSize()const;
-				void setPageSize(const std::string& pageSize);
+				long getPageSize()const;
+				void setPageSize(long pageSize);
 				std::string getDBInstanceId()const;
 				void setDBInstanceId(const std::string& dBInstanceId);
 				std::string getResourceOwnerAccount()const;
@@ -60,11 +60,11 @@ namespace AlibabaCloud
 
             private:
 				long resourceOwnerId_;
-				std::string pageNumber_;
+				long pageNumber_;
 				std::string accessKeyId_;
 				std::string securityToken_;
 				std::string regionId_;
-				std::string pageSize_;
+				long pageSize_;
 				std::string dBInstanceId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;

dds/include/alibabacloud/dds/model/DescribePriceResult.h

@@ -48,12 +48,6 @@ namespace AlibabaCloud
 					std::string originalAmount;
 					std::string discountAmount;
 				};
-				struct Rule
-				{
-					long ruleDescId;
-					std::string title;
-					std::string name;
-				};
 				struct SubOrder
 				{
 					std::string instanceId;
@@ -62,6 +56,12 @@ namespace AlibabaCloud
 					std::string originalAmount;
 					std::string discountAmount;
 				};
+				struct Rule
+				{
+					long ruleDescId;
+					std::string title;
+					std::string name;
+				};
 
 
 				DescribePriceResult();

dds/include/alibabacloud/dds/model/DescribeRunningLogRecordsRequest.h

@@ -37,6 +37,8 @@ namespace AlibabaCloud
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getRoleId()const;
+				void setRoleId(const std::string& roleId);
 				std::string getStartTime()const;
 				void setStartTime(const std::string& startTime);
 				int getPageNumber()const;
@@ -70,6 +72,7 @@ namespace AlibabaCloud
 
             private:
 				long resourceOwnerId_;
+				std::string roleId_;
 				std::string startTime_;
 				int pageNumber_;
 				std::string accessKeyId_;

dds/include/alibabacloud/dds/model/DescribeSlowLogRecordsResult.h

@@ -40,10 +40,10 @@ namespace AlibabaCloud
 					long returnRowCounts;
 					std::string dBName;
 					long keysExamined;
-					std::string hostAddress;
 					long docsExamined;
-					std::string sQLText;
+					std::string hostAddress;
 					std::string accountName;
+					std::string sQLText;
 				};
 
 

dds/include/alibabacloud/dds/model/ModifyNodeSpecRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getClientToken()const;
 				void setClientToken(const std::string& clientToken);
+				int getReadonlyReplicas()const;
+				void setReadonlyReplicas(int readonlyReplicas);
 				std::string getNodeClass()const;
 				void setNodeClass(const std::string& nodeClass);
 				std::string getAccessKeyId()const;
@@ -69,6 +71,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string clientToken_;
+				int readonlyReplicas_;
 				std::string nodeClass_;
 				std::string accessKeyId_;
 				std::string securityToken_;

dds/src/DdsClient.cc

@@ -1275,42 +1275,6 @@ DdsClient::DescribeErrorLogRecordsOutcomeCallable DdsClient::describeErrorLogRec
 	return task->get_future();
 }
 
-DdsClient::DescribeIndexRecommendationOutcome DdsClient::describeIndexRecommendation(const DescribeIndexRecommendationRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeIndexRecommendationOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeIndexRecommendationOutcome(DescribeIndexRecommendationResult(outcome.result()));
-	else
-		return DescribeIndexRecommendationOutcome(outcome.error());
-}
-
-void DdsClient::describeIndexRecommendationAsync(const DescribeIndexRecommendationRequest& request, const DescribeIndexRecommendationAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeIndexRecommendation(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-DdsClient::DescribeIndexRecommendationOutcomeCallable DdsClient::describeIndexRecommendationCallable(const DescribeIndexRecommendationRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeIndexRecommendationOutcome()>>(
-			[this, request]()
-			{
-			return this->describeIndexRecommendation(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 DdsClient::DescribeInstanceAutoRenewalAttributeOutcome DdsClient::describeInstanceAutoRenewalAttribute(const DescribeInstanceAutoRenewalAttributeRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

dds/src/model/CreateDBInstanceResult.cc

@@ -39,10 +39,10 @@ void CreateDBInstanceResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["OrderId"].isNull())
-		orderId_ = value["OrderId"].asString();
 	if(!value["DBInstanceId"].isNull())
 		dBInstanceId_ = value["DBInstanceId"].asString();
+	if(!value["OrderId"].isNull())
+		orderId_ = value["OrderId"].asString();
 
 }
 

dds/src/model/CreateNodeRequest.cc

@@ -60,6 +60,17 @@ void CreateNodeRequest::setClientToken(const std::string& clientToken)
 	setParameter("ClientToken", clientToken);
 }
 
+int CreateNodeRequest::getReadonlyReplicas()const
+{
+	return readonlyReplicas_;
+}
+
+void CreateNodeRequest::setReadonlyReplicas(int readonlyReplicas)
+{
+	readonlyReplicas_ = readonlyReplicas;
+	setParameter("ReadonlyReplicas", std::to_string(readonlyReplicas));
+}
+
 std::string CreateNodeRequest::getNodeClass()const
 {
 	return nodeClass_;

dds/src/model/CreateNodeResult.cc

@@ -39,10 +39,10 @@ void CreateNodeResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	if(!value["OrderId"].isNull())
-		orderId_ = value["OrderId"].asString();
 	if(!value["NodeId"].isNull())
 		nodeId_ = value["NodeId"].asString();
+	if(!value["OrderId"].isNull())
+		orderId_ = value["OrderId"].asString();
 
 }
 

dds/src/model/CreateShardingDBInstanceRequest.cc

@@ -82,6 +82,7 @@ void CreateShardingDBInstanceRequest::setReplicaSet(const std::vector<ReplicaSet
 	for(int dep1 = 0; dep1!= replicaSet.size(); dep1++) {
 		auto replicaSetObj = replicaSet.at(dep1);
 		std::string replicaSetObjStr = "ReplicaSet." + std::to_string(dep1 + 1);
+		setParameter(replicaSetObjStr + ".ReadonlyReplicas", std::to_string(replicaSetObj.readonlyReplicas));
 		setParameter(replicaSetObjStr + ".Storage", std::to_string(replicaSetObj.storage));
 		setParameter(replicaSetObjStr + "._Class", replicaSetObj._class);
 	}
@@ -224,21 +225,6 @@ void CreateShardingDBInstanceRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::vector<CreateShardingDBInstanceRequest::Mongos> CreateShardingDBInstanceRequest::getMongos()const
-{
-	return mongos_;
-}
-
-void CreateShardingDBInstanceRequest::setMongos(const std::vector<Mongos>& mongos)
-{
-	mongos_ = mongos;
-	for(int dep1 = 0; dep1!= mongos.size(); dep1++) {
-		auto mongosObj = mongos.at(dep1);
-		std::string mongosObjStr = "Mongos." + std::to_string(dep1 + 1);
-		setParameter(mongosObjStr + "._Class", mongosObj._class);
-	}
-}
-
 std::string CreateShardingDBInstanceRequest::getSecurityIPList()const
 {
 	return securityIPList_;
@@ -261,6 +247,21 @@ void CreateShardingDBInstanceRequest::setVSwitchId(const std::string& vSwitchId)
 	setParameter("VSwitchId", vSwitchId);
 }
 
+std::vector<CreateShardingDBInstanceRequest::Mongos> CreateShardingDBInstanceRequest::getMongos()const
+{
+	return mongos_;
+}
+
+void CreateShardingDBInstanceRequest::setMongos(const std::vector<Mongos>& mongos)
+{
+	mongos_ = mongos;
+	for(int dep1 = 0; dep1!= mongos.size(); dep1++) {
+		auto mongosObj = mongos.at(dep1);
+		std::string mongosObjStr = "Mongos." + std::to_string(dep1 + 1);
+		setParameter(mongosObjStr + "._Class", mongosObj._class);
+	}
+}
+
 std::string CreateShardingDBInstanceRequest::getAccountPassword()const
 {
 	return accountPassword_;

dds/src/model/DescribeDBInstanceAttributeResult.cc

@@ -43,174 +43,176 @@ void DescribeDBInstanceAttributeResult::parse(const std::string &payload)
 	for (auto valueDBInstancesDBInstance : allDBInstancesNode)
 	{
 		DBInstance dBInstancesObject;
+		if(!valueDBInstancesDBInstance["VPCCloudInstanceIds"].isNull())
+			dBInstancesObject.vPCCloudInstanceIds = valueDBInstancesDBInstance["VPCCloudInstanceIds"].asString();
 		if(!valueDBInstancesDBInstance["ResourceGroupId"].isNull())
 			dBInstancesObject.resourceGroupId = valueDBInstancesDBInstance["ResourceGroupId"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceType"].isNull())
+			dBInstancesObject.dBInstanceType = valueDBInstancesDBInstance["DBInstanceType"].asString();
+		if(!valueDBInstancesDBInstance["ReplicaSetName"].isNull())
+			dBInstancesObject.replicaSetName = valueDBInstancesDBInstance["ReplicaSetName"].asString();
+		if(!valueDBInstancesDBInstance["StorageEngine"].isNull())
+			dBInstancesObject.storageEngine = valueDBInstancesDBInstance["StorageEngine"].asString();
+		if(!valueDBInstancesDBInstance["MaintainEndTime"].isNull())
+			dBInstancesObject.maintainEndTime = valueDBInstancesDBInstance["MaintainEndTime"].asString();
 		if(!valueDBInstancesDBInstance["DBInstanceId"].isNull())
 			dBInstancesObject.dBInstanceId = valueDBInstancesDBInstance["DBInstanceId"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceDescription"].isNull())
-			dBInstancesObject.dBInstanceDescription = valueDBInstancesDBInstance["DBInstanceDescription"].asString();
-		if(!valueDBInstancesDBInstance["RegionId"].isNull())
-			dBInstancesObject.regionId = valueDBInstancesDBInstance["RegionId"].asString();
-		if(!valueDBInstancesDBInstance["ZoneId"].isNull())
-			dBInstancesObject.zoneId = valueDBInstancesDBInstance["ZoneId"].asString();
+		if(!valueDBInstancesDBInstance["NetworkType"].isNull())
+			dBInstancesObject.networkType = valueDBInstancesDBInstance["NetworkType"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceStorage"].isNull())
+			dBInstancesObject.dBInstanceStorage = std::stoi(valueDBInstancesDBInstance["DBInstanceStorage"].asString());
+		if(!valueDBInstancesDBInstance["LastDowngradeTime"].isNull())
+			dBInstancesObject.lastDowngradeTime = valueDBInstancesDBInstance["LastDowngradeTime"].asString();
 		if(!valueDBInstancesDBInstance["Engine"].isNull())
 			dBInstancesObject.engine = valueDBInstancesDBInstance["Engine"].asString();
+		if(!valueDBInstancesDBInstance["MaintainStartTime"].isNull())
+			dBInstancesObject.maintainStartTime = valueDBInstancesDBInstance["MaintainStartTime"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceDescription"].isNull())
+			dBInstancesObject.dBInstanceDescription = valueDBInstancesDBInstance["DBInstanceDescription"].asString();
+		if(!valueDBInstancesDBInstance["ReplacateId"].isNull())
+			dBInstancesObject.replacateId = valueDBInstancesDBInstance["ReplacateId"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceReleaseProtection"].isNull())
+			dBInstancesObject.dBInstanceReleaseProtection = valueDBInstancesDBInstance["DBInstanceReleaseProtection"].asString() == "true";
 		if(!valueDBInstancesDBInstance["EngineVersion"].isNull())
 			dBInstancesObject.engineVersion = valueDBInstancesDBInstance["EngineVersion"].asString();
-		if(!valueDBInstancesDBInstance["StorageEngine"].isNull())
-			dBInstancesObject.storageEngine = valueDBInstancesDBInstance["StorageEngine"].asString();
+		if(!valueDBInstancesDBInstance["ReplicationFactor"].isNull())
+			dBInstancesObject.replicationFactor = valueDBInstancesDBInstance["ReplicationFactor"].asString();
+		if(!valueDBInstancesDBInstance["ReadonlyReplicas"].isNull())
+			dBInstancesObject.readonlyReplicas = valueDBInstancesDBInstance["ReadonlyReplicas"].asString();
+		if(!valueDBInstancesDBInstance["MaxConnections"].isNull())
+			dBInstancesObject.maxConnections = std::stoi(valueDBInstancesDBInstance["MaxConnections"].asString());
+		if(!valueDBInstancesDBInstance["ZoneId"].isNull())
+			dBInstancesObject.zoneId = valueDBInstancesDBInstance["ZoneId"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceStatus"].isNull())
+			dBInstancesObject.dBInstanceStatus = valueDBInstancesDBInstance["DBInstanceStatus"].asString();
 		if(!valueDBInstancesDBInstance["DBInstanceClass"].isNull())
 			dBInstancesObject.dBInstanceClass = valueDBInstancesDBInstance["DBInstanceClass"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceStorage"].isNull())
-			dBInstancesObject.dBInstanceStorage = std::stoi(valueDBInstancesDBInstance["DBInstanceStorage"].asString());
-		if(!valueDBInstancesDBInstance["ReplacateId"].isNull())
-			dBInstancesObject.replacateId = valueDBInstancesDBInstance["ReplacateId"].asString();
 		if(!valueDBInstancesDBInstance["VPCId"].isNull())
 			dBInstancesObject.vPCId = valueDBInstancesDBInstance["VPCId"].asString();
 		if(!valueDBInstancesDBInstance["VSwitchId"].isNull())
 			dBInstancesObject.vSwitchId = valueDBInstancesDBInstance["VSwitchId"].asString();
-		if(!valueDBInstancesDBInstance["VPCCloudInstanceIds"].isNull())
-			dBInstancesObject.vPCCloudInstanceIds = valueDBInstancesDBInstance["VPCCloudInstanceIds"].asString();
-		if(!valueDBInstancesDBInstance["KindCode"].isNull())
-			dBInstancesObject.kindCode = valueDBInstancesDBInstance["KindCode"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceStatus"].isNull())
-			dBInstancesObject.dBInstanceStatus = valueDBInstancesDBInstance["DBInstanceStatus"].asString();
 		if(!valueDBInstancesDBInstance["LockMode"].isNull())
 			dBInstancesObject.lockMode = valueDBInstancesDBInstance["LockMode"].asString();
-		if(!valueDBInstancesDBInstance["ChargeType"].isNull())
-			dBInstancesObject.chargeType = valueDBInstancesDBInstance["ChargeType"].asString();
-		if(!valueDBInstancesDBInstance["CreationTime"].isNull())
-			dBInstancesObject.creationTime = valueDBInstancesDBInstance["CreationTime"].asString();
-		if(!valueDBInstancesDBInstance["ReplicaSetName"].isNull())
-			dBInstancesObject.replicaSetName = valueDBInstancesDBInstance["ReplicaSetName"].asString();
-		if(!valueDBInstancesDBInstance["NetworkType"].isNull())
-			dBInstancesObject.networkType = valueDBInstancesDBInstance["NetworkType"].asString();
-		if(!valueDBInstancesDBInstance["ExpireTime"].isNull())
-			dBInstancesObject.expireTime = valueDBInstancesDBInstance["ExpireTime"].asString();
-		if(!valueDBInstancesDBInstance["MaintainStartTime"].isNull())
-			dBInstancesObject.maintainStartTime = valueDBInstancesDBInstance["MaintainStartTime"].asString();
-		if(!valueDBInstancesDBInstance["MaintainEndTime"].isNull())
-			dBInstancesObject.maintainEndTime = valueDBInstancesDBInstance["MaintainEndTime"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceType"].isNull())
-			dBInstancesObject.dBInstanceType = valueDBInstancesDBInstance["DBInstanceType"].asString();
-		if(!valueDBInstancesDBInstance["LastDowngradeTime"].isNull())
-			dBInstancesObject.lastDowngradeTime = valueDBInstancesDBInstance["LastDowngradeTime"].asString();
-		if(!valueDBInstancesDBInstance["ReplicationFactor"].isNull())
-			dBInstancesObject.replicationFactor = valueDBInstancesDBInstance["ReplicationFactor"].asString();
-		if(!valueDBInstancesDBInstance["ReadonlyReplicas"].isNull())
-			dBInstancesObject.readonlyReplicas = valueDBInstancesDBInstance["ReadonlyReplicas"].asString();
 		if(!valueDBInstancesDBInstance["MaxIOPS"].isNull())
 			dBInstancesObject.maxIOPS = std::stoi(valueDBInstancesDBInstance["MaxIOPS"].asString());
-		if(!valueDBInstancesDBInstance["MaxConnections"].isNull())
-			dBInstancesObject.maxConnections = std::stoi(valueDBInstancesDBInstance["MaxConnections"].asString());
 		if(!valueDBInstancesDBInstance["CurrentKernelVersion"].isNull())
 			dBInstancesObject.currentKernelVersion = valueDBInstancesDBInstance["CurrentKernelVersion"].asString();
 		if(!valueDBInstancesDBInstance["ProtocolType"].isNull())
 			dBInstancesObject.protocolType = valueDBInstancesDBInstance["ProtocolType"].asString();
 		if(!valueDBInstancesDBInstance["VpcAuthMode"].isNull())
 			dBInstancesObject.vpcAuthMode = valueDBInstancesDBInstance["VpcAuthMode"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceReleaseProtection"].isNull())
-			dBInstancesObject.dBInstanceReleaseProtection = valueDBInstancesDBInstance["DBInstanceReleaseProtection"].asString() == "true";
+		if(!valueDBInstancesDBInstance["ChargeType"].isNull())
+			dBInstancesObject.chargeType = valueDBInstancesDBInstance["ChargeType"].asString();
+		if(!valueDBInstancesDBInstance["CreationTime"].isNull())
+			dBInstancesObject.creationTime = valueDBInstancesDBInstance["CreationTime"].asString();
+		if(!valueDBInstancesDBInstance["RegionId"].isNull())
+			dBInstancesObject.regionId = valueDBInstancesDBInstance["RegionId"].asString();
+		if(!valueDBInstancesDBInstance["ExpireTime"].isNull())
+			dBInstancesObject.expireTime = valueDBInstancesDBInstance["ExpireTime"].asString();
+		if(!valueDBInstancesDBInstance["KindCode"].isNull())
+			dBInstancesObject.kindCode = valueDBInstancesDBInstance["KindCode"].asString();
 		auto allMongosListNode = valueDBInstancesDBInstance["MongosList"]["MongosAttribute"];
 		for (auto valueDBInstancesDBInstanceMongosListMongosAttribute : allMongosListNode)
 		{
 			DBInstance::MongosAttribute mongosListObject;
-			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].isNull())
-				mongosListObject.nodeId = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].asString();
-			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].isNull())
-				mongosListObject.nodeDescription = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].asString();
-			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeClass"].isNull())
-				mongosListObject.nodeClass = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeClass"].asString();
 			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["ConnectSting"].isNull())
 				mongosListObject.connectSting = valueDBInstancesDBInstanceMongosListMongosAttribute["ConnectSting"].asString();
-			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["MaxIOPS"].isNull())
-				mongosListObject.maxIOPS = std::stoi(valueDBInstancesDBInstanceMongosListMongosAttribute["MaxIOPS"].asString());
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeClass"].isNull())
+				mongosListObject.nodeClass = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeClass"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].isNull())
+				mongosListObject.nodeDescription = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].asString();
 			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["MaxConnections"].isNull())
 				mongosListObject.maxConnections = std::stoi(valueDBInstancesDBInstanceMongosListMongosAttribute["MaxConnections"].asString());
-			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["Port"].isNull())
-				mongosListObject.port = std::stoi(valueDBInstancesDBInstanceMongosListMongosAttribute["Port"].asString());
-			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["VpcCloudInstanceId"].isNull())
-				mongosListObject.vpcCloudInstanceId = valueDBInstancesDBInstanceMongosListMongosAttribute["VpcCloudInstanceId"].asString();
 			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["VPCId"].isNull())
 				mongosListObject.vPCId = valueDBInstancesDBInstanceMongosListMongosAttribute["VPCId"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["Port"].isNull())
+				mongosListObject.port = std::stoi(valueDBInstancesDBInstanceMongosListMongosAttribute["Port"].asString());
 			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["VSwitchId"].isNull())
 				mongosListObject.vSwitchId = valueDBInstancesDBInstanceMongosListMongosAttribute["VSwitchId"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].isNull())
+				mongosListObject.nodeId = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["VpcCloudInstanceId"].isNull())
+				mongosListObject.vpcCloudInstanceId = valueDBInstancesDBInstanceMongosListMongosAttribute["VpcCloudInstanceId"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["MaxIOPS"].isNull())
+				mongosListObject.maxIOPS = std::stoi(valueDBInstancesDBInstanceMongosListMongosAttribute["MaxIOPS"].asString());
 			dBInstancesObject.mongosList.push_back(mongosListObject);
 		}
 		auto allShardListNode = valueDBInstancesDBInstance["ShardList"]["ShardAttribute"];
 		for (auto valueDBInstancesDBInstanceShardListShardAttribute : allShardListNode)
 		{
 			DBInstance::ShardAttribute shardListObject;
-			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].isNull())
-				shardListObject.nodeId = valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].asString();
-			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].isNull())
-				shardListObject.nodeDescription = valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].asString();
 			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeClass"].isNull())
 				shardListObject.nodeClass = valueDBInstancesDBInstanceShardListShardAttribute["NodeClass"].asString();
-			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].isNull())
-				shardListObject.nodeStorage = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].asString());
-			if(!valueDBInstancesDBInstanceShardListShardAttribute["MaxIOPS"].isNull())
-				shardListObject.maxIOPS = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["MaxIOPS"].asString());
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].isNull())
+				shardListObject.nodeDescription = valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["ReadonlyReplicas"].isNull())
+				shardListObject.readonlyReplicas = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["ReadonlyReplicas"].asString());
 			if(!valueDBInstancesDBInstanceShardListShardAttribute["MaxConnections"].isNull())
 				shardListObject.maxConnections = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["MaxConnections"].asString());
-			if(!valueDBInstancesDBInstanceShardListShardAttribute["ConnectString"].isNull())
-				shardListObject.connectString = valueDBInstancesDBInstanceShardListShardAttribute["ConnectString"].asString();
 			if(!valueDBInstancesDBInstanceShardListShardAttribute["Port"].isNull())
 				shardListObject.port = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["Port"].asString());
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].isNull())
+				shardListObject.nodeStorage = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].asString());
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].isNull())
+				shardListObject.nodeId = valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["ConnectString"].isNull())
+				shardListObject.connectString = valueDBInstancesDBInstanceShardListShardAttribute["ConnectString"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["MaxIOPS"].isNull())
+				shardListObject.maxIOPS = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["MaxIOPS"].asString());
 			dBInstancesObject.shardList.push_back(shardListObject);
 		}
 		auto allConfigserverListNode = valueDBInstancesDBInstance["ConfigserverList"]["ConfigserverAttribute"];
 		for (auto valueDBInstancesDBInstanceConfigserverListConfigserverAttribute : allConfigserverListNode)
 		{
 			DBInstance::ConfigserverAttribute configserverListObject;
-			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeId"].isNull())
-				configserverListObject.nodeId = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeId"].asString();
-			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeDescription"].isNull())
-				configserverListObject.nodeDescription = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeDescription"].asString();
 			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeClass"].isNull())
 				configserverListObject.nodeClass = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeClass"].asString();
-			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeStorage"].isNull())
-				configserverListObject.nodeStorage = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeStorage"].asString());
-			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["MaxIOPS"].isNull())
-				configserverListObject.maxIOPS = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["MaxIOPS"].asString());
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeDescription"].isNull())
+				configserverListObject.nodeDescription = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeDescription"].asString();
 			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["MaxConnections"].isNull())
 				configserverListObject.maxConnections = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["MaxConnections"].asString());
-			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["ConnectString"].isNull())
-				configserverListObject.connectString = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["ConnectString"].asString();
 			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["Port"].isNull())
 				configserverListObject.port = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["Port"].asString());
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeStorage"].isNull())
+				configserverListObject.nodeStorage = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeStorage"].asString());
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeId"].isNull())
+				configserverListObject.nodeId = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["NodeId"].asString();
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["ConnectString"].isNull())
+				configserverListObject.connectString = valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["ConnectString"].asString();
+			if(!valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["MaxIOPS"].isNull())
+				configserverListObject.maxIOPS = std::stoi(valueDBInstancesDBInstanceConfigserverListConfigserverAttribute["MaxIOPS"].asString());
 			dBInstancesObject.configserverList.push_back(configserverListObject);
 		}
+		auto allTagsNode = valueDBInstancesDBInstance["Tags"]["Tag"];
+		for (auto valueDBInstancesDBInstanceTagsTag : allTagsNode)
+		{
+			DBInstance::Tag tagsObject;
+			if(!valueDBInstancesDBInstanceTagsTag["Value"].isNull())
+				tagsObject.value = valueDBInstancesDBInstanceTagsTag["Value"].asString();
+			if(!valueDBInstancesDBInstanceTagsTag["Key"].isNull())
+				tagsObject.key = valueDBInstancesDBInstanceTagsTag["Key"].asString();
+			dBInstancesObject.tags.push_back(tagsObject);
+		}
 		auto allReplicaSetsNode = valueDBInstancesDBInstance["ReplicaSets"]["ReplicaSet"];
 		for (auto valueDBInstancesDBInstanceReplicaSetsReplicaSet : allReplicaSetsNode)
 		{
 			DBInstance::ReplicaSet replicaSetsObject;
-			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["ReplicaSetRole"].isNull())
-				replicaSetsObject.replicaSetRole = valueDBInstancesDBInstanceReplicaSetsReplicaSet["ReplicaSetRole"].asString();
 			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["ConnectionDomain"].isNull())
 				replicaSetsObject.connectionDomain = valueDBInstancesDBInstanceReplicaSetsReplicaSet["ConnectionDomain"].asString();
-			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["ConnectionPort"].isNull())
-				replicaSetsObject.connectionPort = valueDBInstancesDBInstanceReplicaSetsReplicaSet["ConnectionPort"].asString();
+			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["ReplicaSetRole"].isNull())
+				replicaSetsObject.replicaSetRole = valueDBInstancesDBInstanceReplicaSetsReplicaSet["ReplicaSetRole"].asString();
 			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["VPCCloudInstanceId"].isNull())
 				replicaSetsObject.vPCCloudInstanceId = valueDBInstancesDBInstanceReplicaSetsReplicaSet["VPCCloudInstanceId"].asString();
 			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["VPCId"].isNull())
 				replicaSetsObject.vPCId = valueDBInstancesDBInstanceReplicaSetsReplicaSet["VPCId"].asString();
-			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["VSwitchId"].isNull())
-				replicaSetsObject.vSwitchId = valueDBInstancesDBInstanceReplicaSetsReplicaSet["VSwitchId"].asString();
+			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["ConnectionPort"].isNull())
+				replicaSetsObject.connectionPort = valueDBInstancesDBInstanceReplicaSetsReplicaSet["ConnectionPort"].asString();
 			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["NetworkType"].isNull())
 				replicaSetsObject.networkType = valueDBInstancesDBInstanceReplicaSetsReplicaSet["NetworkType"].asString();
+			if(!valueDBInstancesDBInstanceReplicaSetsReplicaSet["VSwitchId"].isNull())
+				replicaSetsObject.vSwitchId = valueDBInstancesDBInstanceReplicaSetsReplicaSet["VSwitchId"].asString();
 			dBInstancesObject.replicaSets.push_back(replicaSetsObject);
 		}
-		auto allTagsNode = valueDBInstancesDBInstance["Tags"]["Tag"];
-		for (auto valueDBInstancesDBInstanceTagsTag : allTagsNode)
-		{
-			DBInstance::Tag tagsObject;
-			if(!valueDBInstancesDBInstanceTagsTag["Key"].isNull())
-				tagsObject.key = valueDBInstancesDBInstanceTagsTag["Key"].asString();
-			if(!valueDBInstancesDBInstanceTagsTag["Value"].isNull())
-				tagsObject.value = valueDBInstancesDBInstanceTagsTag["Value"].asString();
-			dBInstancesObject.tags.push_back(tagsObject);
-		}
 		dBInstances_.push_back(dBInstancesObject);
 	}
 

dds/src/model/DescribeDBInstancesResult.cc

@@ -43,70 +43,72 @@ void DescribeDBInstancesResult::parse(const std::string &payload)
 	for (auto valueDBInstancesDBInstance : allDBInstancesNode)
 	{
 		DBInstance dBInstancesObject;
-		if(!valueDBInstancesDBInstance["ResourceGroupId"].isNull())
-			dBInstancesObject.resourceGroupId = valueDBInstancesDBInstance["ResourceGroupId"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceId"].isNull())
-			dBInstancesObject.dBInstanceId = valueDBInstancesDBInstance["DBInstanceId"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceDescription"].isNull())
-			dBInstancesObject.dBInstanceDescription = valueDBInstancesDBInstance["DBInstanceDescription"].asString();
-		if(!valueDBInstancesDBInstance["RegionId"].isNull())
-			dBInstancesObject.regionId = valueDBInstancesDBInstance["RegionId"].asString();
-		if(!valueDBInstancesDBInstance["ZoneId"].isNull())
-			dBInstancesObject.zoneId = valueDBInstancesDBInstance["ZoneId"].asString();
-		if(!valueDBInstancesDBInstance["Engine"].isNull())
-			dBInstancesObject.engine = valueDBInstancesDBInstance["Engine"].asString();
 		if(!valueDBInstancesDBInstance["EngineVersion"].isNull())
 			dBInstancesObject.engineVersion = valueDBInstancesDBInstance["EngineVersion"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceClass"].isNull())
-			dBInstancesObject.dBInstanceClass = valueDBInstancesDBInstance["DBInstanceClass"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceStorage"].isNull())
-			dBInstancesObject.dBInstanceStorage = std::stoi(valueDBInstancesDBInstance["DBInstanceStorage"].asString());
-		if(!valueDBInstancesDBInstance["KindCode"].isNull())
-			dBInstancesObject.kindCode = valueDBInstancesDBInstance["KindCode"].asString();
+		if(!valueDBInstancesDBInstance["ReplicationFactor"].isNull())
+			dBInstancesObject.replicationFactor = valueDBInstancesDBInstance["ReplicationFactor"].asString();
+		if(!valueDBInstancesDBInstance["ZoneId"].isNull())
+			dBInstancesObject.zoneId = valueDBInstancesDBInstance["ZoneId"].asString();
+		if(!valueDBInstancesDBInstance["ResourceGroupId"].isNull())
+			dBInstancesObject.resourceGroupId = valueDBInstancesDBInstance["ResourceGroupId"].asString();
 		if(!valueDBInstancesDBInstance["DBInstanceStatus"].isNull())
 			dBInstancesObject.dBInstanceStatus = valueDBInstancesDBInstance["DBInstanceStatus"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceClass"].isNull())
+			dBInstancesObject.dBInstanceClass = valueDBInstancesDBInstance["DBInstanceClass"].asString();
+		if(!valueDBInstancesDBInstance["DestroyTime"].isNull())
+			dBInstancesObject.destroyTime = valueDBInstancesDBInstance["DestroyTime"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceType"].isNull())
+			dBInstancesObject.dBInstanceType = valueDBInstancesDBInstance["DBInstanceType"].asString();
 		if(!valueDBInstancesDBInstance["LockMode"].isNull())
 			dBInstancesObject.lockMode = valueDBInstancesDBInstance["LockMode"].asString();
-		if(!valueDBInstancesDBInstance["ChargeType"].isNull())
-			dBInstancesObject.chargeType = valueDBInstancesDBInstance["ChargeType"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceId"].isNull())
+			dBInstancesObject.dBInstanceId = valueDBInstancesDBInstance["DBInstanceId"].asString();
 		if(!valueDBInstancesDBInstance["NetworkType"].isNull())
 			dBInstancesObject.networkType = valueDBInstancesDBInstance["NetworkType"].asString();
+		if(!valueDBInstancesDBInstance["VpcAuthMode"].isNull())
+			dBInstancesObject.vpcAuthMode = valueDBInstancesDBInstance["VpcAuthMode"].asString();
+		if(!valueDBInstancesDBInstance["ChargeType"].isNull())
+			dBInstancesObject.chargeType = valueDBInstancesDBInstance["ChargeType"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceStorage"].isNull())
+			dBInstancesObject.dBInstanceStorage = std::stoi(valueDBInstancesDBInstance["DBInstanceStorage"].asString());
+		if(!valueDBInstancesDBInstance["LastDowngradeTime"].isNull())
+			dBInstancesObject.lastDowngradeTime = valueDBInstancesDBInstance["LastDowngradeTime"].asString();
 		if(!valueDBInstancesDBInstance["CreationTime"].isNull())
 			dBInstancesObject.creationTime = valueDBInstancesDBInstance["CreationTime"].asString();
+		if(!valueDBInstancesDBInstance["RegionId"].isNull())
+			dBInstancesObject.regionId = valueDBInstancesDBInstance["RegionId"].asString();
 		if(!valueDBInstancesDBInstance["ExpireTime"].isNull())
 			dBInstancesObject.expireTime = valueDBInstancesDBInstance["ExpireTime"].asString();
-		if(!valueDBInstancesDBInstance["DBInstanceType"].isNull())
-			dBInstancesObject.dBInstanceType = valueDBInstancesDBInstance["DBInstanceType"].asString();
-		if(!valueDBInstancesDBInstance["LastDowngradeTime"].isNull())
-			dBInstancesObject.lastDowngradeTime = valueDBInstancesDBInstance["LastDowngradeTime"].asString();
-		if(!valueDBInstancesDBInstance["ReplicationFactor"].isNull())
-			dBInstancesObject.replicationFactor = valueDBInstancesDBInstance["ReplicationFactor"].asString();
-		if(!valueDBInstancesDBInstance["DestroyTime"].isNull())
-			dBInstancesObject.destroyTime = valueDBInstancesDBInstance["DestroyTime"].asString();
-		if(!valueDBInstancesDBInstance["VpcAuthMode"].isNull())
-			dBInstancesObject.vpcAuthMode = valueDBInstancesDBInstance["VpcAuthMode"].asString();
+		if(!valueDBInstancesDBInstance["KindCode"].isNull())
+			dBInstancesObject.kindCode = valueDBInstancesDBInstance["KindCode"].asString();
+		if(!valueDBInstancesDBInstance["Engine"].isNull())
+			dBInstancesObject.engine = valueDBInstancesDBInstance["Engine"].asString();
+		if(!valueDBInstancesDBInstance["DBInstanceDescription"].isNull())
+			dBInstancesObject.dBInstanceDescription = valueDBInstancesDBInstance["DBInstanceDescription"].asString();
 		auto allMongosListNode = valueDBInstancesDBInstance["MongosList"]["MongosAttribute"];
 		for (auto valueDBInstancesDBInstanceMongosListMongosAttribute : allMongosListNode)
 		{
 			DBInstance::MongosAttribute mongosListObject;
-			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].isNull())
-				mongosListObject.nodeId = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].asString();
-			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].isNull())
-				mongosListObject.nodeDescription = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].asString();
 			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeClass"].isNull())
 				mongosListObject.nodeClass = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeClass"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].isNull())
+				mongosListObject.nodeDescription = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeDescription"].asString();
+			if(!valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].isNull())
+				mongosListObject.nodeId = valueDBInstancesDBInstanceMongosListMongosAttribute["NodeId"].asString();
 			dBInstancesObject.mongosList.push_back(mongosListObject);
 		}
 		auto allShardListNode = valueDBInstancesDBInstance["ShardList"]["ShardAttribute"];
 		for (auto valueDBInstancesDBInstanceShardListShardAttribute : allShardListNode)
 		{
 			DBInstance::ShardAttribute shardListObject;
-			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].isNull())
-				shardListObject.nodeId = valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].asString();
-			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].isNull())
-				shardListObject.nodeDescription = valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].asString();
 			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeClass"].isNull())
 				shardListObject.nodeClass = valueDBInstancesDBInstanceShardListShardAttribute["NodeClass"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].isNull())
+				shardListObject.nodeDescription = valueDBInstancesDBInstanceShardListShardAttribute["NodeDescription"].asString();
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["ReadonlyReplicas"].isNull())
+				shardListObject.readonlyReplicas = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["ReadonlyReplicas"].asString());
+			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].isNull())
+				shardListObject.nodeId = valueDBInstancesDBInstanceShardListShardAttribute["NodeId"].asString();
 			if(!valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].isNull())
 				shardListObject.nodeStorage = std::stoi(valueDBInstancesDBInstanceShardListShardAttribute["NodeStorage"].asString());
 			dBInstancesObject.shardList.push_back(shardListObject);
@@ -115,20 +117,20 @@ void DescribeDBInstancesResult::parse(const std::string &payload)
 		for (auto valueDBInstancesDBInstanceTagsTag : allTagsNode)
 		{
 			DBInstance::Tag tagsObject;
-			if(!valueDBInstancesDBInstanceTagsTag["Key"].isNull())
-				tagsObject.key = valueDBInstancesDBInstanceTagsTag["Key"].asString();
 			if(!valueDBInstancesDBInstanceTagsTag["Value"].isNull())
 				tagsObject.value = valueDBInstancesDBInstanceTagsTag["Value"].asString();
+			if(!valueDBInstancesDBInstanceTagsTag["Key"].isNull())
+				tagsObject.key = valueDBInstancesDBInstanceTagsTag["Key"].asString();
 			dBInstancesObject.tags.push_back(tagsObject);
 		}
 		dBInstances_.push_back(dBInstancesObject);
 	}
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
-	if(!value["PageSize"].isNull())
-		pageSize_ = std::stoi(value["PageSize"].asString());
 	if(!value["TotalCount"].isNull())
 		totalCount_ = std::stoi(value["TotalCount"].asString());
+	if(!value["PageSize"].isNull())
+		pageSize_ = std::stoi(value["PageSize"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
 
 }
 

dds/src/model/DescribeErrorLogRecordsResult.cc

@@ -43,26 +43,26 @@ void DescribeErrorLogRecordsResult::parse(const std::string &payload)
 	for (auto valueItemsLogRecords : allItemsNode)
 	{
 		LogRecords itemsObject;
-		if(!valueItemsLogRecords["Id"].isNull())
-			itemsObject.id = std::stoi(valueItemsLogRecords["Id"].asString());
-		if(!valueItemsLogRecords["CreateTime"].isNull())
-			itemsObject.createTime = valueItemsLogRecords["CreateTime"].asString();
-		if(!valueItemsLogRecords["Category"].isNull())
-			itemsObject.category = valueItemsLogRecords["Category"].asString();
 		if(!valueItemsLogRecords["ConnInfo"].isNull())
 			itemsObject.connInfo = valueItemsLogRecords["ConnInfo"].asString();
+		if(!valueItemsLogRecords["Category"].isNull())
+			itemsObject.category = valueItemsLogRecords["Category"].asString();
 		if(!valueItemsLogRecords["Content"].isNull())
 			itemsObject.content = valueItemsLogRecords["Content"].asString();
+		if(!valueItemsLogRecords["CreateTime"].isNull())
+			itemsObject.createTime = valueItemsLogRecords["CreateTime"].asString();
+		if(!valueItemsLogRecords["Id"].isNull())
+			itemsObject.id = std::stoi(valueItemsLogRecords["Id"].asString());
 		items_.push_back(itemsObject);
 	}
-	if(!value["Engine"].isNull())
-		engine_ = value["Engine"].asString();
 	if(!value["TotalRecordCount"].isNull())
 		totalRecordCount_ = std::stoi(value["TotalRecordCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
 	if(!value["PageRecordCount"].isNull())
 		pageRecordCount_ = std::stoi(value["PageRecordCount"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
+	if(!value["Engine"].isNull())
+		engine_ = value["Engine"].asString();
 
 }
 

dds/src/model/DescribeIndexRecommendationRequest.cc

@@ -1,205 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/dds/model/DescribeIndexRecommendationRequest.h>
-
-using AlibabaCloud::Dds::Model::DescribeIndexRecommendationRequest;
-
-DescribeIndexRecommendationRequest::DescribeIndexRecommendationRequest() :
-	RpcServiceRequest("dds", "2015-12-01", "DescribeIndexRecommendation")
-{
-	setMethod(HttpRequest::Method::Post);
-}
-
-DescribeIndexRecommendationRequest::~DescribeIndexRecommendationRequest()
-{}
-
-long DescribeIndexRecommendationRequest::getResourceOwnerId()const
-{
-	return resourceOwnerId_;
-}
-
-void DescribeIndexRecommendationRequest::setResourceOwnerId(long resourceOwnerId)
-{
-	resourceOwnerId_ = resourceOwnerId;
-	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
-}
-
-std::string DescribeIndexRecommendationRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void DescribeIndexRecommendationRequest::setStartTime(const std::string& startTime)
-{
-	startTime_ = startTime;
-	setParameter("StartTime", startTime);
-}
-
-int DescribeIndexRecommendationRequest::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-void DescribeIndexRecommendationRequest::setPageNumber(int pageNumber)
-{
-	pageNumber_ = pageNumber;
-	setParameter("PageNumber", std::to_string(pageNumber));
-}
-
-std::string DescribeIndexRecommendationRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeIndexRecommendationRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-
-std::string DescribeIndexRecommendationRequest::getDatabase()const
-{
-	return database_;
-}
-
-void DescribeIndexRecommendationRequest::setDatabase(const std::string& database)
-{
-	database_ = database;
-	setParameter("Database", database);
-}
-
-std::string DescribeIndexRecommendationRequest::getSecurityToken()const
-{
-	return securityToken_;
-}
-
-void DescribeIndexRecommendationRequest::setSecurityToken(const std::string& securityToken)
-{
-	securityToken_ = securityToken;
-	setParameter("SecurityToken", securityToken);
-}
-
-int DescribeIndexRecommendationRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void DescribeIndexRecommendationRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setParameter("PageSize", std::to_string(pageSize));
-}
-
-std::string DescribeIndexRecommendationRequest::getNodeId()const
-{
-	return nodeId_;
-}
-
-void DescribeIndexRecommendationRequest::setNodeId(const std::string& nodeId)
-{
-	nodeId_ = nodeId;
-	setParameter("NodeId", nodeId);
-}
-
-std::string DescribeIndexRecommendationRequest::getTaskId()const
-{
-	return taskId_;
-}
-
-void DescribeIndexRecommendationRequest::setTaskId(const std::string& taskId)
-{
-	taskId_ = taskId;
-	setParameter("TaskId", taskId);
-}
-
-std::string DescribeIndexRecommendationRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeIndexRecommendationRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string DescribeIndexRecommendationRequest::getOwnerAccount()const
-{
-	return ownerAccount_;
-}
-
-void DescribeIndexRecommendationRequest::setOwnerAccount(const std::string& ownerAccount)
-{
-	ownerAccount_ = ownerAccount;
-	setParameter("OwnerAccount", ownerAccount);
-}
-
-std::string DescribeIndexRecommendationRequest::getEndTime()const
-{
-	return endTime_;
-}
-
-void DescribeIndexRecommendationRequest::setEndTime(const std::string& endTime)
-{
-	endTime_ = endTime;
-	setParameter("EndTime", endTime);
-}
-
-std::string DescribeIndexRecommendationRequest::getCollection()const
-{
-	return collection_;
-}
-
-void DescribeIndexRecommendationRequest::setCollection(const std::string& collection)
-{
-	collection_ = collection;
-	setParameter("Collection", collection);
-}
-
-std::string DescribeIndexRecommendationRequest::getOperationType()const
-{
-	return operationType_;
-}
-
-void DescribeIndexRecommendationRequest::setOperationType(const std::string& operationType)
-{
-	operationType_ = operationType;
-	setParameter("OperationType", operationType);
-}
-
-long DescribeIndexRecommendationRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeIndexRecommendationRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string DescribeIndexRecommendationRequest::getInstanceId()const
-{
-	return instanceId_;
-}
-
-void DescribeIndexRecommendationRequest::setInstanceId(const std::string& instanceId)
-{
-	instanceId_ = instanceId;
-	setParameter("InstanceId", instanceId);
-}
-

dds/src/model/DescribeIndexRecommendationResult.cc

@@ -1,117 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/dds/model/DescribeIndexRecommendationResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Dds;
-using namespace AlibabaCloud::Dds::Model;
-
-DescribeIndexRecommendationResult::DescribeIndexRecommendationResult() :
-	ServiceResult()
-{}
-
-DescribeIndexRecommendationResult::DescribeIndexRecommendationResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeIndexRecommendationResult::~DescribeIndexRecommendationResult()
-{}
-
-void DescribeIndexRecommendationResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allAnalyzationsNode = value["Analyzations"]["Analyzation"];
-	for (auto valueAnalyzationsAnalyzation : allAnalyzationsNode)
-	{
-		Analyzation analyzationsObject;
-		if(!valueAnalyzationsAnalyzation["Database"].isNull())
-			analyzationsObject.database = valueAnalyzationsAnalyzation["Database"].asString();
-		if(!valueAnalyzationsAnalyzation["Namespace"].isNull())
-			analyzationsObject._namespace = valueAnalyzationsAnalyzation["Namespace"].asString();
-		if(!valueAnalyzationsAnalyzation["Operation"].isNull())
-			analyzationsObject.operation = valueAnalyzationsAnalyzation["Operation"].asString();
-		if(!valueAnalyzationsAnalyzation["Query"].isNull())
-			analyzationsObject.query = valueAnalyzationsAnalyzation["Query"].asString();
-		if(!valueAnalyzationsAnalyzation["Sort"].isNull())
-			analyzationsObject.sort = valueAnalyzationsAnalyzation["Sort"].asString();
-		if(!valueAnalyzationsAnalyzation["Count"].isNull())
-			analyzationsObject.count = std::stol(valueAnalyzationsAnalyzation["Count"].asString());
-		if(!valueAnalyzationsAnalyzation["TotalExecutionTime"].isNull())
-			analyzationsObject.totalExecutionTime = std::stol(valueAnalyzationsAnalyzation["TotalExecutionTime"].asString());
-		if(!valueAnalyzationsAnalyzation["AverageExecutionTime"].isNull())
-			analyzationsObject.averageExecutionTime = std::stol(valueAnalyzationsAnalyzation["AverageExecutionTime"].asString());
-		if(!valueAnalyzationsAnalyzation["AverageReturnRowCount"].isNull())
-			analyzationsObject.averageReturnRowCount = std::stol(valueAnalyzationsAnalyzation["AverageReturnRowCount"].asString());
-		if(!valueAnalyzationsAnalyzation["AverageDocsExaminedCount"].isNull())
-			analyzationsObject.averageDocsExaminedCount = std::stol(valueAnalyzationsAnalyzation["AverageDocsExaminedCount"].asString());
-		if(!valueAnalyzationsAnalyzation["AverageKeysExaminedCount"].isNull())
-			analyzationsObject.averageKeysExaminedCount = std::stol(valueAnalyzationsAnalyzation["AverageKeysExaminedCount"].asString());
-		if(!valueAnalyzationsAnalyzation["InMemorySort"].isNull())
-			analyzationsObject.inMemorySort = valueAnalyzationsAnalyzation["InMemorySort"].asString();
-		if(!valueAnalyzationsAnalyzation["LastExecutionTime"].isNull())
-			analyzationsObject.lastExecutionTime = valueAnalyzationsAnalyzation["LastExecutionTime"].asString();
-		if(!valueAnalyzationsAnalyzation["ExecutionPlan"].isNull())
-			analyzationsObject.executionPlan = valueAnalyzationsAnalyzation["ExecutionPlan"].asString();
-		auto allIndexRecommendationsNode = valueAnalyzationsAnalyzation["IndexRecommendations"]["Recommendation"];
-		for (auto valueAnalyzationsAnalyzationIndexRecommendationsRecommendation : allIndexRecommendationsNode)
-		{
-			Analyzation::Recommendation indexRecommendationsObject;
-			if(!valueAnalyzationsAnalyzationIndexRecommendationsRecommendation["RecmdType"].isNull())
-				indexRecommendationsObject.recmdType = valueAnalyzationsAnalyzationIndexRecommendationsRecommendation["RecmdType"].asString();
-			if(!valueAnalyzationsAnalyzationIndexRecommendationsRecommendation["Content"].isNull())
-				indexRecommendationsObject.content = valueAnalyzationsAnalyzationIndexRecommendationsRecommendation["Content"].asString();
-			analyzationsObject.indexRecommendations.push_back(indexRecommendationsObject);
-		}
-		auto allIndexCombines = value["IndexCombines"]["IndexCombine"];
-		for (auto value : allIndexCombines)
-			analyzationsObject.indexCombines.push_back(value.asString());
-		analyzations_.push_back(analyzationsObject);
-	}
-	if(!value["TotalRecordCount"].isNull())
-		totalRecordCount_ = std::stoi(value["TotalRecordCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
-	if(!value["PageRecordCount"].isNull())
-		pageRecordCount_ = std::stoi(value["PageRecordCount"].asString());
-
-}
-
-int DescribeIndexRecommendationResult::getTotalRecordCount()const
-{
-	return totalRecordCount_;
-}
-
-int DescribeIndexRecommendationResult::getPageRecordCount()const
-{
-	return pageRecordCount_;
-}
-
-std::vector<DescribeIndexRecommendationResult::Analyzation> DescribeIndexRecommendationResult::getAnalyzations()const
-{
-	return analyzations_;
-}
-
-int DescribeIndexRecommendationResult::getPageNumber()const
-{
-	return pageNumber_;
-}
-

dds/src/model/DescribeInstanceAutoRenewalAttributeRequest.cc

@@ -38,15 +38,15 @@ void DescribeInstanceAutoRenewalAttributeRequest::setResourceOwnerId(long resour
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
-std::string DescribeInstanceAutoRenewalAttributeRequest::getPageNumber()const
+long DescribeInstanceAutoRenewalAttributeRequest::getPageNumber()const
 {
 	return pageNumber_;
 }
 
-void DescribeInstanceAutoRenewalAttributeRequest::setPageNumber(const std::string& pageNumber)
+void DescribeInstanceAutoRenewalAttributeRequest::setPageNumber(long pageNumber)
 {
 	pageNumber_ = pageNumber;
-	setParameter("PageNumber", pageNumber);
+	setParameter("PageNumber", std::to_string(pageNumber));
 }
 
 std::string DescribeInstanceAutoRenewalAttributeRequest::getAccessKeyId()const
@@ -82,15 +82,15 @@ void DescribeInstanceAutoRenewalAttributeRequest::setRegionId(const std::string&
 	setParameter("RegionId", regionId);
 }
 
-std::string DescribeInstanceAutoRenewalAttributeRequest::getPageSize()const
+long DescribeInstanceAutoRenewalAttributeRequest::getPageSize()const
 {
 	return pageSize_;
 }
 
-void DescribeInstanceAutoRenewalAttributeRequest::setPageSize(const std::string& pageSize)
+void DescribeInstanceAutoRenewalAttributeRequest::setPageSize(long pageSize)
 {
 	pageSize_ = pageSize;
-	setParameter("PageSize", pageSize);
+	setParameter("PageSize", std::to_string(pageSize));
 }
 
 std::string DescribeInstanceAutoRenewalAttributeRequest::getDBInstanceId()const

dds/src/model/DescribeInstanceAutoRenewalAttributeResult.cc

@@ -43,24 +43,24 @@ void DescribeInstanceAutoRenewalAttributeResult::parse(const std::string &payloa
 	for (auto valueItemsItem : allItemsNode)
 	{
 		Item itemsObject;
-		if(!valueItemsItem["DbInstanceId"].isNull())
-			itemsObject.dbInstanceId = valueItemsItem["DbInstanceId"].asString();
-		if(!valueItemsItem["RegionId"].isNull())
-			itemsObject.regionId = valueItemsItem["RegionId"].asString();
-		if(!valueItemsItem["Duration"].isNull())
-			itemsObject.duration = valueItemsItem["Duration"].asString();
 		if(!valueItemsItem["AutoRenew"].isNull())
 			itemsObject.autoRenew = valueItemsItem["AutoRenew"].asString();
 		if(!valueItemsItem["DBInstanceType"].isNull())
 			itemsObject.dBInstanceType = valueItemsItem["DBInstanceType"].asString();
+		if(!valueItemsItem["Duration"].isNull())
+			itemsObject.duration = valueItemsItem["Duration"].asString();
+		if(!valueItemsItem["RegionId"].isNull())
+			itemsObject.regionId = valueItemsItem["RegionId"].asString();
+		if(!valueItemsItem["DbInstanceId"].isNull())
+			itemsObject.dbInstanceId = valueItemsItem["DbInstanceId"].asString();
 		items_.push_back(itemsObject);
 	}
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
-	if(!value["PageRecordCount"].isNull())
-		pageRecordCount_ = std::stoi(value["PageRecordCount"].asString());
 	if(!value["ItemsNumbers"].isNull())
 		itemsNumbers_ = std::stoi(value["ItemsNumbers"].asString());
+	if(!value["PageRecordCount"].isNull())
+		pageRecordCount_ = std::stoi(value["PageRecordCount"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
 
 }
 

dds/src/model/DescribePriceResult.cc

@@ -39,56 +39,56 @@ void DescribePriceResult::parse(const std::string &payload)
 	Json::Value value;
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
-	auto allRulesNode = value["Rules"]["Rule"];
-	for (auto valueRulesRule : allRulesNode)
-	{
-		Rule rulesObject;
-		if(!valueRulesRule["RuleDescId"].isNull())
-			rulesObject.ruleDescId = std::stol(valueRulesRule["RuleDescId"].asString());
-		if(!valueRulesRule["Name"].isNull())
-			rulesObject.name = valueRulesRule["Name"].asString();
-		if(!valueRulesRule["Title"].isNull())
-			rulesObject.title = valueRulesRule["Title"].asString();
-		rules_.push_back(rulesObject);
-	}
 	auto allSubOrdersNode = value["SubOrders"]["SubOrder"];
 	for (auto valueSubOrdersSubOrder : allSubOrdersNode)
 	{
 		SubOrder subOrdersObject;
-		if(!valueSubOrdersSubOrder["OriginalAmount"].isNull())
-			subOrdersObject.originalAmount = valueSubOrdersSubOrder["OriginalAmount"].asString();
+		if(!valueSubOrdersSubOrder["InstanceId"].isNull())
+			subOrdersObject.instanceId = valueSubOrdersSubOrder["InstanceId"].asString();
 		if(!valueSubOrdersSubOrder["TradeAmount"].isNull())
 			subOrdersObject.tradeAmount = valueSubOrdersSubOrder["TradeAmount"].asString();
+		if(!valueSubOrdersSubOrder["OriginalAmount"].isNull())
+			subOrdersObject.originalAmount = valueSubOrdersSubOrder["OriginalAmount"].asString();
 		if(!valueSubOrdersSubOrder["DiscountAmount"].isNull())
 			subOrdersObject.discountAmount = valueSubOrdersSubOrder["DiscountAmount"].asString();
-		if(!valueSubOrdersSubOrder["InstanceId"].isNull())
-			subOrdersObject.instanceId = valueSubOrdersSubOrder["InstanceId"].asString();
 		auto allRuleIds = value["RuleIds"]["RuleId"];
 		for (auto value : allRuleIds)
 			subOrdersObject.ruleIds.push_back(value.asString());
 		subOrders_.push_back(subOrdersObject);
 	}
+	auto allRulesNode = value["Rules"]["Rule"];
+	for (auto valueRulesRule : allRulesNode)
+	{
+		Rule rulesObject;
+		if(!valueRulesRule["RuleDescId"].isNull())
+			rulesObject.ruleDescId = std::stol(valueRulesRule["RuleDescId"].asString());
+		if(!valueRulesRule["Title"].isNull())
+			rulesObject.title = valueRulesRule["Title"].asString();
+		if(!valueRulesRule["Name"].isNull())
+			rulesObject.name = valueRulesRule["Name"].asString();
+		rules_.push_back(rulesObject);
+	}
 	auto orderNode = value["Order"];
-	if(!orderNode["OriginalAmount"].isNull())
-		order_.originalAmount = orderNode["OriginalAmount"].asString();
+	if(!orderNode["Currency"].isNull())
+		order_.currency = orderNode["Currency"].asString();
 	if(!orderNode["TradeAmount"].isNull())
 		order_.tradeAmount = orderNode["TradeAmount"].asString();
+	if(!orderNode["OriginalAmount"].isNull())
+		order_.originalAmount = orderNode["OriginalAmount"].asString();
 	if(!orderNode["DiscountAmount"].isNull())
 		order_.discountAmount = orderNode["DiscountAmount"].asString();
-	if(!orderNode["Currency"].isNull())
-		order_.currency = orderNode["Currency"].asString();
 	auto allCouponsNode = orderNode["Coupons"]["Coupon"];
 	for (auto orderNodeCouponsCoupon : allCouponsNode)
 	{
 		Order::Coupon couponObject;
 		if(!orderNodeCouponsCoupon["CouponNo"].isNull())
 			couponObject.couponNo = orderNodeCouponsCoupon["CouponNo"].asString();
-		if(!orderNodeCouponsCoupon["Name"].isNull())
-			couponObject.name = orderNodeCouponsCoupon["Name"].asString();
 		if(!orderNodeCouponsCoupon["Description"].isNull())
 			couponObject.description = orderNodeCouponsCoupon["Description"].asString();
 		if(!orderNodeCouponsCoupon["IsSelected"].isNull())
 			couponObject.isSelected = orderNodeCouponsCoupon["IsSelected"].asString();
+		if(!orderNodeCouponsCoupon["Name"].isNull())
+			couponObject.name = orderNodeCouponsCoupon["Name"].asString();
 		order_.coupons.push_back(couponObject);
 	}
 		auto allRuleIds1 = orderNode["RuleIds"]["RuleId"];

dds/src/model/DescribeRunningLogRecordsRequest.cc

@@ -38,6 +38,17 @@ void DescribeRunningLogRecordsRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
+std::string DescribeRunningLogRecordsRequest::getRoleId()const
+{
+	return roleId_;
+}
+
+void DescribeRunningLogRecordsRequest::setRoleId(const std::string& roleId)
+{
+	roleId_ = roleId;
+	setParameter("RoleId", roleId);
+}
+
 std::string DescribeRunningLogRecordsRequest::getStartTime()const
 {
 	return startTime_;

dds/src/model/DescribeRunningLogRecordsResult.cc

@@ -43,26 +43,26 @@ void DescribeRunningLogRecordsResult::parse(const std::string &payload)
 	for (auto valueItemsLogRecords : allItemsNode)
 	{
 		LogRecords itemsObject;
-		if(!valueItemsLogRecords["Id"].isNull())
-			itemsObject.id = std::stoi(valueItemsLogRecords["Id"].asString());
-		if(!valueItemsLogRecords["CreateTime"].isNull())
-			itemsObject.createTime = valueItemsLogRecords["CreateTime"].asString();
-		if(!valueItemsLogRecords["Category"].isNull())
-			itemsObject.category = valueItemsLogRecords["Category"].asString();
 		if(!valueItemsLogRecords["ConnInfo"].isNull())
 			itemsObject.connInfo = valueItemsLogRecords["ConnInfo"].asString();
+		if(!valueItemsLogRecords["Category"].isNull())
+			itemsObject.category = valueItemsLogRecords["Category"].asString();
 		if(!valueItemsLogRecords["Content"].isNull())
 			itemsObject.content = valueItemsLogRecords["Content"].asString();
+		if(!valueItemsLogRecords["CreateTime"].isNull())
+			itemsObject.createTime = valueItemsLogRecords["CreateTime"].asString();
+		if(!valueItemsLogRecords["Id"].isNull())
+			itemsObject.id = std::stoi(valueItemsLogRecords["Id"].asString());
 		items_.push_back(itemsObject);
 	}
-	if(!value["Engine"].isNull())
-		engine_ = value["Engine"].asString();
 	if(!value["TotalRecordCount"].isNull())
 		totalRecordCount_ = std::stoi(value["TotalRecordCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
 	if(!value["PageRecordCount"].isNull())
 		pageRecordCount_ = std::stoi(value["PageRecordCount"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
+	if(!value["Engine"].isNull())
+		engine_ = value["Engine"].asString();
 
 }
 

dds/src/model/DescribeSlowLogRecordsResult.cc

@@ -43,36 +43,36 @@ void DescribeSlowLogRecordsResult::parse(const std::string &payload)
 	for (auto valueItemsLogRecords : allItemsNode)
 	{
 		LogRecords itemsObject;
-		if(!valueItemsLogRecords["HostAddress"].isNull())
-			itemsObject.hostAddress = valueItemsLogRecords["HostAddress"].asString();
-		if(!valueItemsLogRecords["DBName"].isNull())
-			itemsObject.dBName = valueItemsLogRecords["DBName"].asString();
-		if(!valueItemsLogRecords["SQLText"].isNull())
-			itemsObject.sQLText = valueItemsLogRecords["SQLText"].asString();
+		if(!valueItemsLogRecords["TableName"].isNull())
+			itemsObject.tableName = valueItemsLogRecords["TableName"].asString();
 		if(!valueItemsLogRecords["QueryTimes"].isNull())
 			itemsObject.queryTimes = valueItemsLogRecords["QueryTimes"].asString();
-		if(!valueItemsLogRecords["DocsExamined"].isNull())
-			itemsObject.docsExamined = std::stol(valueItemsLogRecords["DocsExamined"].asString());
-		if(!valueItemsLogRecords["KeysExamined"].isNull())
-			itemsObject.keysExamined = std::stol(valueItemsLogRecords["KeysExamined"].asString());
-		if(!valueItemsLogRecords["ReturnRowCounts"].isNull())
-			itemsObject.returnRowCounts = std::stol(valueItemsLogRecords["ReturnRowCounts"].asString());
 		if(!valueItemsLogRecords["ExecutionStartTime"].isNull())
 			itemsObject.executionStartTime = valueItemsLogRecords["ExecutionStartTime"].asString();
+		if(!valueItemsLogRecords["ReturnRowCounts"].isNull())
+			itemsObject.returnRowCounts = std::stol(valueItemsLogRecords["ReturnRowCounts"].asString());
+		if(!valueItemsLogRecords["DBName"].isNull())
+			itemsObject.dBName = valueItemsLogRecords["DBName"].asString();
+		if(!valueItemsLogRecords["KeysExamined"].isNull())
+			itemsObject.keysExamined = std::stol(valueItemsLogRecords["KeysExamined"].asString());
+		if(!valueItemsLogRecords["DocsExamined"].isNull())
+			itemsObject.docsExamined = std::stol(valueItemsLogRecords["DocsExamined"].asString());
+		if(!valueItemsLogRecords["HostAddress"].isNull())
+			itemsObject.hostAddress = valueItemsLogRecords["HostAddress"].asString();
 		if(!valueItemsLogRecords["AccountName"].isNull())
 			itemsObject.accountName = valueItemsLogRecords["AccountName"].asString();
-		if(!valueItemsLogRecords["TableName"].isNull())
-			itemsObject.tableName = valueItemsLogRecords["TableName"].asString();
+		if(!valueItemsLogRecords["SQLText"].isNull())
+			itemsObject.sQLText = valueItemsLogRecords["SQLText"].asString();
 		items_.push_back(itemsObject);
 	}
-	if(!value["Engine"].isNull())
-		engine_ = value["Engine"].asString();
 	if(!value["TotalRecordCount"].isNull())
 		totalRecordCount_ = std::stoi(value["TotalRecordCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
 	if(!value["PageRecordCount"].isNull())
 		pageRecordCount_ = std::stoi(value["PageRecordCount"].asString());
+	if(!value["PageNumber"].isNull())
+		pageNumber_ = std::stoi(value["PageNumber"].asString());
+	if(!value["Engine"].isNull())
+		engine_ = value["Engine"].asString();
 
 }
 

dds/src/model/ModifyNodeSpecRequest.cc

@@ -49,6 +49,17 @@ void ModifyNodeSpecRequest::setClientToken(const std::string& clientToken)
 	setParameter("ClientToken", clientToken);
 }
 
+int ModifyNodeSpecRequest::getReadonlyReplicas()const
+{
+	return readonlyReplicas_;
+}
+
+void ModifyNodeSpecRequest::setReadonlyReplicas(int readonlyReplicas)
+{
+	readonlyReplicas_ = readonlyReplicas;
+	setParameter("ReadonlyReplicas", std::to_string(readonlyReplicas));
+}
+
 std::string ModifyNodeSpecRequest::getNodeClass()const
 {
 	return nodeClass_;