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.

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

Traceql DNF optimization init #508

Merged
merged 2 commits into from
Jun 13, 2024
Merged
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
2 changes: 1 addition & 1 deletion test/e2e
Submodule e2e updated from 8847ca to 142602
58 changes: 41 additions & 17 deletions traceql/clickhouse_transpiler/attr_condition.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const Sql = require('@cloki/clickhouse-sql')
module.exports = class Builder {
constructor () {
this.main = null
this.precondition = null
this.terms = []
this.conds = null
this.aggregatedAttr = ''
Expand Down Expand Up @@ -51,14 +52,22 @@ module.exports = class Builder {
return this
}

withPrecondition (precondition) {
this.precondition = precondition
return this
}

/**
* @returns {ProcessFn}
*/
build () {
const self = this
/** @type {BuiltProcessFn} */
const res = (ctx) => {
const sel = this.main(ctx)
const sel = self.main(ctx)
const withPreconditionSel = self.precondition
? new Sql.With('precond', self.buildPrecondition(ctx))
: null
self.alias = 'bsCond'
for (const term of self.terms) {
const sqlTerm = self.getTerm(term)
Expand All @@ -83,37 +92,52 @@ module.exports = class Builder {
sel.conditions,
Sql.Eq(new Sql.Raw(`cityHash64(trace_id) % ${ctx.randomFilter[0]}`), Sql.val(ctx.randomFilter[1])))
}
if (withPreconditionSel) {
sel.with(withPreconditionSel)
sel.conditions = Sql.And(
sel.conditions,
new Sql.In(new Sql.Raw('(trace_id, span_id)'), 'in', new Sql.WithReference(withPreconditionSel)))
}
sel.having(having)
return sel
}
return res
}

buildPrecondition (ctx) {
if (!this.precondition) {
return null
}
const sel = this.precondition(ctx)
sel.select_list = sel.select_list.filter(x => Array.isArray(x) && (x[1] === 'trace_id' || x[1] === 'span_id'))
sel.order_expressions = []
return sel
}

/**
* @typedef {{simpleIdx: number, op: string, complex: [Condition]}} Condition
*/
/**
* @param c {Condition}
* @param c {Token || [any]}
*/
getCond (c) {
if (c.simpleIdx === -1) {
const subs = []
for (const s of c.complex) {
subs.push(this.getCond(s))
}
switch (c.op) {
case '&&':
return Sql.And(...subs)
case '||':
return Sql.Or(...subs)
if (c.name) {
let left = new Sql.Raw(this.alias)
if (!this.isAliased) {
left = groupBitOr(bitSet(this.sqlConditions), this.alias)
}
throw new Error(`unsupported condition operator ${c.op}`)
const termIdx = this.terms.findIndex(x => x.value === c.value)
return Sql.Ne(bitAnd(left, new Sql.Raw((BigInt(1) << BigInt(termIdx)).toString())), Sql.val(0))
}
let left = new Sql.Raw(this.alias)
if (!this.isAliased) {
left = groupBitOr(bitSet(this.sqlConditions), this.alias)
const op = c[0]
const subs = c.slice(1).map(x => this.getCond(x))
switch (op) {
case '&&':
return Sql.And(...subs)
case '||':
return Sql.Or(...subs)
}
return Sql.Ne(bitAnd(left, new Sql.Raw((BigInt(1) << BigInt(c.simpleIdx)).toString())), Sql.val(0))
throw new Error(`unsupported condition operator ${c.op}`)
}

/**
Expand Down
4 changes: 2 additions & 2 deletions traceql/clickhouse_transpiler/attr_condition_eval.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const attrCondition = require('./attr_condition')
const {bitSet} = require('./shared')
const { bitSet } = require('./shared')
const Sql = require('@cloki/clickhouse-sql')
module.exports = class Builder extends attrCondition {
build () {
Expand All @@ -10,7 +10,7 @@ module.exports = class Builder extends attrCondition {
const sel = superBuild(ctx)
sel.having_conditions = []
sel.aggregations = [bitSet(self.sqlConditions)]
sel.select_list = [[new Sql.Raw('count()'), 'count']]
sel.select_list = [[bitSet(self.sqlConditions), 'cond'], [new Sql.Raw('count()'), 'count']]
sel.order_expressions = []
return sel
}
Expand Down
Loading
Loading