Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions indexer/compress.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,21 @@ func PutDocMetasCompressor(c *DocsMetasCompressor) {

// CompressDocsAndMetas prepare docs and meta blocks for bulk insert.
func (c *DocsMetasCompressor) CompressDocsAndMetas(docs, meta []byte) {
c.docsBuf = initBuf(c.docsBuf, len(docs))
c.metaBuf = initBuf(c.metaBuf, len(meta))
wg := sync.WaitGroup{}
wg.Add(2)
go func() { // compress docs block
c.docsBuf = initBuf(c.docsBuf, len(docs))
c.docsBuf = storage.CompressDocBlock(docs, c.docsBuf, c.docsCompressLevel)
wg.Done()
}()

// Compress docs block.
c.docsBuf = storage.CompressDocBlock(docs, c.docsBuf, c.docsCompressLevel)
// Compress metas block.
c.metaBuf = storage.CompressWalBlock(meta, c.metaBuf, c.metaCompressLevel)
go func() { // compress metas block
c.metaBuf = initBuf(c.metaBuf, len(meta))
c.metaBuf = storage.CompressWalBlock(meta, c.metaBuf, c.metaCompressLevel)
wg.Done()
}()

wg.Wait()

bulkSizeAfterCompression.Observe(float64(len(c.docsBuf) + len(c.metaBuf)))
}
Expand Down
9 changes: 3 additions & 6 deletions proxy/bulk/ingestor.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

"go.uber.org/zap"

"github.com/alecthomas/units"
"github.com/ozontech/seq-db/bytespool"
"github.com/ozontech/seq-db/consts"
"github.com/ozontech/seq-db/indexer"
Expand Down Expand Up @@ -168,14 +169,10 @@ func (i *Ingestor) ProcessDocuments(ctx context.Context, requestTime time.Time,

var (
binaryDocsPool = sync.Pool{
New: func() any {
return new(bytespool.Buffer)
},
New: func() any { return &bytespool.Buffer{B: make([]byte, 0, units.MiB)} },
}
binaryMetasPool = sync.Pool{
New: func() any {
return new(bytespool.Buffer)
},
New: func() any { return &bytespool.Buffer{B: make([]byte, 0, units.MiB)} },
}
)

Expand Down
4 changes: 3 additions & 1 deletion seq/qpr.go
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,9 @@ func MergeQPRs(dst *QPR, qprs []*QPR, limit int, histInterval MID, order DocsOrd
}

ids, repetitionsCount := removeRepetitionsAdvanced(dst.IDs, dst.Histogram, histInterval)
metric.RepetitionsDocsTotal.Add(float64(repetitionsCount))
if repetitionsCount > 0 {
metric.RepetitionsDocsTotal.Add(float64(repetitionsCount))
}

// count only for queries with total
if dst.Total > 0 {
Expand Down
16 changes: 8 additions & 8 deletions tokenizer/keyword_tokenizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ func (t *KeywordTokenizer) Tokenize(tokens []MetaToken, name, value []byte, maxT
maxTokenSize = t.defaultMaxTokenSize
}

if len(value) > maxTokenSize && !t.partialIndexing {
metric.SkippedIndexesKeyword.Inc()
metric.SkippedIndexesBytesKeyword.Add(float64(len(value)))
return tokens
if len(value) > maxTokenSize {
if !t.partialIndexing {
metric.SkippedIndexesKeyword.Inc()
metric.SkippedIndexesBytesKeyword.Add(float64(len(value)))
return tokens
}
metric.SkippedIndexesBytesKeyword.Add(float64(len(value) - maxTokenSize))
value = value[:maxTokenSize]
}

maxLength := min(len(value), maxTokenSize)
metric.SkippedIndexesBytesKeyword.Add(float64(len(value[maxLength:])))
value = value[:maxLength]

tokens = append(tokens, MetaToken{
Key: name,
Value: toLowerIfCaseInsensitive(t.caseSensitive, value),
Expand Down
16 changes: 8 additions & 8 deletions tokenizer/path_tokenizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ func (t *PathTokenizer) Tokenize(tokens []MetaToken, name, value []byte, maxToke
maxTokenSize = t.defaultMaxTokenSize
}

if len(value) > maxTokenSize && !t.partialIndexing {
metric.SkippedIndexesPath.Inc()
metric.SkippedIndexesBytesPath.Add(float64(len(value)))
return tokens
if len(value) > maxTokenSize {
if !t.partialIndexing {
metric.SkippedIndexesPath.Inc()
metric.SkippedIndexesBytesPath.Add(float64(len(value)))
return tokens
}
metric.SkippedIndexesBytesPath.Add(float64(len(value) - maxTokenSize))
value = value[:maxTokenSize]
}

maxLength := min(len(value), maxTokenSize)
metric.SkippedIndexesBytesPath.Add(float64(len(value[maxLength:])))
value = value[:maxLength]

var i int

if len(value) != 0 && value[0] == t.separator {
Expand Down
19 changes: 9 additions & 10 deletions tokenizer/text_tokenizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,22 @@ func (t *TextTokenizer) Tokenize(tokens []MetaToken, name, value []byte, maxFiel
maxFieldValueLength = t.defaultMaxFieldValueLength
}

if len(value) > maxFieldValueLength && !t.partialIndexing {
metric.SkippedIndexesText.Inc()
metric.SkippedIndexesBytesText.Add(float64(len(value)))
return tokens
}

if len(value) == 0 {
tokens = append(tokens, MetaToken{Key: name, Value: value})
return tokens
}

maxLength := min(len(value), maxFieldValueLength)
if len(value) > maxFieldValueLength {
if !t.partialIndexing {
metric.SkippedIndexesText.Inc()
metric.SkippedIndexesBytesText.Add(float64(len(value)))
return tokens
}
metric.SkippedIndexesBytesText.Add(float64(len(value) - maxFieldValueLength))
value = value[:maxFieldValueLength]
}

metric.SkippedIndexesBytesText.Add(float64(len(value[maxLength:])))
value = value[:maxLength]
k := 0

hasUpper := false
asciiOnly := true
// Loop over the string looking for tokens.
Expand Down
Loading