Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Dynamo persistance #8

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

Dynamo persistance #8

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
b1adc44
changed dymanoDB lib version
Jul 12, 2022
6dfb1a4
fix checkstyle
Jul 12, 2022
457157b
fix mongo dependency
Jul 12, 2022
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 oap-storage-dynamo/src/main/java/oap/storage/DynamoPersistence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ private void persist( List<I> deletedIds, List<AbstractOperation> list ) {
}

private void refreshById( String dynamoId ) {
var res = dynamodbClient.getRecord( new Key( tableName, "id", dynamoId ),null );
var res = dynamodbClient.getRecord( new Key( tableName, "id", dynamoId ), null );
if( res != null && res.isSuccess() ) {
Metadata<T> m = convertFromDynamoItem.apply( res.getSuccessValue() );
storage.lock.synchronizedOn( dynamoId, () -> {
Expand Down
16 changes: 8 additions & 8 deletions oap-storage-dynamo/src/test/java/oap/storage/dynamo/DynamoPersistenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ public void load() throws IOException {
public void watch() throws IOException {
var storage = new MemoryStorage<>( beanIdentifier, SERIALIZED );

try( var dynamodbClient = new DynamodbClient( DynamodbFixture.DYNAMODB_PROTOCOL, DynamodbFixture.DYNAMODB_HOSTS, DynamodbFixture.DYNAMODB_PORT, DynamodbFixture.AWS_ACCESS_KEY_ID, DynamodbFixture.AWS_SECRET_ACCESS_KEY, DynamodbFixture.AWS_REGION ); ) {
try( var dynamodbClient = new DynamodbClient( DynamodbFixture.DYNAMODB_PROTOCOL, DynamodbFixture.DYNAMODB_HOSTS, DynamodbFixture.DYNAMODB_PORT, DynamodbFixture.AWS_ACCESS_KEY_ID, DynamodbFixture.AWS_SECRET_ACCESS_KEY, DynamodbFixture.AWS_REGION ) ) {
dynamodbClient.waitConnectionEstablished();
var persistence = new DynamoPersistence<>( dynamodbClient, "test", 6000, storage, fromDynamo, toDynamo );
dynamodbClient.createTable( "test", 2, 1, "id", "S", null, null, ( builder ) -> builder.streamSpecification( StreamSpecification.builder().streamEnabled( true ).streamViewType( StreamViewType.NEW_AND_OLD_IMAGES ).build() ) );
dynamodbClient.createTable( "test", 2, 1, "id", "S", null, null, builder -> builder.streamSpecification( StreamSpecification.builder().streamEnabled( true ).streamViewType( StreamViewType.NEW_AND_OLD_IMAGES ).build() ) );

persistence.watch = true;
persistence.preStart();
Expand All @@ -126,10 +126,10 @@ public void watch() throws IOException {
public void sync() throws IOException {
var storage = new MemoryStorage<>( beanIdentifier, SERIALIZED );

try( var dynamodbClient = new DynamodbClient( DynamodbFixture.DYNAMODB_PROTOCOL, DynamodbFixture.DYNAMODB_HOSTS, DynamodbFixture.DYNAMODB_PORT, DynamodbFixture.AWS_ACCESS_KEY_ID, DynamodbFixture.AWS_SECRET_ACCESS_KEY, DynamodbFixture.AWS_REGION ); ) {
try( var dynamodbClient = new DynamodbClient( DynamodbFixture.DYNAMODB_PROTOCOL, DynamodbFixture.DYNAMODB_HOSTS, DynamodbFixture.DYNAMODB_PORT, DynamodbFixture.AWS_ACCESS_KEY_ID, DynamodbFixture.AWS_SECRET_ACCESS_KEY, DynamodbFixture.AWS_REGION ) ) {
dynamodbClient.waitConnectionEstablished();
var persistence = new DynamoPersistence<>( dynamodbClient, "test", 500, storage, fromDynamo, toDynamo );
dynamodbClient.createTable( "test", 2, 1, "id", "S", null, null, ( builder ) -> builder.streamSpecification( StreamSpecification.builder().streamEnabled( true ).streamViewType( StreamViewType.NEW_AND_OLD_IMAGES ).build() ) );
dynamodbClient.createTable( "test", 2, 1, "id", "S", null, null, builder -> builder.streamSpecification( StreamSpecification.builder().streamEnabled( true ).streamViewType( StreamViewType.NEW_AND_OLD_IMAGES ).build() ) );
dynamodbClient.update( new Key( "test", "id", "1" ), "firstName", "John" );
persistence.preStart();

Expand All @@ -149,10 +149,10 @@ public void sync() throws IOException {
public void syncWithDeletedItems() throws IOException {
var storage = new MemoryStorage<>( beanIdentifier, SERIALIZED );

try( var dynamodbClient = new DynamodbClient( DynamodbFixture.DYNAMODB_PROTOCOL, DynamodbFixture.DYNAMODB_HOSTS, DynamodbFixture.DYNAMODB_PORT, DynamodbFixture.AWS_ACCESS_KEY_ID, DynamodbFixture.AWS_SECRET_ACCESS_KEY, DynamodbFixture.AWS_REGION ); ) {
try( var dynamodbClient = new DynamodbClient( DynamodbFixture.DYNAMODB_PROTOCOL, DynamodbFixture.DYNAMODB_HOSTS, DynamodbFixture.DYNAMODB_PORT, DynamodbFixture.AWS_ACCESS_KEY_ID, DynamodbFixture.AWS_SECRET_ACCESS_KEY, DynamodbFixture.AWS_REGION ) ) {
dynamodbClient.waitConnectionEstablished();
var persistence = new DynamoPersistence<>( dynamodbClient, "test", 500, storage, fromDynamo, toDynamo );
dynamodbClient.createTable( "test", 2, 1, "id", "S", null, null, ( builder ) -> builder.streamSpecification( StreamSpecification.builder().streamEnabled( true ).streamViewType( StreamViewType.NEW_AND_OLD_IMAGES ).build() ) );
dynamodbClient.createTable( "test", 2, 1, "id", "S", null, null, builder -> builder.streamSpecification( StreamSpecification.builder().streamEnabled( true ).streamViewType( StreamViewType.NEW_AND_OLD_IMAGES ).build() ) );
dynamodbClient.update( new Key( "test", "id", "1" ), "name", "John" );
persistence.preStart();

Expand All @@ -171,10 +171,10 @@ public void syncWithDeletedItems() throws IOException {
public void bothStoragesShouldBeEmpty() throws IOException {
var storage = new MemoryStorage<>( beanIdentifier, SERIALIZED );

try( var dynamodbClient = new DynamodbClient( DynamodbFixture.DYNAMODB_PROTOCOL, DynamodbFixture.DYNAMODB_HOSTS, DynamodbFixture.DYNAMODB_PORT, DynamodbFixture.AWS_ACCESS_KEY_ID, DynamodbFixture.AWS_SECRET_ACCESS_KEY, DynamodbFixture.AWS_REGION ); ) {
try( var dynamodbClient = new DynamodbClient( DynamodbFixture.DYNAMODB_PROTOCOL, DynamodbFixture.DYNAMODB_HOSTS, DynamodbFixture.DYNAMODB_PORT, DynamodbFixture.AWS_ACCESS_KEY_ID, DynamodbFixture.AWS_SECRET_ACCESS_KEY, DynamodbFixture.AWS_REGION ) ) {
dynamodbClient.waitConnectionEstablished();
var persistence = new DynamoPersistence<>( dynamodbClient, "test", 500, storage, fromDynamo, toDynamo );
dynamodbClient.createTable( "test", 2, 1, "id", "S", null, null, ( builder ) -> builder.streamSpecification( StreamSpecification.builder().streamEnabled( true ).streamViewType( StreamViewType.NEW_AND_OLD_IMAGES ).build() ) );
dynamodbClient.createTable( "test", 2, 1, "id", "S", null, null, builder -> builder.streamSpecification( StreamSpecification.builder().streamEnabled( true ).streamViewType( StreamViewType.NEW_AND_OLD_IMAGES ).build() ) );
dynamodbClient.update( new Key( "test", "id", "1" ), "firstName", "John" );
dynamodbClient.update( new Key( "test", "id", "2" ), "firstName", "Anna" );
persistence.watch = true;
Expand Down
2 changes: 1 addition & 1 deletion oap-storage-mongo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>oap</groupId>
<artifactId>oap-storage</artifactId>
<version>${project.parent.version}</version>
<version>${oap-storage.project.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

<properties>
<oap-storage.project.version>17.9.7.10</oap-storage.project.version>
<oap-dynamodb.project.version>17.4.3.0</oap-dynamodb.project.version>
<oap-dynamodb.project.version>17.4.3.6</oap-dynamodb.project.version>

<oap.deps.oap.version>17.10.10.7</oap.deps.oap.version>

Expand Down