kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdcry...@apache.org
Subject kudu git commit: KUDU-1775 (fixup): fix error message for too-large encoded key
Date Thu, 15 Dec 2016 16:12:01 GMT
Repository: kudu
Updated Branches:
  refs/heads/master 01e6871bc -> 2ed179a7a


KUDU-1775 (fixup): fix error message for too-large encoded key

The previous patch in this series had a typo in the error message,
causing it to report the value for max cell size instead of max encoded
key.

Change-Id: I5fd5369910a888ac481f9fdeda7f0543ca38ec6d
Reviewed-on: http://gerrit.cloudera.org:8080/5515
Tested-by: Kudu Jenkins
Reviewed-by: Adar Dembo <adar@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/2ed179a7
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/2ed179a7
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/2ed179a7

Branch: refs/heads/master
Commit: 2ed179a7a188b4748a43a829940764ab5dddbc1c
Parents: 01e6871
Author: Todd Lipcon <todd@apache.org>
Authored: Thu Dec 15 14:23:48 2016 +0700
Committer: Todd Lipcon <todd@apache.org>
Committed: Thu Dec 15 08:27:17 2016 +0000

----------------------------------------------------------------------
 src/kudu/client/client-test.cc | 2 +-
 src/kudu/tablet/tablet.cc      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/2ed179a7/src/kudu/client/client-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/client/client-test.cc b/src/kudu/client/client-test.cc
index 2f7b042..a3cfaf3 100644
--- a/src/kudu/client/client-test.cc
+++ b/src/kudu/client/client-test.cc
@@ -3943,7 +3943,7 @@ TEST_F(ClientTest, TestInsertTooLongEncodedPrimaryKey) {
   session->GetPendingErrors(&errors, &overflowed);
   ASSERT_EQ(1, errors.size());
   EXPECT_EQ("Invalid argument: encoded primary key too large "
-            "(30004 bytes, maximum is 65536 bytes)",
+            "(30004 bytes, maximum is 16384 bytes)",
             errors[0]->status().ToString());
 }
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/2ed179a7/src/kudu/tablet/tablet.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet.cc b/src/kudu/tablet/tablet.cc
index dfb42a5..27f85f7 100644
--- a/src/kudu/tablet/tablet.cc
+++ b/src/kudu/tablet/tablet.cc
@@ -432,7 +432,7 @@ Status Tablet::ValidateInsertOrUpsertUnlocked(const RowOp& op) const
{
   if (PREDICT_FALSE(enc_key_size > FLAGS_max_encoded_key_size_bytes)) {
     return Status::InvalidArgument(Substitute(
         "encoded primary key too large ($0 bytes, maximum is $1 bytes)",
-        enc_key_size, FLAGS_max_cell_size_bytes));
+        enc_key_size, FLAGS_max_encoded_key_size_bytes));
   }
   return Status::OK();
 }


Mime
View raw message