Don't decompress blocks that we'll skip.

Should help when skipping very big blobs, but don't have such trace
handy now.

diff --git a/trace_snappyfile.cpp b/trace_snappyfile.cpp
index ad3dc723242fd6a60275bb7a3cdf6e23afba4966..1794a829c6635c2a57a11b33e446958dc908fe54 100644 (file)
--- a/trace_snappyfile.cpp
+++ b/trace_snappyfile.cpp
@@ -211,7 +211,7 @@ void SnappyFile::flushWriteCache()
     assert(m_cachePtr == m_cache);
 }
 
-void SnappyFile::flushReadCache()
+void SnappyFile::flushReadCache(size_t skipLength)
 {
     //assert(m_cachePtr == m_cache + m_cacheSize);
     m_currentOffset.chunk = m_stream.tellg();
@@ -223,8 +223,10 @@ void SnappyFile::flushReadCache()
         ::snappy::GetUncompressedLength(m_compressedCache, compressedLength,
                                         &m_cacheSize);
         createCache(m_cacheSize);
-        ::snappy::RawUncompress(m_compressedCache, compressedLength,
-                                m_cache);
+        if (skipLength < m_cacheSize) {
+            ::snappy::RawUncompress(m_compressedCache, compressedLength,
+                                    m_cache);
+        }
     } else {
         createCache(0);
     }
@@ -315,7 +317,7 @@ bool SnappyFile::rawSkip(size_t length)
             m_cachePtr += chunkSize;
             sizeToRead -= chunkSize;
             if (sizeToRead > 0) {
-                flushReadCache();
+                flushReadCache(sizeToRead);
             }
             if (!m_cacheSize) {
                 break;

diff --git a/trace_snappyfile.hpp b/trace_snappyfile.hpp
index bfb3dff406ce81e5f8185c114944777220ced5d7..469f29e13cbe561cd5416da8bafd3e2487bd3c61 100644 (file)
--- a/trace_snappyfile.hpp
+++ b/trace_snappyfile.hpp
@@ -84,7 +84,7 @@ private:
         return m_stream.eof() && freeCacheSize() == 0;
     }
     void flushWriteCache();
-    void flushReadCache();
+    void flushReadCache(size_t skipLength = 0);
     void createCache(size_t size);
     void writeCompressedLength(size_t length);
     size_t readCompressedLength();