refactor: change the way to call replication_ddl_client::set_app_envs (…

…#398)
apache · Sep 24, 2019 · 8fb0099 · 8fb0099
1 parent e5fcffd
commit 8fb0099
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 15 deletions.
diff --git a/rdsn b/rdsn
diff --git a/src/shell/commands/table_management.cpp b/src/shell/commands/table_management.cpp
@@ -744,11 +744,19 @@ bool set_app_envs(command_executor *e, shell_context *sc, arguments args)
         values.emplace_back(args.argv[idx++]);
     }
 
-    ::dsn::error_code ret = sc->ddl_client->set_app_envs(sc->current_app_name, keys, values);
-
-    if (ret != ::dsn::ERR_OK) {
-        fprintf(stderr, "set app env failed with err = %s\n", ret.to_string());
+    auto err_resp = sc->ddl_client->set_app_envs(sc->current_app_name, keys, values);
+    dsn::error_s err = err_resp.get_error();
+    std::string hint_msg;
+    if (err.is_ok()) {
+        err = dsn::error_s::make(err_resp.get_value().err);
+        hint_msg = err_resp.get_value().hint_message;
+    }
+    if (!err.is_ok()) {
+        fmt::print(stderr, "set app envs failed with error {} [hint:\"{}\"]!\n", err, hint_msg);
+    } else {
+        fmt::print(stdout, "set app envs succeed\n");
     }
+
     return true;
 }
 

diff --git a/src/test/function_test/test_ttl.cpp b/src/test/function_test/test_ttl.cpp
@@ -37,9 +37,10 @@ void set_default_ttl(int ttl)
 
     std::string env = envs[TABLE_LEVEL_DEFAULT_TTL];
     if ((env.empty() && ttl != 0) || env != std::to_string(ttl)) {
-        dsn::error_code ec = ddl_client->set_app_envs(
+        auto response = ddl_client->set_app_envs(
             client->get_app_name(), {TABLE_LEVEL_DEFAULT_TTL}, {std::to_string(ttl)});
-        ASSERT_EQ(ERR_OK, ec);
+        ASSERT_EQ(true, response.is_ok());
+        ASSERT_EQ(ERR_OK, response.get_value().err);
 
         // wait envs to be synced.
         std::this_thread::sleep_for(std::chrono::seconds(sleep_for_envs_effect));
@@ -99,10 +100,11 @@ TEST(ttl, set_without_default_ttl)
     ASSERT_EQ(ttl_test_value_2, value);
 
     // trigger a manual compaction
-    dsn::error_code ec = ddl_client->set_app_envs(client->get_app_name(),
-                                                  {MANUAL_COMPACT_ONCE_TRIGGER_TIME_KEY},
-                                                  {std::to_string(time(nullptr))});
-    ASSERT_EQ(ERR_OK, ec);
+    auto response = ddl_client->set_app_envs(client->get_app_name(),
+                                             {MANUAL_COMPACT_ONCE_TRIGGER_TIME_KEY},
+                                             {std::to_string(time(nullptr))});
+    ASSERT_EQ(true, response.is_ok());
+    ASSERT_EQ(ERR_OK, response.get_value().err);
 
     // wait envs to be synced, and manual lcompaction has been finished.
     std::this_thread::sleep_for(std::chrono::seconds(sleep_for_envs_effect));
@@ -191,10 +193,11 @@ TEST(ttl, set_with_default_ttl)
     ASSERT_EQ(ttl_test_value_2, value);
 
     // trigger a manual compaction
-    dsn::error_code ec = ddl_client->set_app_envs(client->get_app_name(),
-                                                  {MANUAL_COMPACT_ONCE_TRIGGER_TIME_KEY},
-                                                  {std::to_string(time(nullptr))});
-    ASSERT_EQ(ERR_OK, ec);
+    auto response = ddl_client->set_app_envs(client->get_app_name(),
+                                             {MANUAL_COMPACT_ONCE_TRIGGER_TIME_KEY},
+                                             {std::to_string(time(nullptr))});
+    ASSERT_EQ(true, response.is_ok());
+    ASSERT_EQ(ERR_OK, response.get_value().err);
 
     // wait envs to be synced, and manual compaction has been finished.
     std::this_thread::sleep_for(std::chrono::seconds(sleep_for_envs_effect));