feat: add database and rp interfaces and their usecases

Signed-off-by: heiliuchao <[email protected]>
openGemini · Mar 26, 2024 · b2782b1 · b2782b1
1 parent ef0054b
commit b2782b1
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/opengemini_client/client_impl.py b/opengemini_client/client_impl.py
@@ -129,7 +129,7 @@ def request(self, method, server_url, url_path, headers=None, body=None, params=
         prepared = req.prepare()
         resp = self.session.send(prepared)
         if not 200 <= resp.status_code < 300:
-            raise HTTPError(f"HTTP error: {resp.status_code}, Response: {resp.text}")
+            raise HTTPError(f"Query error_code: {resp.status_code}, error_msg: {resp.text}")
         return resp
 
     def exec_http_request_by_index(self, idx, method, url_path, headers=None, body=None) -> requests.Response:
@@ -140,7 +140,7 @@ def exec_http_request_by_index(self, idx, method, url_path, headers=None, body=N
     def ping(self, idx: int):
         resp = self.exec_http_request_by_index(idx, 'GET', UrlConst.PING)
         if resp.status_code != HTTPStatus.NO_CONTENT:
-            raise HTTPError(f"ping openGeminiDB status is {resp.status_code}")
+            raise HTTPError(f"Query error_code: {resp.status_code}, error_msg: {resp.text}")
 
     def query(self, query: Query) -> QueryResult:
         server_url = self.get_server_url()
@@ -149,7 +149,7 @@ def query(self, query: Query) -> QueryResult:
         resp = self.request(method='GET', server_url=server_url, url_path=UrlConst.QUERY, params=params)
         if resp.status_code == HTTPStatus.OK:
             return resolve_query_body(resp)
-        raise HTTPError(f"Query error: {resp.status_code}, Response: {resp.text}")
+        raise HTTPError(f"Query error_code: {resp.status_code}, error_msg: {resp.text}")
 
     def _query_post(self, query: Query) -> QueryResult:
         server_url = self.get_server_url()
@@ -158,25 +158,21 @@ def _query_post(self, query: Query) -> QueryResult:
         resp = self.request(method='POST', server_url=server_url, url_path=UrlConst.QUERY, params=params)
         if resp.status_code == HTTPStatus.OK:
             return resolve_query_body(resp)
-        raise HTTPError(f"Query error: {resp.status_code}, Response: {resp.text}")
+        raise HTTPError(f"Query error_code: {resp.status_code}, error_msg: {resp.text}")
 
-    def create_database(self, dbname):
+    def create_database(self, dbname, rp_config=None):
         if len(dbname) == 0:
             raise ValueError("empty database name")
-        query_string = f"CREATE DATABASE {str(dbname).strip()}"
-        return self._query_post(Query(database=dbname, command=query_string, retention_policy=''))
-
-    def create_database_with_rp(self, dbname, rp_config: RpConfig):
-        if len(dbname) == 0:
-            raise ValueError("empty database name")
-        query_string = f"CREATE DATABASE {str(dbname).strip()} WITH DURATION {rp_config.duration} REPLICATION 1"
-
-        if len(rp_config.shard_group_duration) > 0:
-            query_string += f" SHARD DURATION {rp_config.shard_group_duration.strip()}"
-        if len(rp_config.index_duration) > 0:
-            query_string += f" INDEX DURATION {rp_config.index_duration.strip()}"
-        if len(rp_config.name) > 0:
-            query_string += f" NAME {rp_config.name.strip()}"
+        if rp_config is None:
+            query_string = f"CREATE DATABASE {str(dbname).strip()}"
+        else:
+            query_string = f"CREATE DATABASE {str(dbname).strip()} WITH DURATION {rp_config.duration} REPLICATION 1"
+            if len(rp_config.shard_group_duration) > 0:
+                query_string += f" SHARD DURATION {rp_config.shard_group_duration.strip()}"
+            if len(rp_config.index_duration) > 0:
+                query_string += f" INDEX DURATION {rp_config.index_duration.strip()}"
+            if len(rp_config.name) > 0:
+                query_string += f" NAME {rp_config.name.strip()}"
         return self._query_post(Query(database=str(dbname).strip(), command=query_string, retention_policy=''))
 
     def drop_database(self, dbname):