diff --git a/VERSION b/VERSION index fccab387d..50eae7da9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1782 \ No newline at end of file +1.36.1783 \ No newline at end of file diff --git a/adb/CMakeLists.txt b/adb/CMakeLists.txt index 3d28d4af2..ef864a228 100644 --- a/adb/CMakeLists.txt +++ b/adb/CMakeLists.txt @@ -135,8 +135,6 @@ set(adb_public_header_model include/alibabacloud/adb/model/DescribeProcessListResult.h include/alibabacloud/adb/model/DescribeRegionsRequest.h include/alibabacloud/adb/model/DescribeRegionsResult.h - include/alibabacloud/adb/model/DescribeSQLPatternAttributeRequest.h - include/alibabacloud/adb/model/DescribeSQLPatternAttributeResult.h include/alibabacloud/adb/model/DescribeSQLPatternsRequest.h include/alibabacloud/adb/model/DescribeSQLPatternsResult.h include/alibabacloud/adb/model/DescribeSQLPlanRequest.h @@ -344,8 +342,6 @@ set(adb_src src/model/DescribeProcessListResult.cc src/model/DescribeRegionsRequest.cc src/model/DescribeRegionsResult.cc - src/model/DescribeSQLPatternAttributeRequest.cc - src/model/DescribeSQLPatternAttributeResult.cc src/model/DescribeSQLPatternsRequest.cc src/model/DescribeSQLPatternsResult.cc src/model/DescribeSQLPlanRequest.cc diff --git a/adb/include/alibabacloud/adb/AdbClient.h b/adb/include/alibabacloud/adb/AdbClient.h index ccd336e62..3be6169b8 100644 --- a/adb/include/alibabacloud/adb/AdbClient.h +++ b/adb/include/alibabacloud/adb/AdbClient.h @@ -136,8 +136,6 @@ #include "model/DescribeProcessListResult.h" #include "model/DescribeRegionsRequest.h" #include "model/DescribeRegionsResult.h" -#include "model/DescribeSQLPatternAttributeRequest.h" -#include "model/DescribeSQLPatternAttributeResult.h" #include "model/DescribeSQLPatternsRequest.h" #include "model/DescribeSQLPatternsResult.h" #include "model/DescribeSQLPlanRequest.h" @@ -408,9 +406,6 @@ namespace AlibabaCloud typedef Outcome DescribeRegionsOutcome; typedef std::future DescribeRegionsOutcomeCallable; typedef std::function&)> DescribeRegionsAsyncHandler; - typedef Outcome DescribeSQLPatternAttributeOutcome; - typedef std::future DescribeSQLPatternAttributeOutcomeCallable; - typedef std::function&)> DescribeSQLPatternAttributeAsyncHandler; typedef Outcome DescribeSQLPatternsOutcome; typedef std::future DescribeSQLPatternsOutcomeCallable; typedef std::function&)> DescribeSQLPatternsAsyncHandler; @@ -722,9 +717,6 @@ namespace AlibabaCloud DescribeRegionsOutcome describeRegions(const Model::DescribeRegionsRequest &request)const; void describeRegionsAsync(const Model::DescribeRegionsRequest& request, const DescribeRegionsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeRegionsOutcomeCallable describeRegionsCallable(const Model::DescribeRegionsRequest& request) const; - DescribeSQLPatternAttributeOutcome describeSQLPatternAttribute(const Model::DescribeSQLPatternAttributeRequest &request)const; - void describeSQLPatternAttributeAsync(const Model::DescribeSQLPatternAttributeRequest& request, const DescribeSQLPatternAttributeAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; - DescribeSQLPatternAttributeOutcomeCallable describeSQLPatternAttributeCallable(const Model::DescribeSQLPatternAttributeRequest& request) const; DescribeSQLPatternsOutcome describeSQLPatterns(const Model::DescribeSQLPatternsRequest &request)const; void describeSQLPatternsAsync(const Model::DescribeSQLPatternsRequest& request, const DescribeSQLPatternsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeSQLPatternsOutcomeCallable describeSQLPatternsCallable(const Model::DescribeSQLPatternsRequest& request) const; diff --git a/adb/include/alibabacloud/adb/model/DescribeDBClusterPerformanceRequest.h b/adb/include/alibabacloud/adb/model/DescribeDBClusterPerformanceRequest.h index d1d525b03..ef93bea8a 100644 --- a/adb/include/alibabacloud/adb/model/DescribeDBClusterPerformanceRequest.h +++ b/adb/include/alibabacloud/adb/model/DescribeDBClusterPerformanceRequest.h @@ -32,12 +32,6 @@ public: ~DescribeDBClusterPerformanceRequest(); long getResourceOwnerId() const; void setResourceOwnerId(long resourceOwnerId); - std::string getStartTime() const; - void setStartTime(const std::string &startTime); - std::string getAccessKeyId() const; - void setAccessKeyId(const std::string &accessKeyId); - std::string getKey() const; - void setKey(const std::string &key); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getDBClusterId() const; @@ -46,19 +40,31 @@ public: void setOwnerAccount(const std::string &ownerAccount); std::string getEndTime() const; void setEndTime(const std::string &endTime); + std::string getStartTime() const; + void setStartTime(const std::string &startTime); long getOwnerId() const; void setOwnerId(long ownerId); + std::string getAccessKeyId() const; + void setAccessKeyId(const std::string &accessKeyId); + std::string getRegionId() const; + void setRegionId(const std::string ®ionId); + std::string getResourcePools() const; + void setResourcePools(const std::string &resourcePools); + std::string getKey() const; + void setKey(const std::string &key); private: long resourceOwnerId_; - std::string startTime_; - std::string accessKeyId_; - std::string key_; std::string resourceOwnerAccount_; std::string dBClusterId_; std::string ownerAccount_; std::string endTime_; + std::string startTime_; long ownerId_; + std::string accessKeyId_; + std::string regionId_; + std::string resourcePools_; + std::string key_; }; } // namespace Model } // namespace Adb diff --git a/adb/include/alibabacloud/adb/model/DescribeDBClusterPerformanceResult.h b/adb/include/alibabacloud/adb/model/DescribeDBClusterPerformanceResult.h index 669057c9d..ce47cb1ca 100644 --- a/adb/include/alibabacloud/adb/model/DescribeDBClusterPerformanceResult.h +++ b/adb/include/alibabacloud/adb/model/DescribeDBClusterPerformanceResult.h @@ -37,6 +37,7 @@ namespace AlibabaCloud struct SeriesItem { std::vector values; + std::string tags; std::string name; }; std::vector series; diff --git a/adb/include/alibabacloud/adb/model/DescribeSQLPatternAttributeRequest.h b/adb/include/alibabacloud/adb/model/DescribeSQLPatternAttributeRequest.h deleted file mode 100644 index ef6efb207..000000000 --- a/adb/include/alibabacloud/adb/model/DescribeSQLPatternAttributeRequest.h +++ /dev/null @@ -1,57 +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_ADB_MODEL_DESCRIBESQLPATTERNATTRIBUTEREQUEST_H_ -#define ALIBABACLOUD_ADB_MODEL_DESCRIBESQLPATTERNATTRIBUTEREQUEST_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud { -namespace Adb { -namespace Model { -class ALIBABACLOUD_ADB_EXPORT DescribeSQLPatternAttributeRequest : public RpcServiceRequest { -public: - DescribeSQLPatternAttributeRequest(); - ~DescribeSQLPatternAttributeRequest(); - std::string getDBClusterId() const; - void setDBClusterId(const std::string &dBClusterId); - long getPatternId() const; - void setPatternId(long patternId); - std::string getEndTime() const; - void setEndTime(const std::string &endTime); - std::string getStartTime() const; - void setStartTime(const std::string &startTime); - std::string getRegionId() const; - void setRegionId(const std::string ®ionId); - std::string getLang() const; - void setLang(const std::string &lang); - -private: - std::string dBClusterId_; - long patternId_; - std::string endTime_; - std::string startTime_; - std::string regionId_; - std::string lang_; -}; -} // namespace Model -} // namespace Adb -} // namespace AlibabaCloud -#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBESQLPATTERNATTRIBUTEREQUEST_H_ diff --git a/adb/include/alibabacloud/adb/model/DescribeSQLPatternAttributeResult.h b/adb/include/alibabacloud/adb/model/DescribeSQLPatternAttributeResult.h deleted file mode 100644 index 807cdd9c7..000000000 --- a/adb/include/alibabacloud/adb/model/DescribeSQLPatternAttributeResult.h +++ /dev/null @@ -1,59 +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_ADB_MODEL_DESCRIBESQLPATTERNATTRIBUTERESULT_H_ -#define ALIBABACLOUD_ADB_MODEL_DESCRIBESQLPATTERNATTRIBUTERESULT_H_ - -#include -#include -#include -#include -#include - -namespace AlibabaCloud -{ - namespace Adb - { - namespace Model - { - class ALIBABACLOUD_ADB_EXPORT DescribeSQLPatternAttributeResult : public ServiceResult - { - public: - struct PatternDetail - { - std::string sQLPattern; - std::string totalQueryTime; - std::string averageMemory; - long queryCount; - std::string averageQueryTime; - }; - - - DescribeSQLPatternAttributeResult(); - explicit DescribeSQLPatternAttributeResult(const std::string &payload); - ~DescribeSQLPatternAttributeResult(); - PatternDetail getPatternDetail()const; - - protected: - void parse(const std::string &payload); - private: - PatternDetail patternDetail_; - - }; - } - } -} -#endif // !ALIBABACLOUD_ADB_MODEL_DESCRIBESQLPATTERNATTRIBUTERESULT_H_ \ No newline at end of file diff --git a/adb/src/AdbClient.cc b/adb/src/AdbClient.cc index a32dea609..68a00b837 100644 --- a/adb/src/AdbClient.cc +++ b/adb/src/AdbClient.cc @@ -2103,42 +2103,6 @@ AdbClient::DescribeRegionsOutcomeCallable AdbClient::describeRegionsCallable(con return task->get_future(); } -AdbClient::DescribeSQLPatternAttributeOutcome AdbClient::describeSQLPatternAttribute(const DescribeSQLPatternAttributeRequest &request) const -{ - auto endpointOutcome = endpointProvider_->getEndpoint(); - if (!endpointOutcome.isSuccess()) - return DescribeSQLPatternAttributeOutcome(endpointOutcome.error()); - - auto outcome = makeRequest(endpointOutcome.result(), request); - - if (outcome.isSuccess()) - return DescribeSQLPatternAttributeOutcome(DescribeSQLPatternAttributeResult(outcome.result())); - else - return DescribeSQLPatternAttributeOutcome(outcome.error()); -} - -void AdbClient::describeSQLPatternAttributeAsync(const DescribeSQLPatternAttributeRequest& request, const DescribeSQLPatternAttributeAsyncHandler& handler, const std::shared_ptr& context) const -{ - auto fn = [this, request, handler, context]() - { - handler(this, request, describeSQLPatternAttribute(request), context); - }; - - asyncExecute(new Runnable(fn)); -} - -AdbClient::DescribeSQLPatternAttributeOutcomeCallable AdbClient::describeSQLPatternAttributeCallable(const DescribeSQLPatternAttributeRequest &request) const -{ - auto task = std::make_shared>( - [this, request]() - { - return this->describeSQLPatternAttribute(request); - }); - - asyncExecute(new Runnable([task]() { (*task)(); })); - return task->get_future(); -} - AdbClient::DescribeSQLPatternsOutcome AdbClient::describeSQLPatterns(const DescribeSQLPatternsRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/adb/src/model/DescribeDBClusterPerformanceRequest.cc b/adb/src/model/DescribeDBClusterPerformanceRequest.cc index 466aa84bb..534e2a062 100644 --- a/adb/src/model/DescribeDBClusterPerformanceRequest.cc +++ b/adb/src/model/DescribeDBClusterPerformanceRequest.cc @@ -34,33 +34,6 @@ void DescribeDBClusterPerformanceRequest::setResourceOwnerId(long resourceOwnerI setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId)); } -std::string DescribeDBClusterPerformanceRequest::getStartTime() const { - return startTime_; -} - -void DescribeDBClusterPerformanceRequest::setStartTime(const std::string &startTime) { - startTime_ = startTime; - setParameter(std::string("StartTime"), startTime); -} - -std::string DescribeDBClusterPerformanceRequest::getAccessKeyId() const { - return accessKeyId_; -} - -void DescribeDBClusterPerformanceRequest::setAccessKeyId(const std::string &accessKeyId) { - accessKeyId_ = accessKeyId; - setParameter(std::string("AccessKeyId"), accessKeyId); -} - -std::string DescribeDBClusterPerformanceRequest::getKey() const { - return key_; -} - -void DescribeDBClusterPerformanceRequest::setKey(const std::string &key) { - key_ = key; - setParameter(std::string("Key"), key); -} - std::string DescribeDBClusterPerformanceRequest::getResourceOwnerAccount() const { return resourceOwnerAccount_; } @@ -97,6 +70,15 @@ void DescribeDBClusterPerformanceRequest::setEndTime(const std::string &endTime) setParameter(std::string("EndTime"), endTime); } +std::string DescribeDBClusterPerformanceRequest::getStartTime() const { + return startTime_; +} + +void DescribeDBClusterPerformanceRequest::setStartTime(const std::string &startTime) { + startTime_ = startTime; + setParameter(std::string("StartTime"), startTime); +} + long DescribeDBClusterPerformanceRequest::getOwnerId() const { return ownerId_; } @@ -106,3 +88,39 @@ void DescribeDBClusterPerformanceRequest::setOwnerId(long ownerId) { setParameter(std::string("OwnerId"), std::to_string(ownerId)); } +std::string DescribeDBClusterPerformanceRequest::getAccessKeyId() const { + return accessKeyId_; +} + +void DescribeDBClusterPerformanceRequest::setAccessKeyId(const std::string &accessKeyId) { + accessKeyId_ = accessKeyId; + setParameter(std::string("AccessKeyId"), accessKeyId); +} + +std::string DescribeDBClusterPerformanceRequest::getRegionId() const { + return regionId_; +} + +void DescribeDBClusterPerformanceRequest::setRegionId(const std::string ®ionId) { + regionId_ = regionId; + setParameter(std::string("RegionId"), regionId); +} + +std::string DescribeDBClusterPerformanceRequest::getResourcePools() const { + return resourcePools_; +} + +void DescribeDBClusterPerformanceRequest::setResourcePools(const std::string &resourcePools) { + resourcePools_ = resourcePools; + setParameter(std::string("ResourcePools"), resourcePools); +} + +std::string DescribeDBClusterPerformanceRequest::getKey() const { + return key_; +} + +void DescribeDBClusterPerformanceRequest::setKey(const std::string &key) { + key_ = key; + setParameter(std::string("Key"), key); +} + diff --git a/adb/src/model/DescribeDBClusterPerformanceResult.cc b/adb/src/model/DescribeDBClusterPerformanceResult.cc index a1d84aff7..b21460d16 100644 --- a/adb/src/model/DescribeDBClusterPerformanceResult.cc +++ b/adb/src/model/DescribeDBClusterPerformanceResult.cc @@ -53,6 +53,8 @@ void DescribeDBClusterPerformanceResult::parse(const std::string &payload) PerformanceItem::SeriesItem seriesObject; if(!valuePerformancesPerformanceItemSeriesSeriesItem["Name"].isNull()) seriesObject.name = valuePerformancesPerformanceItemSeriesSeriesItem["Name"].asString(); + if(!valuePerformancesPerformanceItemSeriesSeriesItem["Tags"].isNull()) + seriesObject.tags = valuePerformancesPerformanceItemSeriesSeriesItem["Tags"].asString(); auto allValues = value["Values"]["Values"]; for (auto value : allValues) seriesObject.values.push_back(value.asString()); diff --git a/adb/src/model/DescribeSQLPatternAttributeRequest.cc b/adb/src/model/DescribeSQLPatternAttributeRequest.cc deleted file mode 100644 index 1e9201d2b..000000000 --- a/adb/src/model/DescribeSQLPatternAttributeRequest.cc +++ /dev/null @@ -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. - */ - -#include - -using AlibabaCloud::Adb::Model::DescribeSQLPatternAttributeRequest; - -DescribeSQLPatternAttributeRequest::DescribeSQLPatternAttributeRequest() - : RpcServiceRequest("adb", "2019-03-15", "DescribeSQLPatternAttribute") { - setMethod(HttpRequest::Method::Post); -} - -DescribeSQLPatternAttributeRequest::~DescribeSQLPatternAttributeRequest() {} - -std::string DescribeSQLPatternAttributeRequest::getDBClusterId() const { - return dBClusterId_; -} - -void DescribeSQLPatternAttributeRequest::setDBClusterId(const std::string &dBClusterId) { - dBClusterId_ = dBClusterId; - setParameter(std::string("DBClusterId"), dBClusterId); -} - -long DescribeSQLPatternAttributeRequest::getPatternId() const { - return patternId_; -} - -void DescribeSQLPatternAttributeRequest::setPatternId(long patternId) { - patternId_ = patternId; - setParameter(std::string("PatternId"), std::to_string(patternId)); -} - -std::string DescribeSQLPatternAttributeRequest::getEndTime() const { - return endTime_; -} - -void DescribeSQLPatternAttributeRequest::setEndTime(const std::string &endTime) { - endTime_ = endTime; - setParameter(std::string("EndTime"), endTime); -} - -std::string DescribeSQLPatternAttributeRequest::getStartTime() const { - return startTime_; -} - -void DescribeSQLPatternAttributeRequest::setStartTime(const std::string &startTime) { - startTime_ = startTime; - setParameter(std::string("StartTime"), startTime); -} - -std::string DescribeSQLPatternAttributeRequest::getRegionId() const { - return regionId_; -} - -void DescribeSQLPatternAttributeRequest::setRegionId(const std::string ®ionId) { - regionId_ = regionId; - setParameter(std::string("RegionId"), regionId); -} - -std::string DescribeSQLPatternAttributeRequest::getLang() const { - return lang_; -} - -void DescribeSQLPatternAttributeRequest::setLang(const std::string &lang) { - lang_ = lang; - setParameter(std::string("Lang"), lang); -} - diff --git a/adb/src/model/DescribeSQLPatternAttributeResult.cc b/adb/src/model/DescribeSQLPatternAttributeResult.cc deleted file mode 100644 index 0d8deb7cc..000000000 --- a/adb/src/model/DescribeSQLPatternAttributeResult.cc +++ /dev/null @@ -1,60 +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 -#include - -using namespace AlibabaCloud::Adb; -using namespace AlibabaCloud::Adb::Model; - -DescribeSQLPatternAttributeResult::DescribeSQLPatternAttributeResult() : - ServiceResult() -{} - -DescribeSQLPatternAttributeResult::DescribeSQLPatternAttributeResult(const std::string &payload) : - ServiceResult() -{ - parse(payload); -} - -DescribeSQLPatternAttributeResult::~DescribeSQLPatternAttributeResult() -{} - -void DescribeSQLPatternAttributeResult::parse(const std::string &payload) -{ - Json::Reader reader; - Json::Value value; - reader.parse(payload, value); - setRequestId(value["RequestId"].asString()); - auto patternDetailNode = value["PatternDetail"]; - if(!patternDetailNode["SQLPattern"].isNull()) - patternDetail_.sQLPattern = patternDetailNode["SQLPattern"].asString(); - if(!patternDetailNode["QueryCount"].isNull()) - patternDetail_.queryCount = std::stol(patternDetailNode["QueryCount"].asString()); - if(!patternDetailNode["TotalQueryTime"].isNull()) - patternDetail_.totalQueryTime = patternDetailNode["TotalQueryTime"].asString(); - if(!patternDetailNode["AverageQueryTime"].isNull()) - patternDetail_.averageQueryTime = patternDetailNode["AverageQueryTime"].asString(); - if(!patternDetailNode["AverageMemory"].isNull()) - patternDetail_.averageMemory = patternDetailNode["AverageMemory"].asString(); - -} - -DescribeSQLPatternAttributeResult::PatternDetail DescribeSQLPatternAttributeResult::getPatternDetail()const -{ - return patternDetail_; -} -