Index: test/cctest/test-log-utils.cc |
diff --git a/test/cctest/test-log-utils.cc b/test/cctest/test-log-utils.cc |
index 64e59009917ed8e165705ea19912ee3e6d08e7d6..385019b5c4cb03cb82667c08c7b4f33cb81e79ff 100644 |
--- a/test/cctest/test-log-utils.cc |
+++ b/test/cctest/test-log-utils.cc |
@@ -9,8 +9,12 @@ |
#include "log-utils.h" |
#include "cctest.h" |
+using v8::internal::CStrVector; |
using v8::internal::EmbeddedVector; |
using v8::internal::LogDynamicBuffer; |
+using v8::internal::LogRecordCompressor; |
+using v8::internal::MutableCStrVector; |
+using v8::internal::ScopedVector; |
using v8::internal::Vector; |
// Fills 'ref_buffer' with test data: a sequence of two-digit |
@@ -47,9 +51,13 @@ static inline void CheckEqualsHelper(const char* file, int line, |
const Vector<V>& value) { |
if (expected.length() != value.length()) { |
V8_Fatal(file, line, "CHECK_EQ(%s, %s) failed\n" |
- "# Vectors lengths differ: %d expected, %d found", |
+ "# Vectors lengths differ: %d expected, %d found\n" |
+ "# Expected: %.*s\n" |
+ "# Found: %.*s", |
expected_source, value_source, |
- expected.length(), value.length()); |
+ expected.length(), value.length(), |
+ expected.length(), expected.start(), |
+ value.length(), value.start()); |
} |
if (strncmp(expected.start(), value.start(), expected.length()) != 0) { |
V8_Fatal(file, line, "CHECK_EQ(%s, %s) failed\n" |
@@ -124,9 +132,159 @@ TEST(DynaBufSealing) { |
// Check the seal. |
EmbeddedVector<char, 50> seal_buf; |
CHECK_EQ(seal_size, ReadData(&dynabuf, 100, &seal_buf)); |
- CHECK_EQ(v8::internal::CStrVector(seal), seal_buf.SubVector(0, seal_size)); |
+ CHECK_EQ(CStrVector(seal), seal_buf.SubVector(0, seal_size)); |
// Verify that there's no data beyond the seal. |
CHECK_EQ(0, ReadData(&dynabuf, 100 + seal_size, &buf)); |
} |
+ |
+TEST(CompressorStore) { |
+ LogRecordCompressor comp(2); |
+ const Vector<const char> empty = CStrVector(""); |
+ CHECK(comp.Store(empty)); |
+ CHECK(!comp.Store(empty)); |
+ CHECK(!comp.Store(empty)); |
+ const Vector<const char> aaa = CStrVector("aaa"); |
+ CHECK(comp.Store(aaa)); |
+ CHECK(!comp.Store(aaa)); |
+ CHECK(!comp.Store(aaa)); |
+ CHECK(comp.Store(empty)); |
+ CHECK(!comp.Store(empty)); |
+ CHECK(!comp.Store(empty)); |
+} |
+ |
+ |
+void CheckCompression(LogRecordCompressor* comp, |
Søren Thygesen Gjesse
2009/06/11 11:13:56
Not that it's a big deal, but you could use a refe
Mikhail Naganov
2009/06/11 14:07:12
I'm modifying Compressor's state, to I'm treating
|
+ const Vector<const char>& after) { |
+ EmbeddedVector<char, 100> result; |
+ CHECK(comp->RetrievePreviousCompressed(&result)); |
+ CHECK_EQ(after, result); |
+} |
+ |
+ |
+void CheckCompression(LogRecordCompressor* comp, |
Søren Thygesen Gjesse
2009/06/11 11:13:56
Ditto.
|
+ const char* after) { |
+ CheckCompression(comp, CStrVector(after)); |
+} |
+ |
+ |
+TEST(CompressorNonCompressed) { |
+ LogRecordCompressor comp(2); |
+ CHECK(!comp.RetrievePreviousCompressed(NULL)); |
+ const Vector<const char> empty = CStrVector(""); |
+ CHECK(comp.Store(empty)); |
+ CHECK(!comp.RetrievePreviousCompressed(NULL)); |
+ const Vector<const char> a_x_20 = CStrVector("aaaaaaaaaaaaaaaaaaaa"); |
+ CHECK(comp.Store(a_x_20)); |
+ CheckCompression(&comp, empty); |
+ CheckCompression(&comp, empty); |
+ CHECK(comp.Store(empty)); |
+ CheckCompression(&comp, a_x_20); |
+ CheckCompression(&comp, a_x_20); |
+} |
+ |
+ |
+TEST(CompressorSingleLine) { |
+ LogRecordCompressor comp(3); |
+ const Vector<const char> string_1 = CStrVector("eee,ddd,ccc,bbb,aaa"); |
+ CHECK(comp.Store(string_1)); |
+ const Vector<const char> string_2 = CStrVector("fff,ddd,ccc,bbb,aaa"); |
+ CHECK(comp.Store(string_2)); |
+ // string_1 hasn't been compressed. |
+ CheckCompression(&comp, string_1); |
+ CheckCompression(&comp, string_1); |
+ const Vector<const char> string_3 = CStrVector("hhh,ggg,ccc,bbb,aaa"); |
+ CHECK(comp.Store(string_3)); |
+ // string_2 compressed using string_1. |
+ CheckCompression(&comp, "fff,#1:1"); |
+ CheckCompression(&comp, "fff,#1:1"); |
+ CHECK(!comp.Store(string_3)); |
+ // Expecting no changes. |
+ CheckCompression(&comp, "fff,#1:1"); |
+ CHECK(!comp.Store(string_3)); |
+ // Expecting no changes. |
+ CheckCompression(&comp, "fff,#1:1"); |
+ const Vector<const char> string_4 = CStrVector("iii,hhh,ggg,ccc,bbb,aaa"); |
+ CHECK(comp.Store(string_4)); |
+ // string_3 compressed using string_2. |
+ CheckCompression(&comp, "hhh,ggg,#1:2"); |
+ const Vector<const char> string_5 = CStrVector("nnn,mmm,lll,kkk,jjj"); |
+ CHECK(comp.Store(string_5)); |
+ // string_4 compressed using string_3. |
+ CheckCompression(&comp, "iii,hhh,#1:1"); |
+ const Vector<const char> string_6 = CStrVector("nnn,mmmmmm,lll,kkk,jjj"); |
+ CHECK(comp.Store(string_6)); |
+ // string_5 hasn't been compressed. |
+ CheckCompression(&comp, string_5); |
+ CHECK(comp.Store(string_5)); |
+ // string_6 compressed using string_5. |
+ CheckCompression(&comp, "nnn,mmmmmm,#1:2"); |
+ const Vector<const char> string_7 = CStrVector("nnnnnn,mmm,lll,kkk,jjj"); |
+ CHECK(comp.Store(string_7)); |
+ // string_5 compressed using string_6. |
+ CheckCompression(&comp, "nnn,mmm,#1:2"); |
+ const Vector<const char> string_8 = CStrVector("xxn,mmm,lll,kkk,jjj"); |
+ CHECK(comp.Store(string_8)); |
+ // string_7 compressed using string_5. |
+ CheckCompression(&comp, "nnnnnn,#1:1"); |
+ const Vector<const char> string_9 = |
+ CStrVector("aaaaaaaaaaaaa,bbbbbbbbbbbbbbbbb"); |
+ CHECK(comp.Store(string_9)); |
+ // string_8 compressed using string_7. |
+ CheckCompression(&comp, "xxn,#1:1"); |
+ const Vector<const char> string_10 = |
+ CStrVector("aaaaaaaaaaaaa,cccccccbbbbbbbbbb"); |
+ CHECK(comp.Store(string_10)); |
+ // string_9 hasn't been compressed. |
+ CheckCompression(&comp, string_9); |
+ CHECK(comp.Store(string_1)); |
+ // string_10 hasn't been compressed. |
+ CheckCompression(&comp, string_10); |
+} |
+ |
+ |
+ |
+TEST(CompressorMultiLines) { |
+ LogRecordCompressor comp(5); |
+ const Vector<const char> string_1 = CStrVector("eee,ddd,ccc,bbb,aaa"); |
+ CHECK(comp.Store(string_1)); |
+ const Vector<const char> string_2 = CStrVector("iii,hhh,ggg,fff,aaa"); |
+ CHECK(comp.Store(string_2)); |
+ const Vector<const char> string_3 = CStrVector("mmm,lll,kkk,jjj,aaa"); |
+ CHECK(comp.Store(string_3)); |
+ const Vector<const char> string_4 = CStrVector("nnn,hhh,ggg,fff,aaa"); |
+ CHECK(comp.Store(string_4)); |
+ const Vector<const char> string_5 = CStrVector("ooo,lll,kkk,jjj,aaa"); |
+ CHECK(comp.Store(string_5)); |
+ // string_4 compressed using string_2. |
+ CheckCompression(&comp, "nnn,#2:1"); |
+ CHECK(comp.Store(string_1)); |
+ // string_5 compressed using string_3. |
+ CheckCompression(&comp, "ooo,#2:1"); |
+ CHECK(comp.Store(string_4)); |
+ // string_1 is out of buffer by now, so it shouldn't be compressed. |
Søren Thygesen Gjesse
2009/06/11 11:13:56
Add an assert for kRecordCompressorWindow to easil
Mikhail Naganov
2009/06/11 14:07:12
Actually, it doesn't depend on kRecordCompressorWi
|
+ CheckCompression(&comp, string_1); |
+ CHECK(comp.Store(string_2)); |
+ // string_4 compressed using itself. |
+ CheckCompression(&comp, "nnn,#3:1"); |
+} |
+ |
+ |
+TEST(CompressorBestSelection) { |
+ LogRecordCompressor comp(5); |
+ const Vector<const char> string_1 = CStrVector("eee,ddd,ccc,bbb,aaa"); |
+ CHECK(comp.Store(string_1)); |
+ const Vector<const char> string_2 = CStrVector("ddd,ccc,bbb,aaa"); |
+ CHECK(comp.Store(string_2)); |
+ const Vector<const char> string_3 = CStrVector("fff,eee,ddd,ccc,bbb,aaa"); |
+ CHECK(comp.Store(string_3)); |
+ // string_2 compressed using string_1. |
+ CheckCompression(&comp, "ddd,#1:2"); |
+ const Vector<const char> string_4 = CStrVector("nnn,hhh,ggg,fff,aaa"); |
+ CHECK(comp.Store(string_4)); |
+ // Compressing string_3 using string_1 gives a better compression than |
+ // using string_2. |
+ CheckCompression(&comp, "fff,eee,#2:1"); |
+} |
+ |
#endif // ENABLE_LOGGING_AND_PROFILING |