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

Fix to limit truncate bigdecimal values. #981

Open
wants to merge 3 commits into
base: 2.5.1
Choose a base branch
from
Open

Fix to limit truncate bigdecimal values. #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bdd6ae
Fix to limit truncate bigdecimal values.
subkanthi Jan 29, 2025
bb9f175
Fix postgres integration tests.
subkanthi Jan 29, 2025
8b31345
Fix integration tests.
subkanthi Jan 30, 2025
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 ...y/clickhouse/debezium/embedded/ClickHouseDebeziumEmbeddedPostgresDecoderBufsDockerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void testDecoderBufsPlugin() throws Exception {
BaseDbWriter writer = new BaseDbWriter(clickHouseContainer.getHost(), clickHouseContainer.getFirstMappedPort(),
"public", clickHouseContainer.getUsername(), clickHouseContainer.getPassword(), null, chConn);
Map<String, String> tmColumns = writer.getColumnsDataTypesForTable("tm");
Assert.assertTrue(tmColumns.size() == 22);
Assert.assertTrue(tmColumns.size() == 23);
Assert.assertTrue(tmColumns.get("id").equalsIgnoreCase("UUID"));
Assert.assertTrue(tmColumns.get("secid").equalsIgnoreCase("Nullable(UUID)"));
//Assert.assertTrue(tmColumns.get("am").equalsIgnoreCase("Nullable(Decimal(21,5))"));
Expand Down
2 changes: 1 addition & 1 deletion ...nity/clickhouse/debezium/embedded/ClickHouseDebeziumEmbeddedPostgresPgoutputDockerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void testPgOutputPlugin() throws Exception {
BaseDbWriter writer = new BaseDbWriter(clickHouseContainer.getHost(), clickHouseContainer.getFirstMappedPort(),
"public", clickHouseContainer.getUsername(), clickHouseContainer.getPassword(), null, conn);
Map<String, String> tmColumns = writer.getColumnsDataTypesForTable("tm");
Assert.assertTrue(tmColumns.size() == 22);
Assert.assertTrue(tmColumns.size() == 23);
Assert.assertTrue(tmColumns.get("id").equalsIgnoreCase("UUID"));
Assert.assertTrue(tmColumns.get("secid").equalsIgnoreCase("Nullable(UUID)"));
//Assert.assertTrue(tmColumns.get("am").equalsIgnoreCase("Nullable(Decimal(21,5))"));
Expand Down
2 changes: 1 addition & 1 deletion ...ight/src/test/java/com/altinity/clickhouse/debezium/embedded/PostgresInitialDockerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void testDecoderBufsPlugin() throws Exception {
BaseDbWriter writer = new BaseDbWriter(clickHouseContainer.getHost(), clickHouseContainer.getFirstMappedPort(),
"public", clickHouseContainer.getUsername(), clickHouseContainer.getPassword(), null, chConn);
Map<String, String> tmColumns = writer.getColumnsDataTypesForTable("tm");
Assert.assertTrue(tmColumns.size() == 22);
Assert.assertTrue(tmColumns.size() == 23);
Assert.assertTrue(tmColumns.get("id").equalsIgnoreCase("UUID"));
Assert.assertTrue(tmColumns.get("secid").equalsIgnoreCase("Nullable(UUID)"));
//Assert.assertTrue(tmColumns.get("am").equalsIgnoreCase("Nullable(Decimal(21,5))"));
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/altinity/clickhouse/debezium/embedded/PostgresInitialDockerWKeeperMapStorageIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public void testDecoderBufsPlugin() throws Exception {
BaseDbWriter writer = new BaseDbWriter(clickHouseContainer.getHost(), clickHouseContainer.getFirstMappedPort(),
"public", clickHouseContainer.getUsername(), clickHouseContainer.getPassword(), null, chConn);
Map<String, String> tmColumns = writer.getColumnsDataTypesForTable("tm");
Assert.assertTrue(tmColumns.size() == 22);
Assert.assertTrue(tmColumns.size() == 23);
Assert.assertTrue(tmColumns.get("id").equalsIgnoreCase("UUID"));
Assert.assertTrue(tmColumns.get("secid").equalsIgnoreCase("Nullable(UUID)"));
//Assert.assertTrue(tmColumns.get("am").equalsIgnoreCase("Nullable(Decimal(21,5))"));
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/com/altinity/clickhouse/debezium/embedded/PostgresPgoutputMultipleSchemaIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void testMultipleSchemaReplication() throws Exception {
BaseDbWriter writer = new BaseDbWriter(clickHouseContainer.getHost(), clickHouseContainer.getFirstMappedPort(),
"public", clickHouseContainer.getUsername(), clickHouseContainer.getPassword(), null, conn);
Map<String, String> tmColumns = writer.getColumnsDataTypesForTable("tm");
Assert.assertTrue(tmColumns.size() == 22);
Assert.assertTrue(tmColumns.size() == 23);
Assert.assertTrue(tmColumns.get("id").equalsIgnoreCase("UUID"));
Assert.assertTrue(tmColumns.get("secid").equalsIgnoreCase("Nullable(UUID)"));
//Assert.assertTrue(tmColumns.get("am").equalsIgnoreCase("Nullable(Decimal(21,5))"));
Expand Down
9 changes: 6 additions & 3 deletions sink-connector-lightweight/src/test/resources/init_postgres.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ vtid uuid ,
vstatus character varying ,
vamount numeric(21,5) ,
vcreated timestamp with time zone,
vbilling_currency character varying
vbilling_currency character varying,
amount numeric
);


Expand All @@ -43,7 +44,8 @@ NULL,
NULL,
NULL,
NULL,
NULL
NULL,
20
);

insert into public.tm values(
Expand All @@ -66,7 +68,8 @@ NULL,
'COMPLETED',
200000.00000,
'2022-10-16 16:53:15.01957',
'IDR'
'IDR',
-57896044618658100000000000000000000000000000000000000000000000000000000000000000000000000
);

CREATE TABLE protocol_test
Expand Down
3 changes: 2 additions & 1 deletion ...main/java/com/altinity/clickhouse/sink/connector/converters/ClickHouseDataTypeMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,8 @@ else if (value instanceof Long) {
}

BigDecimal bigDecimal = new BigDecimal(new BigInteger(unscaledValueBytes), (Integer) scale);
ps.setBigDecimal(index, bigDecimal);
BigDecimal truncated = new DebeziumConverter.BigDecimalConverter().truncate(bigDecimal);
ps.setBigDecimal(index, truncated);
} else {
ps.setBigDecimal(index, new BigDecimal(0));
}
Expand Down
16 changes: 16 additions & 0 deletions ...or/src/main/java/com/altinity/clickhouse/sink/connector/converters/DebeziumConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.math.BigDecimal;
import java.sql.Date;import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
Expand Down Expand Up @@ -227,4 +228,19 @@ static public String removeTrailingZeros(String data) {

return result;
}

public static class BigDecimalConverter {

public BigDecimal truncate(BigDecimal value) {
if(value.compareTo(BinaryStreamUtils.DECIMAL128_MAX) > 0) {
log.warn("Decimal value {} is greater than max value {}", value, BinaryStreamUtils.DECIMAL128_MAX);
return BinaryStreamUtils.DECIMAL128_MAX;
} else if(value.compareTo(BinaryStreamUtils.DECIMAL128_MIN) < 0) {
log.warn("Decimal value {} is less than min value {}", value, BinaryStreamUtils.DECIMAL128_MIN);
return BinaryStreamUtils.DECIMAL128_MIN;
} else {
return value;
}
}
}
}
Loading