Merge pull request #138 from apache/patch_to_fix_136

AlexanderSaydakov · web-flow · commit a8694addf3a8 · 2025-02-26T15:53:07.000-08:00
fix issue 136
diff --git a/kll/sqlx/kll_sketch_float_build_k.sqlx b/kll/sqlx/kll_sketch_float_build_k.sqlx
@@ -70,7 +70,7 @@ export function serialize(state) {
     // for prior transition deserialize-aggregate
     // merge aggregated and serialized state
     if (state.sketch != null && state.serialized != null) {
-      sketch.merge(state.serialized);
+      state.sketch.merge(state.serialized);
     }
     return {
       k: state.k,
diff --git a/kll/sqlx/kll_sketch_float_merge_k.sqlx b/kll/sqlx/kll_sketch_float_merge_k.sqlx
@@ -70,7 +70,7 @@ export function serialize(state) {
     // for prior transition deserialize-aggregate
     // merge aggregated and serialized state
     if (state.sketch != null && state.serialized != null) {
-      sketch.merge(state.serialized);
+      state.sketch.merge(state.serialized);
     }
     return {
       k: state.k,
diff --git a/req/sqlx/req_sketch_float_build_k_hra.sqlx b/req/sqlx/req_sketch_float_build_k_hra.sqlx
@@ -70,7 +70,7 @@ export function serialize(state) {
     // for prior transition deserialize-aggregate
     // merge aggregated and serialized state
     if (state.sketch != null && state.serialized != null) {
-      sketch.merge(state.serialized);
+      state.sketch.merge(state.serialized);
     }
     return {
       k: state.k,
diff --git a/req/sqlx/req_sketch_float_merge_k_hra.sqlx b/req/sqlx/req_sketch_float_merge_k_hra.sqlx
@@ -70,7 +70,7 @@ export function serialize(state) {
     // for prior transition deserialize-aggregate
     // merge aggregated and serialized state
     if (state.sketch != null && state.serialized != null) {
-      sketch.merge(state.serialized);
+      state.sketch.merge(state.serialized);
     }
     return {
       k: state.k,
diff --git a/tdigest/sqlx/tdigest_double_build_k.sqlx b/tdigest/sqlx/tdigest_double_build_k.sqlx
@@ -63,7 +63,7 @@ export function serialize(state) {
     // for prior transition deserialize-aggregate
     // merge aggregated and serialized state
     if (state.sketch != null && state.serialized != null) {
-      sketch.merge(state.serialized);
+      state.sketch.merge(state.serialized);
     }
     return {
       k: state.k,
diff --git a/tdigest/sqlx/tdigest_double_merge_k.sqlx b/tdigest/sqlx/tdigest_double_merge_k.sqlx
@@ -63,7 +63,7 @@ export function serialize(state) {
     // for prior transition deserialize-aggregate
     // merge aggregated and serialized state
     if (state.sketch != null && state.serialized != null) {
-      sketch.merge(state.serialized);
+      state.sketch.merge(state.serialized);
     }
     return {
       k: state.k,

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export function serialize(state) {`
`70`	`70`	`// for prior transition deserialize-aggregate`
`71`	`71`	`// merge aggregated and serialized state`
`72`	`72`	`if (state.sketch != null && state.serialized != null) {`
`73`		`- sketch.merge(state.serialized);`
	`73`	`+ state.sketch.merge(state.serialized);`
`74`	`74`	`}`
`75`	`75`	`return {`
`76`	`76`	`k: state.k,`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ export function serialize(state) {`
`63`	`63`	`// for prior transition deserialize-aggregate`
`64`	`64`	`// merge aggregated and serialized state`
`65`	`65`	`if (state.sketch != null && state.serialized != null) {`
`66`		`- sketch.merge(state.serialized);`
	`66`	`+ state.sketch.merge(state.serialized);`
`67`	`67`	`}`
`68`	`68`	`return {`
`69`	`69`	`k: state.k,`