You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by gr...@apache.org on 2018/08/21 01:54:22 UTC
kudu git commit: [test] Use valid tablet ids in tests
Repository: kudu
Updated Branches:
refs/heads/master 354c84bc8 -> 9199d1646
[test] Use valid tablet ids in tests
Some tests used tablet ids that were not valid
Kudu object ids. This patch changes them to
use a valid id in preperaption for a follow on
patch which makes tablet id validation more strict.
Change-Id: I83d774abf2cb2ce6f81d1f851f2cc1ddd12e1726
Reviewed-on: http://gerrit.cloudera.org:8080/11272
Reviewed-by: Adar Dembo <ad...@cloudera.com>
Reviewed-by: Andrew Wong <aw...@cloudera.com>
Reviewed-by: Attila Bukor <ab...@apache.org>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/9199d164
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/9199d164
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/9199d164
Branch: refs/heads/master
Commit: 9199d164600fc046c9bab7e702b18faeb8a191bb
Parents: 354c84b
Author: Grant Henke <gr...@apache.org>
Authored: Mon Aug 20 14:14:31 2018 -0500
Committer: Grant Henke <gr...@apache.org>
Committed: Tue Aug 21 01:30:42 2018 +0000
----------------------------------------------------------------------
src/kudu/tools/kudu-tool-test.cc | 66 ++++++++++++------------
src/kudu/tserver/tablet_server-test-base.cc | 2 +-
src/kudu/tserver/tablet_server-test.cc | 2 +-
src/kudu/tserver/ts_tablet_manager-test.cc | 2 +-
4 files changed, 37 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/9199d164/src/kudu/tools/kudu-tool-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/kudu-tool-test.cc b/src/kudu/tools/kudu-tool-test.cc
index 8293ef2..0027872 100644
--- a/src/kudu/tools/kudu-tool-test.cc
+++ b/src/kudu/tools/kudu-tool-test.cc
@@ -633,7 +633,7 @@ TEST_F(ToolTest, TestActionMissingRequiredArg) {
TEST_F(ToolTest, TestFsCheck) {
const string kTestDir = GetTestPath("test");
- const string kTabletId = "test-tablet";
+ const string kTabletId = "ffffffffffffffffffffffffffffffff";
const Schema kSchema(GetSimpleTestSchema());
const Schema kSchemaWithIds(SchemaBuilder(kSchema).Build());
@@ -979,7 +979,7 @@ TEST_F(ToolTest, TestFsDumpBlock) {
TEST_F(ToolTest, TestWalDump) {
const string kTestDir = GetTestPath("test");
- const string kTestTablet = "test-tablet";
+ const string kTestTablet = "ffffffffffffffffffffffffffffffff";
const Schema kSchema(GetSimpleTestSchema());
const Schema kSchemaWithIds(SchemaBuilder(kSchema).Build());
@@ -1095,7 +1095,7 @@ TEST_F(ToolTest, TestWalDump) {
TEST_F(ToolTest, TestLocalReplicaDumpMeta) {
const string kTestDir = GetTestPath("test");
- const string kTestTablet = "test-tablet";
+ const string kTestTablet = "ffffffffffffffffffffffffffffffff";
const string kTestTableId = "test-table";
const string kTestTableName = "test-fs-meta-dump-table";
const Schema kSchema(GetSimpleTestSchema());
@@ -1168,7 +1168,9 @@ TEST_F(ToolTest, TestFsDumpTree) {
TEST_F(ToolTest, TestLocalReplicaOps) {
const string kTestDir = GetTestPath("test");
- const string kTestTablet = "test-tablet";
+
+ ObjectIdGenerator generator;
+ const string kTestTablet = "ffffffffffffffffffffffffffffffff";
const int kRowId = 100;
const Schema kSchema(GetSimpleTestSchema());
const Schema kSchemaWithIds(SchemaBuilder(kSchema).Build());
@@ -1279,32 +1281,32 @@ TEST_F(ToolTest, TestLocalReplicaOps) {
SCOPED_TRACE(stdout);
string expected = R"(
- table id | tablet id | rowset id | block type | size
------------------+-------------+-----------+------------------+------
- KuduTableTestId | test-tablet | 0 | c10 (key) | 164B
- KuduTableTestId | test-tablet | 0 | c11 (int_val) | 113B
- KuduTableTestId | test-tablet | 0 | c12 (string_val) | 138B
- KuduTableTestId | test-tablet | 0 | REDO | 0B
- KuduTableTestId | test-tablet | 0 | UNDO | 169B
- KuduTableTestId | test-tablet | 0 | BLOOM | 4.1K
- KuduTableTestId | test-tablet | 0 | PK | 0B
- KuduTableTestId | test-tablet | 0 | * | 4.6K
- KuduTableTestId | test-tablet | * | c10 (key) | 164B
- KuduTableTestId | test-tablet | * | c11 (int_val) | 113B
- KuduTableTestId | test-tablet | * | c12 (string_val) | 138B
- KuduTableTestId | test-tablet | * | REDO | 0B
- KuduTableTestId | test-tablet | * | UNDO | 169B
- KuduTableTestId | test-tablet | * | BLOOM | 4.1K
- KuduTableTestId | test-tablet | * | PK | 0B
- KuduTableTestId | test-tablet | * | * | 4.6K
- KuduTableTestId | * | * | c10 (key) | 164B
- KuduTableTestId | * | * | c11 (int_val) | 113B
- KuduTableTestId | * | * | c12 (string_val) | 138B
- KuduTableTestId | * | * | REDO | 0B
- KuduTableTestId | * | * | UNDO | 169B
- KuduTableTestId | * | * | BLOOM | 4.1K
- KuduTableTestId | * | * | PK | 0B
- KuduTableTestId | * | * | * | 4.6K
+ table id | tablet id | rowset id | block type | size
+-----------------+----------------------------------+-----------+------------------+------
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | 0 | c10 (key) | 164B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | 0 | c11 (int_val) | 113B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | 0 | c12 (string_val) | 138B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | 0 | REDO | 0B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | 0 | UNDO | 169B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | 0 | BLOOM | 4.1K
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | 0 | PK | 0B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | 0 | * | 4.6K
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | * | c10 (key) | 164B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | * | c11 (int_val) | 113B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | * | c12 (string_val) | 138B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | * | REDO | 0B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | * | UNDO | 169B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | * | BLOOM | 4.1K
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | * | PK | 0B
+ KuduTableTestId | ffffffffffffffffffffffffffffffff | * | * | 4.6K
+ KuduTableTestId | * | * | c10 (key) | 164B
+ KuduTableTestId | * | * | c11 (int_val) | 113B
+ KuduTableTestId | * | * | c12 (string_val) | 138B
+ KuduTableTestId | * | * | REDO | 0B
+ KuduTableTestId | * | * | UNDO | 169B
+ KuduTableTestId | * | * | BLOOM | 4.1K
+ KuduTableTestId | * | * | PK | 0B
+ KuduTableTestId | * | * | * | 4.6K
)";
// Preprocess stdout and our expected table so that we are less
// sensitive to small variations in encodings, id assignment, etc.
@@ -1341,7 +1343,7 @@ TEST_F(ToolTest, TestLocalReplicaOps) {
&stdout));
SCOPED_TRACE(stdout);
- EXPECT_EQ(stdout, "KuduTableTest,test-tablet");
+ EXPECT_EQ(stdout, "KuduTableTest,ffffffffffffffffffffffffffffffff");
}
// Test 'kudu fs list' rowset group.
@@ -1353,7 +1355,7 @@ TEST_F(ToolTest, TestLocalReplicaOps) {
&stdout));
SCOPED_TRACE(stdout);
- EXPECT_EQ(stdout, "KuduTableTest,test-tablet,0");
+ EXPECT_EQ(stdout, "KuduTableTest,ffffffffffffffffffffffffffffffff,0");
}
// Test 'kudu fs list' block group.
{
http://git-wip-us.apache.org/repos/asf/kudu/blob/9199d164/src/kudu/tserver/tablet_server-test-base.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server-test-base.cc b/src/kudu/tserver/tablet_server-test-base.cc
index 8aaa0dd..df68bbd 100644
--- a/src/kudu/tserver/tablet_server-test-base.cc
+++ b/src/kudu/tserver/tablet_server-test-base.cc
@@ -79,7 +79,7 @@ namespace kudu {
namespace tserver {
const char* TabletServerTestBase::kTableId = "TestTable";
-const char* TabletServerTestBase::kTabletId = "TestTablet";
+const char* TabletServerTestBase::kTabletId = "ffffffffffffffffffffffffffffffff";
TabletServerTestBase::TabletServerTestBase()
: schema_(GetSimpleTestSchema()),
http://git-wip-us.apache.org/repos/asf/kudu/blob/9199d164/src/kudu/tserver/tablet_server-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tablet_server-test.cc b/src/kudu/tserver/tablet_server-test.cc
index cc9de59..be842d9 100644
--- a/src/kudu/tserver/tablet_server-test.cc
+++ b/src/kudu/tserver/tablet_server-test.cc
@@ -421,7 +421,7 @@ TEST_F(TabletServerTest, TestWebPages) {
// Check that the tablet entry shows up.
ASSERT_STR_CONTAINS(buf.ToString(), "\"type\": \"tablet\"");
- ASSERT_STR_CONTAINS(buf.ToString(), "\"id\": \"TestTablet\"");
+ ASSERT_STR_CONTAINS(buf.ToString(), "\"id\": \"ffffffffffffffffffffffffffffffff\"");
ASSERT_STR_CONTAINS(buf.ToString(), "\"partition\": \"RANGE (key) PARTITION UNBOUNDED");
http://git-wip-us.apache.org/repos/asf/kudu/blob/9199d164/src/kudu/tserver/ts_tablet_manager-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/ts_tablet_manager-test.cc b/src/kudu/tserver/ts_tablet_manager-test.cc
index 47b461f..05a8e75 100644
--- a/src/kudu/tserver/ts_tablet_manager-test.cc
+++ b/src/kudu/tserver/ts_tablet_manager-test.cc
@@ -71,7 +71,7 @@ using master::TabletReportPB;
using pb_util::SecureShortDebugString;
using tablet::TabletReplica;
-static const char* const kTabletId = "my-tablet-id";
+static const char* const kTabletId = "ffffffffffffffffffffffffffffffff";
class TsTabletManagerTest : public KuduTest {