Skip to content

fix: make min and max aggregates ignore retracted values #90

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

Open
cpruijsen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: make min and max aggregates ignore retracted values #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .changeset/fix-min-max-multiplicity.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@electric-sql/d2ts': patch
'@electric-sql/d2mini': patch
---

fix min and max groupBy aggregates to ignore retracted values (negative multiplicity)
18 changes: 14 additions & 4 deletions packages/d2mini/src/operators/groupBy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,14 @@ export function min<T>(
return {
preMap: (data: T) => valueExtractor(data),
reduce: (values: [number, number][]) => {
const net = new Map<number, number>()
for (const [value, multiplicity] of values) {
net.set(value, (net.get(value) || 0) + multiplicity)
}

let minValue = Number.POSITIVE_INFINITY
for (const [value, _multiplicity] of values) {
if (value < minValue) {
for (const [value, multiplicity] of net) {
if (multiplicity > 0 && value < minValue) {
minValue = value
}
}
Expand All @@ -238,9 +243,14 @@ export function max<T>(
return {
preMap: (data: T) => valueExtractor(data),
reduce: (values: [number, number][]) => {
const net = new Map<number, number>()
for (const [value, multiplicity] of values) {
net.set(value, (net.get(value) || 0) + multiplicity)
}

let maxValue = Number.NEGATIVE_INFINITY
for (const [value, _multiplicity] of values) {
if (value > maxValue) {
for (const [value, multiplicity] of net) {
if (multiplicity > 0 && value > maxValue) {
maxValue = value
}
}
Expand Down
83 changes: 83 additions & 0 deletions packages/d2mini/tests/operators/groupBy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,89 @@ describe('Operators', () => {
]

expect(latestMessage.getInner()).toEqual(expectedResult)

// --- Add a new record ---
input.sendData(
new MultiSet([
[{ category: 'A', amount: 25 }, 1],
[{ category: 'C', amount: 50 }, 1],
]),
)
graph.run()

const expectedAddResult = [
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 5,
maximum: 20,
},
],
-1,
],
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 5,
maximum: 25,
},
],
1,
],
[
[
'{"category":"C"}',
{
category: 'C',
minimum: 50,
maximum: 50,
},
],
1,
],
]

expect(latestMessage.getInner()).toEqual(expectedAddResult)

// --- Delete the current min and max ---
input.sendData(
new MultiSet([
[{ category: 'A', amount: 5 }, -1],
[{ category: 'A', amount: 25 }, -1],
]),
)
graph.run()

const expectedDeleteResult = [
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 5,
maximum: 25,
},
],
-1,
],
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 10,
maximum: 20,
},
],
1,
],
]

expect(latestMessage.getInner()).toEqual(expectedDeleteResult)
})

test('with median and mode aggregates', () => {
Expand Down
18 changes: 14 additions & 4 deletions packages/d2ts/src/operators/groupBy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,14 @@ export function min<T>(
return {
preMap: (data: T) => valueExtractor(data),
reduce: (values: [number, number][]) => {
const net = new Map<number, number>()
for (const [value, multiplicity] of values) {
net.set(value, (net.get(value) || 0) + multiplicity)
}

let minValue = Number.POSITIVE_INFINITY
for (const [value, _multiplicity] of values) {
if (value < minValue) {
for (const [value, multiplicity] of net) {
if (multiplicity > 0 && value < minValue) {
minValue = value
}
}
Expand All @@ -227,9 +232,14 @@ export function max<T>(
return {
preMap: (data: T) => valueExtractor(data),
reduce: (values: [number, number][]) => {
const net = new Map<number, number>()
for (const [value, multiplicity] of values) {
net.set(value, (net.get(value) || 0) + multiplicity)
}

let maxValue = Number.NEGATIVE_INFINITY
for (const [value, _multiplicity] of values) {
if (value > maxValue) {
for (const [value, multiplicity] of net) {
if (multiplicity > 0 && value > maxValue) {
maxValue = value
}
}
Expand Down
87 changes: 87 additions & 0 deletions packages/d2ts/tests/operators-sqlite/groupBy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,93 @@ describe('SQLite Operators', () => {
]

expect(latestMessage.collection.getInner()).toEqual(expectedResult)

// --- Add a new record ---
input.sendData(
v([3, 0]),
new MultiSet([
[{ category: 'A', amount: 25 }, 1],
[{ category: 'C', amount: 50 }, 1],
]),
)
input.sendFrontier(new Antichain([v([4, 0])]))
graph.run()

const expectedAddResult = [
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 5,
maximum: 25,
},
],
1,
],
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 5,
maximum: 20,
},
],
-1,
],
[
[
'{"category":"C"}',
{
category: 'C',
minimum: 50,
maximum: 50,
},
],
1,
],
]

expect(latestMessage.collection.getInner()).toEqual(expectedAddResult)

// --- Delete the current min and max ---
input.sendData(
v([5, 0]),
new MultiSet([
[{ category: 'A', amount: 5 }, -1],
[{ category: 'A', amount: 25 }, -1],
]),
)
input.sendFrontier(new Antichain([v([6, 0])]))
graph.run()

const expectedDeleteResult = [
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 10,
maximum: 20,
},
],
1,
],
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 5,
maximum: 25,
},
],
-1,
],
]

expect(latestMessage.collection.getInner()).toEqual(expectedDeleteResult)
})

test('with median and mode aggregates', () => {
Expand Down
87 changes: 87 additions & 0 deletions packages/d2ts/tests/operators/groupBy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,93 @@ describe('Operators', () => {
]

expect(latestMessage.collection.getInner()).toEqual(expectedResult)

// --- Add a new record ---
input.sendData(
v([3, 0]),
new MultiSet([
[{ category: 'A', amount: 25 }, 1],
[{ category: 'C', amount: 50 }, 1],
]),
)
input.sendFrontier(new Antichain([v([4, 0])]))
graph.run()

const expectedAddResult = [
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 5,
maximum: 25,
},
],
1,
],
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 5,
maximum: 20,
},
],
-1,
],
[
[
'{"category":"C"}',
{
category: 'C',
minimum: 50,
maximum: 50,
},
],
1,
],
]

expect(latestMessage.collection.getInner()).toEqual(expectedAddResult)

// --- Delete the current min and max ---
input.sendData(
v([5, 0]),
new MultiSet([
[{ category: 'A', amount: 5 }, -1],
[{ category: 'A', amount: 25 }, -1],
]),
)
input.sendFrontier(new Antichain([v([6, 0])]))
graph.run()

const expectedDeleteResult = [
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 10,
maximum: 20,
},
],
1,
],
[
[
'{"category":"A"}',
{
category: 'A',
minimum: 5,
maximum: 25,
},
],
-1,
],
]

expect(latestMessage.collection.getInner()).toEqual(expectedDeleteResult)
})

test('with median and mode aggregates', () => {
Expand Down