From 26f3b52096d290d56f0791e260f00e5657c26bd8 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Tue, 5 Feb 2019 17:00:08 +0000
Subject: [PATCH] Relax restriction on timestamp reuse in chunks, add test.
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
---
pkg/chunkenc/gzip.go | 2 +-
pkg/chunkenc/gzip_test.go | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/pkg/chunkenc/gzip.go b/pkg/chunkenc/gzip.go
index 8dc8a01b..f3c0a26a 100644
--- a/pkg/chunkenc/gzip.go
+++ b/pkg/chunkenc/gzip.go
@@ -82,7 +82,7 @@ func (hb *headBlock) isEmpty() bool {
}
func (hb *headBlock) append(ts int64, line string) error {
- if !hb.isEmpty() && hb.maxt >= ts {
+ if !hb.isEmpty() && hb.maxt > ts {
return ErrOutOfOrder
}
diff --git a/pkg/chunkenc/gzip_test.go b/pkg/chunkenc/gzip_test.go
index 0f6f0e80..c2108893 100644
--- a/pkg/chunkenc/gzip_test.go
+++ b/pkg/chunkenc/gzip_test.go
@@ -54,6 +54,14 @@ func TestGZIPBlock(t *testing.T) {
ts: 8,
str: "hello, worl\nd8!",
},
+ {
+ ts: 8,
+ str: "hello, world 8, 2!",
+ },
+ {
+ ts: 8,
+ str: "hello, world 8, 3!",
+ },
{
ts: 9,
str: "",
--
GitLab