Repository: kudu
Updated Branches:
  refs/heads/master b30d4fc15 -> f165ef7d6


http://git-wip-us.apache.org/repos/asf/kudu/blob/f165ef7d/src/kudu/tablet/composite-pushdown-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/composite-pushdown-test.cc 
b/src/kudu/tablet/composite-pushdown-test.cc
index 6d5a40a..63b3e68 100644
--- a/src/kudu/tablet/composite-pushdown-test.cc
+++ b/src/kudu/tablet/composite-pushdown-test.cc
@@ -125,7 +125,7 @@ TEST_F(CompositePushdownTest, TestPushDownExactEquality) {
   ASSERT_NO_FATAL_FAILURE(ScanTablet(&spec, &results, "Exact match using 
compound key"));
   ASSERT_EQ(1, results.size());
   EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=7, "
-            "string hostname=foo, string data=2001/09/07-foo)",
+            R"(string hostname="foo", string data="2001/09/07-foo"))",
             results.front());
 }
 
@@ -152,10 +152,10 @@ TEST_F(CompositePushdownTest, 
TestPushDownStringInequality) {
   ASSERT_NO_FATAL_FAILURE(ScanTablet(&spec, &results, "Exact match using 
compound key"));
   ASSERT_EQ(2, results.size());
   EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=7, "
-            "string hostname=baz, string data=2001/09/07-baz)",
+            R"(string hostname="baz", string data="2001/09/07-baz"))",
             results.front());
   EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=7, "
-            "string hostname=foo, string data=2001/09/07-foo)",
+            R"(string hostname="foo", string data="2001/09/07-foo"))",
             results.back());
 }
 
@@ -176,13 +176,13 @@ TEST_F(CompositePushdownTest, TestPushDownDateEquality) {
   ASSERT_NO_FATAL_FAILURE(ScanTablet(&spec, &results, "Exact match using 
compound key"));
   ASSERT_EQ(3, results.size());
   EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=7, "
-            "string hostname=baz, string data=2001/09/07-baz)",
+            R"(string hostname="baz", string data="2001/09/07-baz"))",
             results[0]);
   EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=7, "
-            "string hostname=foo, string data=2001/09/07-foo)",
+            R"(string hostname="foo", string data="2001/09/07-foo"))",
             results[1]);
   EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=7, "
-            "string hostname=foobar, string data=2001/09/07-foobar)",
+            R"(string hostname="foobar", string data="2001/09/07-foobar"))",
             results[2]);
 }
 
@@ -201,10 +201,10 @@ TEST_F(CompositePushdownTest, TestPushDownPrefixEquality) 
{
                                        "Prefix match using 2/3 of a compound 
key"));
     ASSERT_EQ(28 * 3, results.size());
     EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=1, "
-              "string hostname=baz, string data=2001/09/01-baz)",
+              R"(string hostname="baz", string data="2001/09/01-baz"))",
               results.front());
     EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=28, "
-              "string hostname=foobar, string data=2001/09/28-foobar)",
+              R"(string hostname="foobar", string data="2001/09/28-foobar"))",
               results.back());
   }
 
@@ -216,13 +216,13 @@ TEST_F(CompositePushdownTest, TestPushDownPrefixEquality) 
{
                                        "Prefix match using 1/3 of a compound 
key"));
     ASSERT_EQ(28 * 12 * 3, results.size());
     EXPECT_EQ("(int16 year=2001, int8 month=1, int8 day=1, "
-              "string hostname=baz, string data=2001/01/01-baz)",
+              R"(string hostname="baz", string data="2001/01/01-baz"))",
               results.front());
     EXPECT_EQ("(int16 year=2001, int8 month=2, int8 day=1, "
-              "string hostname=baz, string data=2001/02/01-baz)",
+              R"(string hostname="baz", string data="2001/02/01-baz"))",
               results[28 * 3]);
     EXPECT_EQ("(int16 year=2001, int8 month=12, int8 day=28, "
-              "string hostname=foobar, string data=2001/12/28-foobar)",
+              R"(string hostname="foobar", string data="2001/12/28-foobar"))",
               results.back());
   }
 }
@@ -254,10 +254,10 @@ TEST_F(CompositePushdownTest, 
TestPushDownPrefixEqualitySuffixInequality) {
     ASSERT_NO_FATAL_FAILURE(ScanTablet(&spec, &results, "Prefix equality, 
suffix inequality"));
     ASSERT_EQ(15 * 3, results.size());
     EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=1, "
-              "string hostname=baz, string data=2001/09/01-baz)",
+              R"(string hostname="baz", string data="2001/09/01-baz"))",
               results.front());
     EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=15, "
-              "string hostname=foobar, string data=2001/09/15-foobar)",
+              R"(string hostname="foobar", string data="2001/09/15-foobar"))",
               results.back());
   }
 
@@ -271,10 +271,10 @@ TEST_F(CompositePushdownTest, 
TestPushDownPrefixEqualitySuffixInequality) {
     ASSERT_NO_FATAL_FAILURE(ScanTablet(&spec, &results, "Prefix equality, 
suffix inequality"));
     ASSERT_EQ(28 * 3, results.size());
     EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=1, "
-              "string hostname=baz, string data=2001/09/01-baz)",
+              R"(string hostname="baz", string data="2001/09/01-baz"))",
               results.front());
     EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=28, "
-              "string hostname=foobar, string data=2001/09/28-foobar)",
+              R"(string hostname="foobar", string data="2001/09/28-foobar"))",
               results.back());
   }
 
@@ -288,10 +288,10 @@ TEST_F(CompositePushdownTest, 
TestPushDownPrefixEqualitySuffixInequality) {
     ASSERT_NO_FATAL_FAILURE(ScanTablet(&spec, &results, "Prefix equality, 
suffix inequality"));
     ASSERT_EQ(15 * 3, results.size());
     EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=1, "
-              "string hostname=baz, string data=2001/09/01-baz)",
+              R"(string hostname="baz", string data="2001/09/01-baz"))",
               results.front());
     EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=15, "
-              "string hostname=foobar, string data=2001/09/15-foobar)",
+              R"(string hostname="foobar", string data="2001/09/15-foobar"))",
               results.back());
   }
 
@@ -304,10 +304,10 @@ TEST_F(CompositePushdownTest, 
TestPushDownPrefixEqualitySuffixInequality) {
     ASSERT_NO_FATAL_FAILURE(ScanTablet(&spec, &results, "Prefix equality, 
suffix inequality"));
     ASSERT_EQ(3 * 28 * 3, results.size());
     EXPECT_EQ("(int16 year=2001, int8 month=9, int8 day=1, "
-              "string hostname=baz, string data=2001/09/01-baz)",
+              R"(string hostname="baz", string data="2001/09/01-baz"))",
               results.front());
     EXPECT_EQ("(int16 year=2001, int8 month=11, int8 day=28, "
-              "string hostname=foobar, string data=2001/11/28-foobar)",
+              R"(string hostname="foobar", string data="2001/11/28-foobar"))",
               results.back());
   }
 
@@ -320,10 +320,10 @@ TEST_F(CompositePushdownTest, 
TestPushDownPrefixEqualitySuffixInequality) {
     ASSERT_NO_FATAL_FAILURE(ScanTablet(&spec, &results, "Prefix equality, 
suffix inequality"));
     ASSERT_EQ(8 * 28 * 3, results.size());
     EXPECT_EQ("(int16 year=2001, int8 month=1, int8 day=1, "
-              "string hostname=baz, string data=2001/01/01-baz)",
+              R"(string hostname="baz", string data="2001/01/01-baz"))",
               results.front());
     EXPECT_EQ("(int16 year=2001, int8 month=8, int8 day=28, "
-              "string hostname=foobar, string data=2001/08/28-foobar)",
+              R"(string hostname="foobar", string data="2001/08/28-foobar"))",
               results.back());
   }
 }
@@ -341,10 +341,10 @@ TEST_F(CompositePushdownTest, 
TestPushdownPrefixInequality) {
     ASSERT_NO_FATAL_FAILURE(ScanTablet(&spec, &results, "Prefix inequality"));
     ASSERT_EQ(3 * 12 * 28 * 3, results.size());
     EXPECT_EQ("(int16 year=2001, int8 month=1, int8 day=1, "
-              "string hostname=baz, string data=2001/01/01-baz)",
+              R"(string hostname="baz", string data="2001/01/01-baz"))",
               results.front());
     EXPECT_EQ("(int16 year=2003, int8 month=12, int8 day=28, "
-              "string hostname=foobar, string data=2003/12/28-foobar)",
+              R"(string hostname="foobar", string data="2003/12/28-foobar"))",
               results.back());
   }
 
@@ -359,10 +359,10 @@ TEST_F(CompositePushdownTest, 
TestPushdownPrefixInequality) {
     // Needed because results from memrowset are returned first and memrowset 
begins
     // with last 10% of the keys (e.g., last few years)
     EXPECT_EQ("(int16 year=2001, int8 month=1, int8 day=1, "
-              "string hostname=baz, string data=2001/01/01-baz)",
+              R"(string hostname="baz", string data="2001/01/01-baz"))",
               results.front());
     EXPECT_EQ("(int16 year=2010, int8 month=12, int8 day=28, "
-              "string hostname=foobar, string data=2010/12/28-foobar)",
+              R"(string hostname="foobar", string data="2010/12/28-foobar"))",
               results.back());
   }
 
@@ -375,15 +375,12 @@ TEST_F(CompositePushdownTest, 
TestPushdownPrefixInequality) {
     ASSERT_NO_FATAL_FAILURE(ScanTablet(&spec, &results, "Prefix inequality"));
     ASSERT_EQ(4 * 12 * 28 * 3, results.size());
     EXPECT_EQ("(int16 year=2000, int8 month=1, int8 day=1, "
-              "string hostname=baz, string data=2000/01/01-baz)",
+              R"(string hostname="baz", string data="2000/01/01-baz"))",
               results.front());
     EXPECT_EQ("(int16 year=2003, int8 month=12, int8 day=28, "
-              "string hostname=foobar, string data=2003/12/28-foobar)",
+              R"(string hostname="foobar", string data="2003/12/28-foobar"))",
               results.back());
   }
 }
-
-
-
 } // namespace tablet
 } // namespace kudu

http://git-wip-us.apache.org/repos/asf/kudu/blob/f165ef7d/src/kudu/tablet/diskrowset-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/diskrowset-test.cc 
b/src/kudu/tablet/diskrowset-test.cc
index 2da7600..37f0268 100644
--- a/src/kudu/tablet/diskrowset-test.cc
+++ b/src/kudu/tablet/diskrowset-test.cc
@@ -173,7 +173,7 @@ TEST_F(TestRowSet, TestRandomRead) {
 
   // Read un-updated row.
   VerifyRandomRead(*rs, "hello 000000000000050",
-                   "(string key=hello 000000000000050, uint32 val=50)");
+                   R"((string key="hello 000000000000050", uint32 val=50))");
   NO_FATALS();
 
   // Update the row.
@@ -182,7 +182,7 @@ TEST_F(TestRowSet, TestRandomRead) {
 
   // Read it again -- should see the updated value.
   VerifyRandomRead(*rs, "hello 000000000000050",
-                   "(string key=hello 000000000000050, uint32 val=12345)");
+                   R"((string key="hello 000000000000050", uint32 
val=12345))");
   NO_FATALS();
 
   // Try to read a row which comes before the first key.
@@ -222,13 +222,13 @@ TEST_F(TestRowSet, TestDelete) {
     // Reading the MVCC snapshot prior to deletion should show the row.
     ASSERT_OK(DumpRowSet(*rs, schema_, snap_before_delete, &rows));
     ASSERT_EQ(2, rows.size());
-    EXPECT_EQ("(string key=hello 000000000000000, uint32 val=0)", rows[0]);
-    EXPECT_EQ("(string key=hello 000000000000001, uint32 val=1)", rows[1]);
+    EXPECT_EQ(R"((string key="hello 000000000000000", uint32 val=0))", 
rows[0]);
+    EXPECT_EQ(R"((string key="hello 000000000000001", uint32 val=1))", 
rows[1]);
 
     // Reading the MVCC snapshot after the deletion should hide the row.
     ASSERT_OK(DumpRowSet(*rs, schema_, snap_after_delete, &rows));
     ASSERT_EQ(1, rows.size());
-    EXPECT_EQ("(string key=hello 000000000000001, uint32 val=1)", rows[0]);
+    EXPECT_EQ(R"((string key="hello 000000000000001", uint32 val=1))", 
rows[0]);
 
     // Trying to delete or update the same row again should fail.
     OperationResultPB result;
@@ -363,7 +363,7 @@ TEST_F(TestRowSet, TestFlushedUpdatesRespectMVCC) {
     gscoped_ptr<RowwiseIterator> iter;
     ASSERT_OK(rs->NewRowIterator(&schema_, snaps[i], UNORDERED, &iter));
     string data = InitAndDumpIterator(std::move(iter));
-    EXPECT_EQ(StringPrintf("(string key=row, uint32 val=%d)", i + 1), data);
+    EXPECT_EQ(StringPrintf(R"((string key="row", uint32 val=%d))", i + 1), 
data);
   }
 
   // Flush deltas to disk and ensure that the historical versions are still
@@ -375,9 +375,8 @@ TEST_F(TestRowSet, TestFlushedUpdatesRespectMVCC) {
     gscoped_ptr<RowwiseIterator> iter;
     ASSERT_OK(rs->NewRowIterator(&schema_, snaps[i], UNORDERED, &iter));
     string data = InitAndDumpIterator(std::move(iter));
-    EXPECT_EQ(StringPrintf("(string key=row, uint32 val=%d)", i + 1), data);
+    EXPECT_EQ(StringPrintf(R"((string key="row", uint32 val=%d))", i + 1), 
data);
   }
-
 }
 
 // Similar to TestDMSFlush above, except does not actually verify

http://git-wip-us.apache.org/repos/asf/kudu/blob/f165ef7d/src/kudu/tablet/major_delta_compaction-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/major_delta_compaction-test.cc 
b/src/kudu/tablet/major_delta_compaction-test.cc
index 7f7276e..a1f5a84 100644
--- a/src/kudu/tablet/major_delta_compaction-test.cc
+++ b/src/kudu/tablet/major_delta_compaction-test.cc
@@ -62,7 +62,7 @@ class TestMajorDeltaCompaction : public KuduRowSetTest {
 
     string Formatted() const {
       return strings::Substitute(
-        "(string key=$0, int32 val1=$1, string val2=$2, int32 val3=$3, string 
val4=$4)",
+        R"((string key="$0", int32 val1=$1, string val2="$2", int32 val3=$3, 
string val4="$4"))",
         key, val1, val2, val3, val4);
     }
   };

http://git-wip-us.apache.org/repos/asf/kudu/blob/f165ef7d/src/kudu/tablet/memrowset-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/memrowset-test.cc 
b/src/kudu/tablet/memrowset-test.cc
index a3c7057..4aad650 100644
--- a/src/kudu/tablet/memrowset-test.cc
+++ b/src/kudu/tablet/memrowset-test.cc
@@ -206,13 +206,13 @@ TEST_F(TestMemRowSet, TestInsertAndIterate) {
   // be "goodbye" because 'g' sorts before 'h'
   ASSERT_TRUE(iter->HasNext());
   MRSRow row = iter->GetCurrentRow();
-  EXPECT_EQ("(string key=goodbye world, uint32 val=54321)", 
schema_.DebugRow(row));
+  EXPECT_EQ(R"((string key="goodbye world", uint32 val=54321))", 
schema_.DebugRow(row));
 
   // Next row should be 'hello world'
   ASSERT_TRUE(iter->Next());
   ASSERT_TRUE(iter->HasNext());
   row = iter->GetCurrentRow();
-  EXPECT_EQ("(string key=hello world, uint32 val=12345)", 
schema_.DebugRow(row));
+  EXPECT_EQ(R"((string key="hello world", uint32 val=12345))", 
schema_.DebugRow(row));
 
   ASSERT_FALSE(iter->Next());
   ASSERT_FALSE(iter->HasNext());
@@ -275,21 +275,21 @@ TEST_F(TestMemRowSet, TestInsertAndIterateCompoundKey) {
   // be "goodbye" (row3) sorted on the second key
   ASSERT_TRUE(iter->HasNext());
   MRSRow row = iter->GetCurrentRow();
-  EXPECT_EQ("(string key1=goodbye world, int32 key2=1, uint32 val=12345)",
+  EXPECT_EQ(R"((string key1="goodbye world", int32 key2=1, uint32 val=12345))",
             compound_key_schema.DebugRow(row));
 
   // Next row should be "goodbye" (row2)
   ASSERT_TRUE(iter->Next());
   ASSERT_TRUE(iter->HasNext());
   row = iter->GetCurrentRow();
-  EXPECT_EQ("(string key1=goodbye world, int32 key2=2, uint32 val=54321)",
+  EXPECT_EQ(R"((string key1="goodbye world", int32 key2=2, uint32 val=54321))",
             compound_key_schema.DebugRow(row));
 
   // Next row should be 'hello world' (row1)
   ASSERT_TRUE(iter->Next());
   ASSERT_TRUE(iter->HasNext());
   row = iter->GetCurrentRow();
-  EXPECT_EQ("(string key1=hello world, int32 key2=1, uint32 val=12345)",
+  EXPECT_EQ(R"((string key1="hello world", int32 key2=1, uint32 val=12345))",
             compound_key_schema.DebugRow(row));
 
   ASSERT_FALSE(iter->Next());
@@ -316,7 +316,7 @@ TEST_F(TestMemRowSet, TestUpdate) {
   ASSERT_OK(InsertRow(mrs.get(), "hello world", 1));
 
   // Validate insertion
-  CheckValue(mrs, "hello world", "(string key=hello world, uint32 val=1)");
+  CheckValue(mrs, "hello world", R"((string key="hello world", uint32 
val=1))");
 
   // Update a key which exists.
   OperationResultPB result;
@@ -325,7 +325,7 @@ TEST_F(TestMemRowSet, TestUpdate) {
   ASSERT_EQ(0L, result.mutated_stores(0).mrs_id());
 
   // Validate the updated value
-  CheckValue(mrs, "hello world", "(string key=hello world, uint32 val=2)");
+  CheckValue(mrs, "hello world", R"((string key="hello world", uint32 
val=2))");
 
   // Try to update a key which doesn't exist - should return NotFound
   result.Clear();
@@ -347,7 +347,7 @@ TEST_F(TestMemRowSet, TestInsertCopiesToArena) {
   for (uint32_t i = 0; i < 100; i++) {
     snprintf(keybuf, sizeof(keybuf), "hello %d", i);
     CheckValue(mrs, keybuf,
-               StringPrintf("(string key=%s, uint32 val=%d)", keybuf, i));
+               StringPrintf(R"((string key="%s", uint32 val=%d))", keybuf, i));
   }
 }
 
@@ -405,14 +405,14 @@ TEST_F(TestMemRowSet, TestDelete) {
   vector<string> rows;
   ASSERT_OK(mrs->DebugDump(&rows));
   ASSERT_EQ(1, rows.size());
-  EXPECT_EQ("@1: row (string key=hello world, uint32 val=1) mutations="
+  EXPECT_EQ(R"(@1: row (string key="hello world", uint32 val=1) mutations=)"
             "[@2(DELETE), @5(REINSERT val=2)]",
             rows[0]);
 
   // Verify that iterating the rowset at the first snapshot shows the row.
   ASSERT_OK(DumpRowSet(*mrs, schema_, snapshot_before_delete, &rows));
   ASSERT_EQ(1, rows.size());
-  EXPECT_EQ("(string key=hello world, uint32 val=1)", rows[0]);
+  EXPECT_EQ(R"((string key="hello world", uint32 val=1))", rows[0]);
 
   // Verify that iterating the rowset at the snapshot where it's deleted
   // doesn't show the row.
@@ -422,7 +422,7 @@ TEST_F(TestMemRowSet, TestDelete) {
   // Verify that iterating the rowset after it's re-inserted shows the row.
   ASSERT_OK(DumpRowSet(*mrs, schema_, snapshot_after_reinsert, &rows));
   ASSERT_EQ(1, rows.size());
-  EXPECT_EQ("(string key=hello world, uint32 val=2)", rows[0]);
+  EXPECT_EQ(R"((string key="hello world", uint32 val=2))", rows[0]);
 }
 
 // Test for basic operations.
@@ -489,7 +489,7 @@ TEST_F(TestMemRowSet, TestInsertionMVCC) {
     vector<string> rows;
     ASSERT_OK(kudu::tablet::DumpRowSet(*mrs, schema_, snapshots[i], &rows));
     ASSERT_EQ(1 + i, rows.size());
-    string expected = StringPrintf("(string key=tx%d, uint32 val=%d)", i, i);
+    string expected = StringPrintf(R"((string key="tx%d", uint32 val=%d))", i, 
i);
     ASSERT_EQ(expected, rows[i]);
   }
 }
@@ -530,7 +530,7 @@ TEST_F(TestMemRowSet, TestUpdateMVCC) {
     ASSERT_OK(kudu::tablet::DumpRowSet(*mrs, schema_, snapshots[i], &rows));
     ASSERT_EQ(1, rows.size());
 
-    string expected = StringPrintf("(string key=my row, uint32 val=%d)", i);
+    string expected = StringPrintf(R"((string key="my row", uint32 val=%d))", 
i);
     LOG(INFO) << "Reading with snapshot " << snapshots[i].ToString() << ": "
               << rows[0];
     EXPECT_EQ(expected, rows[0]);

http://git-wip-us.apache.org/repos/asf/kudu/blob/f165ef7d/src/kudu/tablet/tablet-pushdown-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet-pushdown-test.cc 
b/src/kudu/tablet/tablet-pushdown-test.cc
index 1188dbe..2106a5a 100644
--- a/src/kudu/tablet/tablet-pushdown-test.cc
+++ b/src/kudu/tablet/tablet-pushdown-test.cc
@@ -101,9 +101,9 @@ class TabletPushdownTest : public KuduTabletTest,
       LOG(INFO) << str;
     }
     ASSERT_EQ(11, results.size());
-    ASSERT_EQ("(int32 key=200, int32 int_val=2000, string 
string_val=00000200)",
+    ASSERT_EQ(R"((int32 key=200, int32 int_val=2000, string 
string_val="00000200"))",
               results[0]);
-    ASSERT_EQ("(int32 key=210, int32 int_val=2100, string 
string_val=00000210)",
+    ASSERT_EQ(R"((int32 key=210, int32 int_val=2100, string 
string_val="00000210"))",
               results[10]);
 
     int expected_blocks_from_disk;

http://git-wip-us.apache.org/repos/asf/kudu/blob/f165ef7d/src/kudu/tablet/tablet-test-base.h
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet-test-base.h 
b/src/kudu/tablet/tablet-test-base.h
index 0a7e5c1..ec80023 100644
--- a/src/kudu/tablet/tablet-test-base.h
+++ b/src/kudu/tablet/tablet-test-base.h
@@ -89,9 +89,8 @@ struct StringKeyTestSetup {
     char buf[256];
     FormatKey(buf, sizeof(buf), key_idx);
 
-    return Substitute(
-      "(string key=$0, int32 key_idx=$1, int32 val=$2)",
-      buf, key_idx, val);
+    return Substitute(R"((string key="$0", int32 key_idx=$1, int32 val=$2))",
+                      buf, key_idx, val);
   }
 
   // Slices can be arbitrarily large

http://git-wip-us.apache.org/repos/asf/kudu/blob/f165ef7d/src/kudu/tablet/tablet.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet.cc b/src/kudu/tablet/tablet.cc
index 91674ff..5fe288f 100644
--- a/src/kudu/tablet/tablet.cc
+++ b/src/kudu/tablet/tablet.cc
@@ -351,7 +351,7 @@ Status Tablet::CheckRowInTablet(const ConstContiguousRow& 
row) const {
         Substitute("Row not in tablet partition. Partition: '$0', row: '$1'.",
                    
metadata_->partition_schema().PartitionDebugString(metadata_->partition(),
                                                                       
*schema()),
-                   metadata_->partition_schema().RowDebugString(row)));
+                   
metadata_->partition_schema().PartitionKeyDebugString(row)));
   }
   return Status::OK();
 }

http://git-wip-us.apache.org/repos/asf/kudu/blob/f165ef7d/src/kudu/tablet/tablet_bootstrap-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tablet/tablet_bootstrap-test.cc 
b/src/kudu/tablet/tablet_bootstrap-test.cc
index d7468ef..2a223bc 100644
--- a/src/kudu/tablet/tablet_bootstrap-test.cc
+++ b/src/kudu/tablet/tablet_bootstrap-test.cc
@@ -240,7 +240,7 @@ TEST_F(BootstrapTest, TestOrphanCommit) {
     vector<string> results;
     IterateTabletRows(tablet.get(), &results);
     ASSERT_EQ(1, results.size());
-    ASSERT_EQ("(int32 key=1, int32 int_val=0, string string_val=this is a test 
insert)",
+    ASSERT_EQ(R"((int32 key=1, int32 int_val=0, string string_val="this is a 
test insert"))",
               results[0]);
     ASSERT_EQ(2, tablet->metadata()->last_durable_mrs_id());
   }
@@ -309,7 +309,7 @@ TEST_F(BootstrapTest, TestNonOrphansAfterOrphanCommit) {
 
   // 'key=3' means the REPLICATE message was inserted when current_id_ was 3, 
meaning
   // that only the non-orphan commit went in.
-  ASSERT_EQ("(int32 key=3, int32 int_val=0, string string_val=this is a test 
insert)",
+  ASSERT_EQ(R"((int32 key=3, int32 int_val=0, string string_val="this is a 
test insert"))",
             results[0]);
 }
 
@@ -392,7 +392,7 @@ TEST_F(BootstrapTest, TestOperationOverwriting) {
   IterateTabletRows(tablet.get(), &results);
   ASSERT_EQ(1, results.size());
 
-  ASSERT_EQ("(int32 key=1, int32 int_val=0, string string_val=this is a test 
insert)",
+  ASSERT_EQ(R"((int32 key=1, int32 int_val=0, string string_val="this is a 
test insert"))",
             results[0]);
 }
 
@@ -456,7 +456,7 @@ TEST_F(BootstrapTest, TestOutOfOrderCommits) {
   IterateTabletRows(tablet.get(), &results);
   ASSERT_EQ(1, results.size());
 
-  ASSERT_EQ("(int32 key=10, int32 int_val=2, string string_val=this is a test 
mutate)",
+  ASSERT_EQ(R"((int32 key=10, int32 int_val=2, string string_val="this is a 
test mutate"))",
             results[0]);
 }
 

http://git-wip-us.apache.org/repos/asf/kudu/blob/f165ef7d/src/kudu/tools/kudu-ts-cli-test.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tools/kudu-ts-cli-test.cc 
b/src/kudu/tools/kudu-ts-cli-test.cc
index bbbf73d..a155c84 100644
--- a/src/kudu/tools/kudu-ts-cli-test.cc
+++ b/src/kudu/tools/kudu-ts-cli-test.cc
@@ -132,7 +132,7 @@ TEST_F(KuduTsCliTest, TestDumpTablet) {
   for (const auto& row : rows) {
     ASSERT_STR_MATCHES(row, "int32 key=");
     ASSERT_STR_MATCHES(row, "int32 int_val=");
-    ASSERT_STR_MATCHES(row, "string string_val=hello world");
+    ASSERT_STR_MATCHES(row, R"(string string_val="hello world")");
     nrows++;
   }
   ASSERT_GE(nrows, kNumRows);

http://git-wip-us.apache.org/repos/asf/kudu/blob/f165ef7d/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 4d9ab10..ed31dda 100644
--- a/src/kudu/tserver/tablet_server-test.cc
+++ b/src/kudu/tserver/tablet_server-test.cc
@@ -174,7 +174,7 @@ TEST_F(TabletServerTest, TestWebPages) {
   ASSERT_OK(c.FetchURL(Substitute("http://$0/tablets";, addr),
                               &buf));
   ASSERT_STR_CONTAINS(buf.ToString(), kTabletId);
-  ASSERT_STR_CONTAINS(buf.ToString(), "<td>range: [&lt;start&gt;, 
&lt;end&gt;)</td>");
+  ASSERT_STR_CONTAINS(buf.ToString(), "RANGE (key) PARTITION UNBOUNDED</td>");
 
   // Tablet page should include the schema.
   ASSERT_OK(c.FetchURL(Substitute("http://$0/tablet?id=$1";, addr, kTabletId),
@@ -197,7 +197,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(), "\"partition\": \"range: [<start>, 
<end>)\"");
+    ASSERT_STR_CONTAINS(buf.ToString(), "\"partition\": \"RANGE (key) 
PARTITION UNBOUNDED");
 
 
     // Check entity attributes.
@@ -1117,8 +1117,8 @@ TEST_F(TabletServerTest, TestSnapshotScan) {
     }
 
     // assert that the first and last rows were the expected ones
-    ASSERT_EQ("(int32 key=0, int32 int_val=0, string string_val=original0)", 
results[0]);
-    ASSERT_EQ(Substitute("(int32 key=$0, int32 int_val=$0, string 
string_val=original$0)",
+    ASSERT_EQ(R"((int32 key=0, int32 int_val=0, string 
string_val="original0"))", results[0]);
+    ASSERT_EQ(Substitute(R"((int32 key=$0, int32 int_val=$0, string 
string_val="original$0"))",
                          (batch_idx * (num_rows / num_batches) - 1)), 
results[results.size() - 1]);
     batch_idx++;
   }
@@ -1375,7 +1375,7 @@ TEST_F(TabletServerTest, 
TestSnapshotScan_SnapshotInTheFutureWithPropagatedTimes
   vector<string> results;
   ASSERT_NO_FATAL_FAILURE(DrainScannerToStrings(resp.scanner_id(), schema_, 
&results));
   ASSERT_EQ(1, results.size());
-  ASSERT_EQ("(int32 key=0, int32 int_val=0, string string_val=original0)", 
results[0]);
+  ASSERT_EQ(R"((int32 key=0, int32 int_val=0, string 
string_val="original0"))", results[0]);
 }
 
 
@@ -1454,8 +1454,8 @@ TEST_F(TabletServerTest, TestScanWithStringPredicates) {
   ASSERT_NO_FATAL_FAILURE(
     DrainScannerToStrings(resp.scanner_id(), schema_, &results));
   ASSERT_EQ(10, results.size());
-  ASSERT_EQ("(int32 key=50, int32 int_val=100, string string_val=hello 50)", 
results[0]);
-  ASSERT_EQ("(int32 key=59, int32 int_val=118, string string_val=hello 59)", 
results[9]);
+  ASSERT_EQ(R"((int32 key=50, int32 int_val=100, string string_val="hello 
50"))", results[0]);
+  ASSERT_EQ(R"((int32 key=59, int32 int_val=118, string string_val="hello 
59"))", results[9]);
 }
 
 TEST_F(TabletServerTest, TestScanWithPredicates) {
@@ -1545,9 +1545,9 @@ TEST_F(TabletServerTest, TestScanWithEncodedPredicates) {
   ASSERT_NO_FATAL_FAILURE(
     DrainScannerToStrings(resp.scanner_id(), schema_, &results));
   ASSERT_EQ(9, results.size());
-  EXPECT_EQ("(int32 key=51, int32 int_val=102, string string_val=hello 51)",
+  EXPECT_EQ(R"((int32 key=51, int32 int_val=102, string string_val="hello 
51"))",
             results.front());
-  EXPECT_EQ("(int32 key=59, int32 int_val=118, string string_val=hello 59)",
+  EXPECT_EQ(R"((int32 key=59, int32 int_val=118, string string_val="hello 
59"))",
             results.back());
 }
 
@@ -1763,7 +1763,8 @@ TEST_F(TabletServerTest, 
TestOrderedScan_ProjectionWithKeyColumnsInOrder) {
     sb.AddColumn(schema_.column(i), false);
   }
   const Schema& projection = sb.BuildWithoutIds();
-  DoOrderedScanTest(projection, "(int32 key=$0, int32 int_val=$1, string 
string_val=hello $0)");
+  DoOrderedScanTest(projection,
+                    R"((int32 key=$0, int32 int_val=$1, string 
string_val="hello $0"))");
 }
 
 // Same as above but doesn't add the key columns to the projection.
@@ -1774,7 +1775,7 @@ TEST_F(TabletServerTest, 
TestOrderedScan_ProjectionWithoutKeyColumns) {
     sb.AddColumn(schema_.column(i), false);
   }
   const Schema& projection = sb.BuildWithoutIds();
-  DoOrderedScanTest(projection, "(int32 int_val=$1, string string_val=hello 
$0)");
+  DoOrderedScanTest(projection, R"((int32 int_val=$1, string string_val="hello 
$0"))");
 }
 
 // Same as above but creates a projection with the order of columns reversed.
@@ -1785,7 +1786,8 @@ TEST_F(TabletServerTest, 
TestOrderedScan_ProjectionWithKeyColumnsOutOfOrder) {
     sb.AddColumn(schema_.column(i), false);
   }
   const Schema& projection = sb.BuildWithoutIds();
-  DoOrderedScanTest(projection, "(string string_val=hello $0, int32 
int_val=$1, int32 key=$0)");
+  DoOrderedScanTest(projection,
+                    R"((string string_val="hello $0", int32 int_val=$1, int32 
key=$0))");
 }
 
 TEST_F(TabletServerTest, TestAlterSchema) {

Reply via email to