Support restart node list and re-elect zookeeper.

Author: sdk-team

VERSION

@@ -1 +1 @@
-1.36.2076
+1.36.2077

clickhouse/CMakeLists.txt

@@ -0,0 +1,32 @@
+/*
+ * 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_CLICKHOUSE_CLICKHOUSEEXPORT_H_
+#define ALIBABACLOUD_CLICKHOUSE_CLICKHOUSEEXPORT_H_
+
+#include <alibabacloud/core/Global.h>
+
+#if defined(ALIBABACLOUD_SHARED)
+#	if defined(ALIBABACLOUD_CLICKHOUSE_LIBRARY)
+#		define ALIBABACLOUD_CLICKHOUSE_EXPORT ALIBABACLOUD_DECL_EXPORT
+#	else
+#		define ALIBABACLOUD_CLICKHOUSE_EXPORT ALIBABACLOUD_DECL_IMPORT
+#	endif
+#else
+#	define ALIBABACLOUD_CLICKHOUSE_EXPORT
+#endif
+
+#endif // !ALIBABACLOUD_CLICKHOUSE_CLICKHOUSEEXPORT_H_

clickhouse/include/alibabacloud/clickhouse/ClickhouseClient.h

@@ -0,0 +1,60 @@
+/*
+ * 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_CLICKHOUSE_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONREQUEST_H_
+#define ALIBABACLOUD_CLICKHOUSE_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONREQUEST_H_
+
+#include <alibabacloud/clickhouse/ClickhouseExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Clickhouse {
+namespace Model {
+class ALIBABACLOUD_CLICKHOUSE_EXPORT AllocateClusterPublicConnectionRequest : public RpcServiceRequest {
+public:
+	AllocateClusterPublicConnectionRequest();
+	~AllocateClusterPublicConnectionRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getConnectionStringPrefix() const;
+	void setConnectionStringPrefix(const std::string &connectionStringPrefix);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+
+private:
+	long resourceOwnerId_;
+	std::string connectionStringPrefix_;
+	std::string accessKeyId_;
+	std::string resourceOwnerAccount_;
+	std::string dBClusterId_;
+	std::string ownerAccount_;
+	long ownerId_;
+};
+} // namespace Model
+} // namespace Clickhouse
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_CLICKHOUSE_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONREQUEST_H_

clickhouse/include/alibabacloud/clickhouse/ClickhouseExport.h

@@ -0,0 +1,49 @@
+/*
+ * 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_CLICKHOUSE_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONRESULT_H_
+#define ALIBABACLOUD_CLICKHOUSE_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/clickhouse/ClickhouseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Clickhouse
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLICKHOUSE_EXPORT AllocateClusterPublicConnectionResult : public ServiceResult
+			{
+			public:
+
+
+				AllocateClusterPublicConnectionResult();
+				explicit AllocateClusterPublicConnectionResult(const std::string &payload);
+				~AllocateClusterPublicConnectionResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLICKHOUSE_MODEL_ALLOCATECLUSTERPUBLICCONNECTIONRESULT_H_

clickhouse/include/alibabacloud/clickhouse/model/AllocateClusterPublicConnectionRequest.h

@@ -0,0 +1,84 @@
+/*
+ * 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_CLICKHOUSE_MODEL_CHECKCLICKHOUSETORDSREQUEST_H_
+#define ALIBABACLOUD_CLICKHOUSE_MODEL_CHECKCLICKHOUSETORDSREQUEST_H_
+
+#include <alibabacloud/clickhouse/ClickhouseExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Clickhouse {
+namespace Model {
+class ALIBABACLOUD_CLICKHOUSE_EXPORT CheckClickhouseToRDSRequest : public RpcServiceRequest {
+public:
+	CheckClickhouseToRDSRequest();
+	~CheckClickhouseToRDSRequest();
+	long getResourceOwnerId() const;
+	void setResourceOwnerId(long resourceOwnerId);
+	std::string getRdsVpcId() const;
+	void setRdsVpcId(const std::string &rdsVpcId);
+	std::string getCkPassword() const;
+	void setCkPassword(const std::string &ckPassword);
+	std::string getAccessKeyId() const;
+	void setAccessKeyId(const std::string &accessKeyId);
+	std::string getRdsPassword() const;
+	void setRdsPassword(const std::string &rdsPassword);
+	std::string getCkUserName() const;
+	void setCkUserName(const std::string &ckUserName);
+	std::string getResourceOwnerAccount() const;
+	void setResourceOwnerAccount(const std::string &resourceOwnerAccount);
+	std::string getDbClusterId() const;
+	void setDbClusterId(const std::string &dbClusterId);
+	std::string getOwnerAccount() const;
+	void setOwnerAccount(const std::string &ownerAccount);
+	std::string getRdsId() const;
+	void setRdsId(const std::string &rdsId);
+	long getOwnerId() const;
+	void setOwnerId(long ownerId);
+	long getClickhousePort() const;
+	void setClickhousePort(long clickhousePort);
+	long getRdsPort() const;
+	void setRdsPort(long rdsPort);
+	std::string getRdsVpcUrl() const;
+	void setRdsVpcUrl(const std::string &rdsVpcUrl);
+	std::string getRdsUserName() const;
+	void setRdsUserName(const std::string &rdsUserName);
+
+private:
+	long resourceOwnerId_;
+	std::string rdsVpcId_;
+	std::string ckPassword_;
+	std::string accessKeyId_;
+	std::string rdsPassword_;
+	std::string ckUserName_;
+	std::string resourceOwnerAccount_;
+	std::string dbClusterId_;
+	std::string ownerAccount_;
+	std::string rdsId_;
+	long ownerId_;
+	long clickhousePort_;
+	long rdsPort_;
+	std::string rdsVpcUrl_;
+	std::string rdsUserName_;
+};
+} // namespace Model
+} // namespace Clickhouse
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_CLICKHOUSE_MODEL_CHECKCLICKHOUSETORDSREQUEST_H_

clickhouse/include/alibabacloud/clickhouse/model/AllocateClusterPublicConnectionResult.h

@@ -0,0 +1,53 @@
+/*
+ * 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_CLICKHOUSE_MODEL_CHECKCLICKHOUSETORDSRESULT_H_
+#define ALIBABACLOUD_CLICKHOUSE_MODEL_CHECKCLICKHOUSETORDSRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/clickhouse/ClickhouseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Clickhouse
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLICKHOUSE_EXPORT CheckClickhouseToRDSResult : public ServiceResult
+			{
+			public:
+
+
+				CheckClickhouseToRDSResult();
+				explicit CheckClickhouseToRDSResult(const std::string &payload);
+				~CheckClickhouseToRDSResult();
+				bool getStatus()const;
+				std::string getErrorCode()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				bool status_;
+				std::string errorCode_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLICKHOUSE_MODEL_CHECKCLICKHOUSETORDSRESULT_H_

clickhouse/include/alibabacloud/clickhouse/model/CheckClickhouseToRDSRequest.h

@@ -0,0 +1,45 @@
+/*
+ * 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_CLICKHOUSE_MODEL_CHECKMODIFYCONFIGNEEDRESTARTREQUEST_H_
+#define ALIBABACLOUD_CLICKHOUSE_MODEL_CHECKMODIFYCONFIGNEEDRESTARTREQUEST_H_
+
+#include <alibabacloud/clickhouse/ClickhouseExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Clickhouse {
+namespace Model {
+class ALIBABACLOUD_CLICKHOUSE_EXPORT CheckModifyConfigNeedRestartRequest : public RpcServiceRequest {
+public:
+	CheckModifyConfigNeedRestartRequest();
+	~CheckModifyConfigNeedRestartRequest();
+	std::string getDBClusterId() const;
+	void setDBClusterId(const std::string &dBClusterId);
+	std::string getConfig() const;
+	void setConfig(const std::string &config);
+
+private:
+	std::string dBClusterId_;
+	std::string config_;
+};
+} // namespace Model
+} // namespace Clickhouse
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_CLICKHOUSE_MODEL_CHECKMODIFYCONFIGNEEDRESTARTREQUEST_H_

clickhouse/include/alibabacloud/clickhouse/model/CheckClickhouseToRDSResult.h

@@ -0,0 +1,51 @@
+/*
+ * 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_CLICKHOUSE_MODEL_CHECKMODIFYCONFIGNEEDRESTARTRESULT_H_
+#define ALIBABACLOUD_CLICKHOUSE_MODEL_CHECKMODIFYCONFIGNEEDRESTARTRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/clickhouse/ClickhouseExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Clickhouse
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_CLICKHOUSE_EXPORT CheckModifyConfigNeedRestartResult : public ServiceResult
+			{
+			public:
+
+
+				CheckModifyConfigNeedRestartResult();
+				explicit CheckModifyConfigNeedRestartResult(const std::string &payload);
+				~CheckModifyConfigNeedRestartResult();
+				bool getNeedRestart()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				bool needRestart_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_CLICKHOUSE_MODEL_CHECKMODIFYCONFIGNEEDRESTARTRESULT_H_