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 7ce473098 [common] fix result status handling
7ce473098 is described below
commit 7ce47309845ededefd839ffd665d274cf34a860c
Author: Alexey Serbin <[email protected]>
AuthorDate: Thu Feb 27 18:09:40 2025 -0800
[common] fix result status handling
This patch addresses sloppy result handling of functions/methods
that return Status under the src/kudu/common directory.
Change-Id: I8bf6de64284e4097ac18e56e282c81dea3d52544
Reviewed-on: http://gerrit.cloudera.org:8080/22563
Tested-by: Alexey Serbin <[email protected]>
Reviewed-by: Zoltan Chovan <[email protected]>
Reviewed-by: Marton Greber <[email protected]>
---
src/kudu/common/partition.cc | 2 +-
src/kudu/common/partition_pruner-test.cc | 4 ++--
src/kudu/common/row_changelist-test.cc | 16 ++++++++++------
src/kudu/common/row_operations-test.cc | 24 ++++++++++++------------
src/kudu/common/schema-test.cc | 2 +-
5 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/kudu/common/partition.cc b/src/kudu/common/partition.cc
index 0367dbd01..be80de23f 100644
--- a/src/kudu/common/partition.cc
+++ b/src/kudu/common/partition.cc
@@ -860,7 +860,7 @@ Status PartitionSchema::DecodeRangeKey(Slice* encoded_key,
if (column.type_info()->physical_type() == BINARY) {
// Copy cell value into the 'partial_row', because in the decoding
process above, we just make
// row data a pointer to the memory allocated by arena.
- partial_row->Set(column_idx, cont_row.cell_ptr(column_idx));
+ RETURN_NOT_OK(partial_row->Set(column_idx,
cont_row.cell_ptr(column_idx)));
}
}
if (!encoded_key->empty()) {
diff --git a/src/kudu/common/partition_pruner-test.cc
b/src/kudu/common/partition_pruner-test.cc
index c808c905a..e0a7c2c0b 100644
--- a/src/kudu/common/partition_pruner-test.cc
+++ b/src/kudu/common/partition_pruner-test.cc
@@ -996,11 +996,11 @@ TEST_P(PartitionPrunerTestWithMaxInListLength,
TestMultiColumnInListHashPruningM
SchemaBuilder builder;
int i = 0;
for (; i < kKeyColumnSize; i++) {
- builder.AddKeyColumn(Substitute("key_$0", i), DataType::INT32);
+ ASSERT_OK(builder.AddKeyColumn(Substitute("key_$0", i), DataType::INT32));
key_column_names.push_back(Substitute("key_$0", i));
}
for (; i < kColumnSize; i++) {
- builder.AddColumn(Substitute("column_$0", i), DataType::INT32);
+ ASSERT_OK(builder.AddColumn(Substitute("column_$0", i), DataType::INT32));
}
Schema schema = builder.Build();
diff --git a/src/kudu/common/row_changelist-test.cc
b/src/kudu/common/row_changelist-test.cc
index c21ff7c90..55634e9b5 100644
--- a/src/kudu/common/row_changelist-test.cc
+++ b/src/kudu/common/row_changelist-test.cc
@@ -15,6 +15,8 @@
// specific language governing permissions and limitations
// under the License.
+#include "kudu/common/row_changelist.h"
+
#include <cstdint>
#include <ostream>
#include <string>
@@ -24,18 +26,20 @@
#include "kudu/common/common.pb.h"
#include "kudu/common/row.h"
-#include "kudu/common/row_changelist.h"
#include "kudu/common/rowblock.h"
#include "kudu/common/schema.h"
#include "kudu/gutil/strings/substitute.h"
#include "kudu/util/faststring.h"
#include "kudu/util/hexdump.h"
-#include "kudu/util/memory/arena.h"
#include "kudu/util/slice.h"
#include "kudu/util/status.h"
#include "kudu/util/test_macros.h"
#include "kudu/util/test_util.h"
+namespace kudu {
+class Arena;
+} // namespace kudu
+
using std::string;
using strings::Substitute;
@@ -175,11 +179,11 @@ TEST_F(TestRowChangeList, TestReinserts) {
rb.AddString(Slice("mundo"));
rb.AddUint32(54321);
rb.AddUint32(1);
- CopyRow(rb.row(), &dst_row, static_cast<Arena*>(nullptr));
+ ASSERT_OK(CopyRow(rb.row(), &dst_row, static_cast<Arena*>(nullptr)));
reinsert_2_enc.SetToReinsert();
- CHECK_OK(reinsert_1_dec.MutateRowAndCaptureChanges(&dst_row,
-
static_cast<Arena*>(nullptr),
- &reinsert_2_enc));
+ ASSERT_OK(reinsert_1_dec.MutateRowAndCaptureChanges(&dst_row,
+
static_cast<Arena*>(nullptr),
+ &reinsert_2_enc));
// The row should now match reinsert 1
ASSERT_STR_CONTAINS(schema_.DebugRow(dst_row),
R"((string col1="hello", string col2="world", uint32 col3=12345,
uint32 col4=NULL))");
diff --git a/src/kudu/common/row_operations-test.cc
b/src/kudu/common/row_operations-test.cc
index 137d6f4f3..d6d5b1655 100644
--- a/src/kudu/common/row_operations-test.cc
+++ b/src/kudu/common/row_operations-test.cc
@@ -336,32 +336,32 @@ TEST_F(RowOperationsTest, SchemaFuzz) {
// One case from SchemaFuzz which failed previously.
TEST_F(RowOperationsTest, TestFuzz1) {
SchemaBuilder client_schema_builder;
- client_schema_builder.AddColumn("c1", INT32, false, nullptr, nullptr);
- client_schema_builder.AddColumn("c2", STRING, false, nullptr, nullptr);
+ ASSERT_OK(client_schema_builder.AddColumn("c1", INT32, false, nullptr,
nullptr));
+ ASSERT_OK(client_schema_builder.AddColumn("c2", STRING, false, nullptr,
nullptr));
Schema client_schema = client_schema_builder.BuildWithoutIds();
SchemaBuilder server_schema_builder;
- server_schema_builder.AddColumn("c1", INT32, false, nullptr, nullptr);
- server_schema_builder.AddColumn("c2", STRING, false, nullptr, nullptr);
+ ASSERT_OK(server_schema_builder.AddColumn("c1", INT32, false, nullptr,
nullptr));
+ ASSERT_OK(server_schema_builder.AddColumn("c2", STRING, false, nullptr,
nullptr));
Schema server_schema = server_schema_builder.Build();
KuduPartialRow row(&client_schema);
- CHECK_OK(row.SetInt32(0, 12345));
- CHECK_OK(row.SetStringCopy(1, "hello"));
+ ASSERT_OK(row.SetInt32(0, 12345));
+ ASSERT_OK(row.SetStringCopy(1, "hello"));
DoFuzzTest(server_schema, row, 100);
}
// Another case from SchemaFuzz which failed previously.
TEST_F(RowOperationsTest, TestFuzz2) {
SchemaBuilder client_schema_builder;
- client_schema_builder.AddColumn("c1", STRING, true, nullptr, nullptr);
- client_schema_builder.AddColumn("c2", STRING, false, nullptr, nullptr);
+ ASSERT_OK(client_schema_builder.AddColumn("c1", STRING, true, nullptr,
nullptr));
+ ASSERT_OK(client_schema_builder.AddColumn("c2", STRING, false, nullptr,
nullptr));
Schema client_schema = client_schema_builder.BuildWithoutIds();
SchemaBuilder server_schema_builder;
- server_schema_builder.AddColumn("c1", STRING, true, nullptr, nullptr);
- server_schema_builder.AddColumn("c2", STRING, false, nullptr, nullptr);
+ ASSERT_OK(server_schema_builder.AddColumn("c1", STRING, true, nullptr,
nullptr));
+ ASSERT_OK(server_schema_builder.AddColumn("c2", STRING, false, nullptr,
nullptr));
Schema server_schema = server_schema_builder.Build();
KuduPartialRow row(&client_schema);
- CHECK_OK(row.SetNull(0));
- CHECK_OK(row.SetStringCopy(1, "hello"));
+ ASSERT_OK(row.SetNull(0));
+ ASSERT_OK(row.SetStringCopy(1, "hello"));
DoFuzzTest(server_schema, row, 100);
}
diff --git a/src/kudu/common/schema-test.cc b/src/kudu/common/schema-test.cc
index d27838df5..d2a6d1a7e 100644
--- a/src/kudu/common/schema-test.cc
+++ b/src/kudu/common/schema-test.cc
@@ -135,7 +135,7 @@ TEST_F(TestSchema, TestSchema) {
TEST_F(TestSchema, TestSchemaToStringMode) {
SchemaBuilder builder;
- builder.AddKeyColumn("key", DataType::INT32);
+ ASSERT_OK(builder.AddKeyColumn("key", DataType::INT32));
const auto schema = builder.Build();
EXPECT_EQ(
Substitute("(\n"
