Initial PR for stream support for Postgres in Rds source #5310
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.dataprepper.plugins.source.rds.coordination.state; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import org.opensearch.dataprepper.plugins.source.rds.model.BinlogCoordinate; | ||
| import org.opensearch.dataprepper.plugins.source.rds.model.ForeignKeyRelation; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class MySqlStreamState { | ||
|
|
||
| @JsonProperty("currentPosition") | ||
| private BinlogCoordinate currentPosition; | ||
|
|
||
| @JsonProperty("foreignKeyRelations") | ||
| private List<ForeignKeyRelation> foreignKeyRelations; | ||
|
|
||
| public BinlogCoordinate getCurrentPosition() { | ||
| return currentPosition; | ||
| } | ||
|
|
||
| public void setCurrentPosition(BinlogCoordinate currentPosition) { | ||
| this.currentPosition = currentPosition; | ||
| } | ||
|
|
||
| public List<ForeignKeyRelation> getForeignKeyRelations() { | ||
| return foreignKeyRelations; | ||
| } | ||
|
|
||
| public void setForeignKeyRelations(List<ForeignKeyRelation> foreignKeyRelations) { | ||
| this.foreignKeyRelations = foreignKeyRelations; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.dataprepper.plugins.source.rds.coordination.state; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| public class PostgresStreamState { | ||
|
|
||
| @JsonProperty("currentLsn") | ||
| private String currentLsn; | ||
|
|
||
| @JsonProperty("publicationName") | ||
| private String publicationName; | ||
|
|
||
| @JsonProperty("replicationSlotName") | ||
| private String replicationSlotName; | ||
|
|
||
| public String getCurrentLsn() { | ||
| return currentLsn; | ||
| } | ||
|
|
||
| public void setCurrentLsn(String currentLsn) { | ||
| this.currentLsn = currentLsn; | ||
| } | ||
|
|
||
| public String getPublicationName() { | ||
| return publicationName; | ||
| } | ||
|
|
||
| public void setPublicationName(String publicationName) { | ||
| this.publicationName = publicationName; | ||
| } | ||
|
|
||
| public String getReplicationSlotName() { | ||
| return replicationSlotName; | ||
| } | ||
|
|
||
| public void setReplicationSlotName(String replicationSlotName) { | ||
| this.replicationSlotName = replicationSlotName; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| * | ||
| */ | ||
|
|
||
| package org.opensearch.dataprepper.plugins.source.rds.datatype.postgres; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public enum ColumnType { | ||
| BOOLEAN(16, "boolean"), | ||
|
There was a problem hiding this comment. Are those typeId from postgres? Is there way we can use their SDK variables instead of the hardcoded number There was a problem hiding this comment. Yes, they are from postgres, but I don't think they have those in their libraries. Postgres has a system table |
||
| SMALLINT(21, "smallint"), | ||
| INTEGER(23, "integer"), | ||
| BIGINT(20, "bigint"), | ||
| REAL(700, "real"), | ||
| DOUBLE_PRECISION(701, "double precision"), | ||
| NUMERIC(1700, "numeric"), | ||
| TEXT(25, "text"), | ||
| VARCHAR(1043, "varchar"), | ||
| DATE(1082, "date"), | ||
| TIME(1083, "time"), | ||
| TIMESTAMP(1114, "timestamp"), | ||
| TIMESTAMPTZ(1184, "timestamptz"), | ||
| UUID(2950, "uuid"), | ||
| JSON(114, "json"), | ||
| JSONB(3802, "jsonb"); | ||
|
|
||
| private final int typeId; | ||
| private final String typeName; | ||
|
|
||
| private static final Map<Integer, ColumnType> TYPE_ID_MAP = new HashMap<>(); | ||
|
|
||
| static { | ||
| for (ColumnType type : values()) { | ||
| TYPE_ID_MAP.put(type.typeId, type); | ||
| } | ||
| } | ||
|
|
||
| ColumnType(int typeId, String typeName) { | ||
| this.typeId = typeId; | ||
| this.typeName = typeName; | ||
| } | ||
|
|
||
| public int getTypeId() { | ||
| return typeId; | ||
| } | ||
|
|
||
| public String getTypeName() { | ||
| return typeName; | ||
| } | ||
|
|
||
| public static ColumnType getByTypeId(int typeId) { | ||
| if (!TYPE_ID_MAP.containsKey(typeId)) { | ||
| throw new IllegalArgumentException("Unsupported column type id: " + typeId); | ||
| } | ||
| return TYPE_ID_MAP.get(typeId); | ||
|
There was a problem hiding this comment. Add exception handling for typeId |
||
| } | ||
|
|
||
| public static String getTypeNameByEnum(ColumnType columnType) { | ||
| return columnType.getTypeName(); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This class needs some refactor. We should follow single responsibility principle here. This class has dependency on MySQL and Postgres Client. We should move these dependencies to separate class.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did some refactoring and extracted out the creation of schemaManagers in separate classes. The
ReplicationLogClientFactoryalready hides the creation of MySQL/Postgres clients.