Skip to content
This repository was archived by the owner on Nov 28, 2022. It is now read-only.

Commit f41da85

Browse files
bern4rdellidiogonicoleti
authored andcommitted
Fix unit tests
1 parent c32ff4b commit f41da85

File tree

2 files changed

+32
-7
lines changed

2 files changed

+32
-7
lines changed

gauges/indexes.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package gauges
22

33
import (
44
"time"
5+
"github.com/apex/log"
56

67
"github.com/prometheus/client_golang/prometheus"
78
)
@@ -67,7 +68,7 @@ type schemaIndexBlocksRead struct {
6768
}
6869

6970
// IndexBlocksRead returns the sum of the number of disk blocks read from all public indexes
70-
func (g *Gauges) IndexBlocksRead() *prometheus.GaugeVec {
71+
func (g *Gauges) IndexBlocksReadBySchema() *prometheus.GaugeVec {
7172
var gauge = prometheus.NewGaugeVec(
7273
prometheus.GaugeOpts{
7374
Name: "postgresql_index_blocks_read_sum",
@@ -90,7 +91,9 @@ func (g *Gauges) IndexBlocksRead() *prometheus.GaugeVec {
9091
for {
9192
var schemas []schemaIndexBlocksRead
9293
if err := g.query(schemaIndexBlocksReadQuery, &schemas, emptyParams); err == nil {
94+
log.WithField("schemas", schemas).Info("started")
9395
for _, schema := range schemas {
96+
log.Info("*********************************Achou")
9497
gauge.With(prometheus.Labels{
9598
"schema": schema.Name,
9699
}).Set(schema.IndexBlocksRead)
@@ -110,7 +113,7 @@ type schemaIndexBlocksHit struct {
110113
}
111114

112115
// IndexBlocksHit returns the sum of the number of buffer hits on all user indexes
113-
func (g *Gauges) IndexBlocksHit() *prometheus.GaugeVec {
116+
func (g *Gauges) IndexBlocksHitBySchema() *prometheus.GaugeVec {
114117
var gauge = prometheus.NewGaugeVec(
115118
prometheus.GaugeOpts{
116119
Name: "postgresql_index_blocks_hit_sum",

gauges/indexes_test.go

+27-5
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,48 @@ func TestUnusedIndexes(t *testing.T) {
2929
assertNoErrs(t, gauges)
3030
}
3131

32-
func TestIndexBlocksRead(t *testing.T) {
32+
func TestIndexBlocksReadBySchema(t *testing.T) {
3333
var assert = assert.New(t)
34-
_, gauges, close := prepare(t)
34+
db, gauges, close := prepare(t)
3535
defer close()
36-
var metrics = evaluate(t, gauges.IndexBlocksRead())
36+
dropTestTable := createTestTable(t, db)
37+
defer dropTestTable()
38+
var metrics = evaluate(t, gauges.IndexBlocksReadBySchema())
3739
assert.Len(metrics, 1)
3840
assertGreaterThan(t, -1, metrics[0])
3941
assertNoErrs(t, gauges)
4042
}
4143

42-
func TestIndexBlocksHit(t *testing.T) {
44+
func TestIndexBlocksReadBySchemaWithoutIndexes(t *testing.T) {
4345
var assert = assert.New(t)
4446
_, gauges, close := prepare(t)
4547
defer close()
46-
var metrics = evaluate(t, gauges.IndexBlocksHit())
48+
var metrics = evaluate(t, gauges.IndexBlocksReadBySchema())
49+
assert.Len(metrics, 0)
50+
assertNoErrs(t, gauges)
51+
}
52+
53+
func TestIndexBlocksHitBySchema(t *testing.T) {
54+
var assert = assert.New(t)
55+
db, gauges, close := prepare(t)
56+
defer close()
57+
dropTestTable := createTestTable(t, db)
58+
defer dropTestTable()
59+
var metrics = evaluate(t, gauges.IndexBlocksHitBySchema())
4760
assert.Len(metrics, 1)
4861
assertGreaterThan(t, -1, metrics[0])
4962
assertNoErrs(t, gauges)
5063
}
5164

65+
func TestIndexBlocksHitBySchemaWithoutIndexes(t *testing.T) {
66+
var assert = assert.New(t)
67+
_, gauges, close := prepare(t)
68+
defer close()
69+
var metrics = evaluate(t, gauges.IndexBlocksHitBySchema())
70+
assert.Len(metrics, 0)
71+
assertNoErrs(t, gauges)
72+
}
73+
5274
// TODO: somehow create some bloated index to proper test this
5375
func TestIndexBloat(t *testing.T) {
5476
var assert = assert.New(t)

0 commit comments

Comments
 (0)