This is an automated email from the ASF dual-hosted git repository.
mgreber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new 950072596 [postgres] fix result status handling
950072596 is described below
commit 9500725966fa3b0554f655a9336b7fe9c12b5298
Author: Alexey Serbin <[email protected]>
AuthorDate: Thu Feb 27 18:42:16 2025 -0800
[postgres] fix result status handling
This patch addresses sloppy result handling of functions/methods
that return Status in the following directories
* src/kudu/hms
* src/kudu/mini-cluster
* src/kudu/postgres
* src/kudu/ranger
Change-Id: Ib19efded15db30c5f3ddaed3e3d5a3f6d98fad1b
Reviewed-on: http://gerrit.cloudera.org:8080/22654
Reviewed-by: Zoltan Chovan <[email protected]>
Tested-by: Alexey Serbin <[email protected]>
Reviewed-by: Marton Greber <[email protected]>
---
src/kudu/hms/hms_catalog-test.cc | 35 +++++++++++-----------
src/kudu/hms/hms_client-test.cc | 6 ++--
.../mini-cluster/external_mini_cluster-test.cc | 2 +-
src/kudu/postgres/mini_postgres-test.cc | 2 +-
src/kudu/postgres/mini_postgres.cc | 2 +-
src/kudu/ranger/ranger_client-test.cc | 3 +-
6 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/kudu/hms/hms_catalog-test.cc b/src/kudu/hms/hms_catalog-test.cc
index 0eae67fb4..3b28052f9 100644
--- a/src/kudu/hms/hms_catalog-test.cc
+++ b/src/kudu/hms/hms_catalog-test.cc
@@ -26,6 +26,7 @@
#include <vector>
#include <gflags/gflags_declare.h>
+#include <glog/logging.h>
#include <gtest/gtest.h>
#include "kudu/common/common.pb.h"
@@ -197,22 +198,22 @@ class HmsCatalogTest : public KuduTest {
Schema AllTypesSchema() {
SchemaBuilder b;
- b.AddKeyColumn("key", DataType::INT32);
- b.AddColumn("int8_val", DataType::INT8);
- b.AddColumn("int16_val", DataType::INT16);
- b.AddColumn("int32_val", DataType::INT32);
- b.AddColumn("int64_val", DataType::INT64);
- b.AddColumn("timestamp_val", DataType::UNIXTIME_MICROS);
- b.AddColumn("date_val", DataType::DATE);
- b.AddColumn("string_val", DataType::STRING);
- b.AddColumn("bool_val", DataType::BOOL);
- b.AddColumn("float_val", DataType::FLOAT);
- b.AddColumn("double_val", DataType::DOUBLE);
- b.AddColumn("binary_val", DataType::BINARY);
- b.AddColumn("decimal32_val", DataType::DECIMAL32);
- b.AddColumn("decimal64_val", DataType::DECIMAL64);
- b.AddColumn("decimal128_val", DataType::DECIMAL128);
- b.AddColumn("varchar_val", DataType::VARCHAR);
+ CHECK_OK(b.AddKeyColumn("key", DataType::INT32));
+ CHECK_OK(b.AddColumn("int8_val", DataType::INT8));
+ CHECK_OK(b.AddColumn("int16_val", DataType::INT16));
+ CHECK_OK(b.AddColumn("int32_val", DataType::INT32));
+ CHECK_OK(b.AddColumn("int64_val", DataType::INT64));
+ CHECK_OK(b.AddColumn("timestamp_val", DataType::UNIXTIME_MICROS));
+ CHECK_OK(b.AddColumn("date_val", DataType::DATE));
+ CHECK_OK(b.AddColumn("string_val", DataType::STRING));
+ CHECK_OK(b.AddColumn("bool_val", DataType::BOOL));
+ CHECK_OK(b.AddColumn("float_val", DataType::FLOAT));
+ CHECK_OK(b.AddColumn("double_val", DataType::DOUBLE));
+ CHECK_OK(b.AddColumn("binary_val", DataType::BINARY));
+ CHECK_OK(b.AddColumn("decimal32_val", DataType::DECIMAL32));
+ CHECK_OK(b.AddColumn("decimal64_val", DataType::DECIMAL64));
+ CHECK_OK(b.AddColumn("decimal128_val", DataType::DECIMAL128));
+ CHECK_OK(b.AddColumn("varchar_val", DataType::VARCHAR));
return b.Build();
}
@@ -330,7 +331,7 @@ TEST_P(HmsCatalogTestParameterized, TestTableLifecycle) {
// Alter the table.
SchemaBuilder b(schema);
- b.AddColumn("new_column", DataType::INT32);
+ ASSERT_OK(b.AddColumn("new_column", DataType::INT32));
Schema altered_schema = b.Build();
ASSERT_OK(hms_catalog_->AlterTable(kTableId, kTableName, kAlteredTableName,
kClusterId, kOwner, altered_schema, kComment));
diff --git a/src/kudu/hms/hms_client-test.cc b/src/kudu/hms/hms_client-test.cc
index 5afa77443..fcfc6a7ac 100644
--- a/src/kudu/hms/hms_client-test.cc
+++ b/src/kudu/hms/hms_client-test.cc
@@ -431,7 +431,7 @@ TEST_F(HmsClientTest, TestHmsConnect) {
Socket listening_socket;
ASSERT_OK(listening_socket.Init(loopback.family(), 0));
ASSERT_OK(listening_socket.BindAndListen(loopback, 1));
- listening_socket.GetSocketAddress(&listening);
+ ASSERT_OK(listening_socket.GetSocketAddress(&listening));
ASSERT_TRUE(start_client(listening).IsTimedOut());
// Bound, but not listening socket.
@@ -439,7 +439,7 @@ TEST_F(HmsClientTest, TestHmsConnect) {
Socket bound_socket;
ASSERT_OK(bound_socket.Init(loopback.family(), 0));
ASSERT_OK(bound_socket.Bind(loopback));
- bound_socket.GetSocketAddress(&bound);
+ ASSERT_OK(bound_socket.GetSocketAddress(&bound));
ASSERT_TRUE(start_client(bound).IsNetworkError());
// Unbound socket.
@@ -447,7 +447,7 @@ TEST_F(HmsClientTest, TestHmsConnect) {
Socket unbound_socket;
ASSERT_OK(unbound_socket.Init(loopback.family(), 0));
ASSERT_OK(unbound_socket.Bind(loopback));
- unbound_socket.GetSocketAddress(&unbound);
+ ASSERT_OK(unbound_socket.GetSocketAddress(&unbound));
ASSERT_OK(unbound_socket.Close());
ASSERT_TRUE(start_client(unbound).IsNetworkError());
}
diff --git a/src/kudu/mini-cluster/external_mini_cluster-test.cc
b/src/kudu/mini-cluster/external_mini_cluster-test.cc
index 50e6a6964..e31434f2d 100644
--- a/src/kudu/mini-cluster/external_mini_cluster-test.cc
+++ b/src/kudu/mini-cluster/external_mini_cluster-test.cc
@@ -325,7 +325,7 @@ TEST_P(ExternalMiniClusterTest, TestAddMaster) {
ASSERT_OK(cluster->Start());
// Add a master and wait for it to start up and get reported to.
- cluster->AddMaster();
+ ASSERT_OK(cluster->AddMaster());
ASSERT_OK(cluster->master(opts.num_masters)->WaitForCatalogManager());
cluster->tablet_server(0)->Shutdown();
ASSERT_OK(cluster->tablet_server(0)->Restart());
diff --git a/src/kudu/postgres/mini_postgres-test.cc
b/src/kudu/postgres/mini_postgres-test.cc
index 4a42e82b3..c1afe1104 100644
--- a/src/kudu/postgres/mini_postgres-test.cc
+++ b/src/kudu/postgres/mini_postgres-test.cc
@@ -33,7 +33,7 @@ class PostgresTest : public KuduTest {
: postgres_("127.0.0.1") {}
void SetUp() override {
- postgres_.Start();
+ ASSERT_OK(postgres_.Start());
}
protected:
diff --git a/src/kudu/postgres/mini_postgres.cc
b/src/kudu/postgres/mini_postgres.cc
index 08ceafa0c..78957fe58 100644
--- a/src/kudu/postgres/mini_postgres.cc
+++ b/src/kudu/postgres/mini_postgres.cc
@@ -134,7 +134,7 @@ Status MiniPostgres::CreateConfigs() {
// append the port to it.
string config_file = JoinPathSegments(pg_root(), "postgresql.conf");
faststring config;
- ReadFileToString(env, config_file, &config);
+ RETURN_NOT_OK(ReadFileToString(env, config_file, &config));
config.append(Substitute("\nlisten_addresses = '$0'\nport = $1\n", host_,
port_));
unique_ptr<WritableFile> file;
WritableFileOptions opts;
diff --git a/src/kudu/ranger/ranger_client-test.cc
b/src/kudu/ranger/ranger_client-test.cc
index 0208bed63..62ee8027a 100644
--- a/src/kudu/ranger/ranger_client-test.cc
+++ b/src/kudu/ranger/ranger_client-test.cc
@@ -436,7 +436,8 @@ TEST_F(RangerClientTestExtraJVMArgs, SmokeTest) {
TEST_F(RangerClientTestExtraJVMArgs, TestCrashOnInvalidArguments) {
FLAGS_ranger_java_extra_args =
"-XX:+InvalidArgumentHopeTheyWontChooseThisNameForAFLag";
- ASSERT_DEATH(InitializeRanger(), "The subprocess has exited with status 1");
+ ASSERT_DEATH({ ASSERT_OK(InitializeRanger()); },
+ "The subprocess has exited with status 1");
}
namespace {
