Browse Source

Reader: removed Seek

Pierre.Curto 5 years ago
parent
commit
6121bc3ad1
3 changed files with 0 additions and 72 deletions
  1. 0 27
      bench_test.go
  2. 0 4
      reader.go
  3. 0 41
      reader_test.go

+ 0 - 27
bench_test.go

@@ -99,33 +99,6 @@ func BenchmarkUncompressDigits(b *testing.B) { benchmarkUncompress(b, digitsLZ4)
 func BenchmarkUncompressTwain(b *testing.B)  { benchmarkUncompress(b, twainLZ4) }
 func BenchmarkUncompressRand(b *testing.B)   { benchmarkUncompress(b, randomLZ4) }
 
-func benchmarkSkipBytes(b *testing.B, compressed []byte) {
-	r := bytes.NewReader(compressed)
-	zr := lz4.NewReader(r)
-
-	// Determine the uncompressed size of testfile.
-	uncompressedSize, err := io.Copy(ioutil.Discard, zr)
-	if err != nil {
-		b.Fatal(err)
-	}
-
-	b.SetBytes(uncompressedSize)
-	b.ReportAllocs()
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		r.Reset(compressed)
-		zr.Reset(r)
-		zr.Seek(uncompressedSize, io.SeekCurrent)
-		_, _ = io.Copy(ioutil.Discard, zr)
-	}
-}
-
-func BenchmarkSkipBytesPg1661(b *testing.B) { benchmarkSkipBytes(b, pg1661LZ4) }
-func BenchmarkSkipBytesDigits(b *testing.B) { benchmarkSkipBytes(b, digitsLZ4) }
-func BenchmarkSkipBytesTwain(b *testing.B)  { benchmarkSkipBytes(b, twainLZ4) }
-func BenchmarkSkipBytesRand(b *testing.B)   { benchmarkSkipBytes(b, randomLZ4) }
-
 func benchmarkCompress(b *testing.B, uncompressed []byte) {
 	w := bytes.NewBuffer(nil)
 	zw := lz4.NewWriter(w)

+ 0 - 4
reader.go

@@ -150,7 +150,3 @@ func (r *Reader) Reset(reader io.Reader) *Reader {
 	r.state.next(nil)
 	return r
 }
-
-func (r *Reader) Seek(offset int64, whence int) (int64, error) {
-	panic("TODO")
-}

+ 0 - 41
reader_test.go

@@ -76,47 +76,6 @@ func TestReader(t *testing.T) {
 			if !reflect.DeepEqual(out.Bytes(), raw[:10]) {
 				t.Fatal("partial read does not match original")
 			}
-			return
-
-			//TODO add Reader.Seek
-			pos, err := zr.Seek(-1, io.SeekCurrent)
-			if err == nil {
-				t.Fatal("expected error from invalid seek")
-			}
-			if pos != 10 {
-				t.Fatalf("unexpected position %d", pos)
-			}
-			pos, err = zr.Seek(1, io.SeekStart)
-			if err == nil {
-				t.Fatal("expected error from invalid seek")
-			}
-			if pos != 10 {
-				t.Fatalf("unexpected position %d", pos)
-			}
-			pos, err = zr.Seek(-1, io.SeekEnd)
-			if err == nil {
-				t.Fatal("expected error from invalid seek")
-			}
-			if pos != 10 {
-				t.Fatalf("unexpected position %d", pos)
-			}
-
-			pos, err = zr.Seek(int64(len(raw)-20), io.SeekCurrent)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if pos != int64(len(raw)-10) {
-				t.Fatalf("unexpected position %d", pos)
-			}
-
-			out.Reset()
-			_, err = io.CopyN(out, zr, 10)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if !reflect.DeepEqual(out.Bytes(), raw[len(raw)-10:]) {
-				t.Fatal("after seek, partial read does not match original")
-			}
 		})
 	}
 }