Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

services/horizon: Use percentile_disc in fee stats query #1857

Merged
merged 2 commits into from
Oct 17, 2019
Merged

services/horizon: Use percentile_disc in fee stats query #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6d4234
services/horizon: Use percentile_disc in fee stats query
bartekn Oct 17, 2019
cc3d722
CHANGELOG
bartekn Oct 17, 2019
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
1 change: 1 addition & 0 deletions services/horizon/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ bumps. A breaking change will get clearly notified in this log.
## v0.23.0

* Add `Latest-Ledger` header with the sequence number of the last processed ledger by the experimental ingestion system. The endpoints built using the experimental ingestion system will always respond with data which is consistent with the ledger in `Latest-Ledger`.
* Fixes a bug in `/fee_stats`.

### Breaking Changes

Expand Down
50 changes: 44 additions & 6 deletions services/horizon/internal/actions_operation_fee_stats_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ func TestOperationFeeTestsActions_Show(t *testing.T) {
"100",
"200",
"400",
"260", // p10
"320",
"380",
"200", // p10
"300",
"400",
"400",
"400",
"400",
Expand Down Expand Up @@ -145,9 +145,9 @@ func TestOperationFeeTestsActions_ShowMultiOp(t *testing.T) {
ht.Assert.Equal("100", result["min_accepted_fee"], "min")
ht.Assert.Equal("200", result["mode_accepted_fee"], "mode")
ht.Assert.Equal("100", result["last_ledger_base_fee"], "base_fee")
ht.Assert.Equal("130", result["p10_accepted_fee"], "p10")
ht.Assert.Equal("160", result["p20_accepted_fee"], "p20")
ht.Assert.Equal("190", result["p30_accepted_fee"], "p30")
ht.Assert.Equal("100", result["p10_accepted_fee"], "p10")
ht.Assert.Equal("150", result["p20_accepted_fee"], "p20")
ht.Assert.Equal("200", result["p30_accepted_fee"], "p30")
ht.Assert.Equal("200", result["p40_accepted_fee"], "p40")
ht.Assert.Equal("200", result["p50_accepted_fee"], "p50")
ht.Assert.Equal("200", result["p60_accepted_fee"], "p60")
Expand All @@ -159,3 +159,41 @@ func TestOperationFeeTestsActions_ShowMultiOp(t *testing.T) {
ht.Assert.Equal("0.06", result["ledger_capacity_usage"], "ledger_capacity_usage")
}
}

func TestOperationFeeTestsActions_NotInterpolating(t *testing.T) {
ht := StartHTTPTest(t, "operation_fee_stats_3")
defer ht.Finish()

// Update max_tx_set_size on ledgers
_, err := ht.HorizonSession().ExecRaw("UPDATE history_ledgers SET max_tx_set_size = 50")
ht.Require.NoError(err)

// Update one tx to a huge fee
_, err = ht.HorizonSession().ExecRaw("UPDATE history_transactions SET max_fee = 256000, operation_count = 16 WHERE transaction_hash = '6a349e7331e93a251367287e274fb1699abaf723bde37aebe96248c76fd3071a'")
ht.Require.NoError(err)

ht.App.UpdateOperationFeeStatsState()

w := ht.Get("/fee_stats")

if ht.Assert.Equal(200, w.Code) {
var result map[string]string
err := json.Unmarshal(w.Body.Bytes(), &result)
ht.Require.NoError(err)
ht.Assert.Equal("200", result["min_accepted_fee"], "min")
ht.Assert.Equal("400", result["mode_accepted_fee"], "mode")
ht.Assert.Equal("100", result["last_ledger_base_fee"], "base_fee")
ht.Assert.Equal("200", result["p10_accepted_fee"], "p10")
ht.Assert.Equal("300", result["p20_accepted_fee"], "p20")
ht.Assert.Equal("400", result["p30_accepted_fee"], "p30")
ht.Assert.Equal("400", result["p40_accepted_fee"], "p40")
ht.Assert.Equal("400", result["p50_accepted_fee"], "p50")
ht.Assert.Equal("400", result["p60_accepted_fee"], "p60")
ht.Assert.Equal("400", result["p70_accepted_fee"], "p70")
ht.Assert.Equal("400", result["p80_accepted_fee"], "p80")
ht.Assert.Equal("16000", result["p90_accepted_fee"], "p90")
ht.Assert.Equal("16000", result["p95_accepted_fee"], "p95")
ht.Assert.Equal("16000", result["p99_accepted_fee"], "p99")
leighmcculloch marked this conversation as resolved.
Show resolved Hide resolved
ht.Assert.Equal("0.09", result["ledger_capacity_usage"], "ledger_capacity_usage")
}
}
22 changes: 11 additions & 11 deletions services/horizon/internal/db2/history/operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ func (q *Q) OperationFeeStats(currentSeq int32, dest *FeeStats) error {
SELECT
ceil(min(max_fee/operation_count))::bigint AS "min",
ceil(mode() within group (order by max_fee/operation_count))::bigint AS "mode",
ceil(percentile_cont(0.10) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p10",
ceil(percentile_cont(0.20) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p20",
ceil(percentile_cont(0.30) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p30",
ceil(percentile_cont(0.40) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p40",
ceil(percentile_cont(0.50) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p50",
ceil(percentile_cont(0.60) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p60",
ceil(percentile_cont(0.70) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p70",
ceil(percentile_cont(0.80) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p80",
ceil(percentile_cont(0.90) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p90",
ceil(percentile_cont(0.95) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p95",
ceil(percentile_cont(0.99) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p99"
ceil(percentile_disc(0.10) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p10",
ceil(percentile_disc(0.20) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p20",
ceil(percentile_disc(0.30) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p30",
ceil(percentile_disc(0.40) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p40",
ceil(percentile_disc(0.50) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p50",
ceil(percentile_disc(0.60) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p60",
ceil(percentile_disc(0.70) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p70",
ceil(percentile_disc(0.80) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p80",
ceil(percentile_disc(0.90) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p90",
ceil(percentile_disc(0.95) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p95",
ceil(percentile_disc(0.99) WITHIN GROUP (ORDER BY max_fee/operation_count))::bigint AS "p99"
FROM history_transactions
WHERE ledger_sequence > $1 AND ledger_sequence <= $2
`, currentSeq-5, currentSeq)
Expand Down