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

Jump to bottom

Feature/composite key #31

Merged
merged 25 commits into from
May 5, 2023
Merged

Feature/composite key #31

merged 25 commits into from
May 5, 2023

Conversation

Akshay-Sundarraj
Copy link
Member

Composite key support
o. Allow NoSqlEntity to have a class as primary key
o. User can specify multiple primary keys in the composite key class
o. User can specify whether a key is shard key and it's order
o. Added new annotation @NoSqlKey for primary key in composite key class

Testing:
Added new unit tests for composite key CRUD operations and spring derive query for composite key. All existing unit tests are passed

@Akshay-Sundarraj
Composite key support
b5a49bb 
o. Allow NoSqlEntity to have a class as primary key
o. User can specify multiple primary keys in the composite key class
o. User can specify whether a key is shard key and it's order
o. Added new entity validation method which extends validation
   supported by Spring data BasicPersistentEntity
p. Added new annotations @NoSqlKey and @NoSqlKeyClass

Signed-off-by: Akshay Sundarraj <akshay.sundarraj@oracle.com>
@Akshay-Sundarraj
Merge branch 'main' into feature/composite-key
0486641
@Akshay-Sundarraj
o. Add derive query tests for composite primary key.
72c3d2f 
o. Add javadoc for newly added classes
o. Remove unused code

Signed-off-by: Akshay Sundarraj <akshay.sundarraj@oracle.com>
@Akshay-Sundarraj
Fix javadoc warning
4f0f1fe
@Akshay-Sundarraj
Update composite key test
c984a38
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Mar 14, 2023
@Akshay-Sundarraj Akshay-Sundarraj marked this pull request as ready for review March 14, 2023 08:45
@Akshay-Sundarraj
o. Fix an issue in table DDL generation for composite key
63420c9
@Akshay-Sundarraj
o. Added tests for table creation for composite primary key
3c45350 
o. Added a public method getNosqlClient() in NosqlTemplate

All unit tests are passed for both on-prem and cloud
@Akshay-Sundarraj
Merge branch 'main' into feature/composite-key
6314f0c
@Akshay-Sundarraj
composite key Ordering.
7a9c98e 
o. Added support for ordering on composite key in Repository
o. Added a new testcase to verify ordering on composite key member
@Akshay-Sundarraj
Unit test improvements
b93c8d2 
o. Added new set of tests for composite key without @NosqlKey
o. Updated composite key tests to check the result of repo operations
o. Added Pageable and Sort tests
o. Fixed a query issue when composite key is not @NosqlKey
@Akshay-Sundarraj
o. Fix an issue when findAll(sort) has composite key member
eca62e3 
o. Refactor composite key unit test to group by tests
o. Add new unit tests for interface and DTO projection for composite key

All unit tests are passed
@Akshay-Sundarraj
o. Fix an issue in ReactiveRepo.save() which was not saving an entity…
9513d40 
… with composite keys

o Add new tests for reactive composite keys
@Akshay-Sundarraj
Adding missed file
a74525d
@Akshay-Sundarraj
o. Fix an issue when projecting only primary keys
8fa4d9e 
o. Added tests for projecting only primary keys
cezarfx
cezarfx requested changes Apr 14, 2023
View reviewed changes
src/main/java/com/oracle/nosql/spring/data/core/convert/MappingNosqlConverter.java Outdated Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/core/convert/MappingNosqlConverter.java Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/core/convert/MappingNosqlConverter.java Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/core/mapping/NosqlId.java Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/core/query/CriteriaQuery.java Outdated Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/repository/support/NosqlEntityInformation.java Outdated Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/repository/support/NosqlEntityInformation.java Show resolved Hide resolved
src/test/java/com/oracle/nosql/spring/data/test/composite/Machine.java Outdated Show resolved Hide resolved
src/test/java/com/oracle/nosql/spring/data/test/composite/MachineApp.java Show resolved Hide resolved
src/test/java/com/oracle/nosql/spring/data/test/composite/MachineRepository.java Show resolved Hide resolved
cezarfx
cezarfx requested changes Apr 14, 2023
View reviewed changes
Copy link
Member

@cezarfx cezarfx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also add an entry in the CHANGELOG.md.

src/main/java/com/oracle/nosql/spring/data/core/mapping/NosqlKey.java Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/core/mapping/BasicNosqlPersistentProperty.java Show resolved Hide resolved
@Akshay-Sundarraj
Fix some of the review comments
c176ff8
@Akshay-Sundarraj
NosqlKey ordering changes:
0348f64 
o. Changes order of NosqlKeys in composite key as discussed in meeting
o. Added Javadoc for the same
o. Updated tests for ordering of fields
o. Fixed some of the review comments
cezarfx
cezarfx requested changes Apr 20, 2023
View reviewed changes
src/main/java/com/oracle/nosql/spring/data/repository/support/NosqlEntityInformation.java Show resolved Hide resolved
src/test/java/com/oracle/nosql/spring/data/test/composite/MachineApp.java Show resolved Hide resolved
src/test/java/com/oracle/nosql/spring/data/test/composite/MachineApp.java Show resolved Hide resolved
src/test/java/com/oracle/nosql/spring/data/test/composite/MachineApp.java Show resolved Hide resolved
src/test/java/com/oracle/nosql/spring/data/test/composite/MachineApp.java Outdated Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/core/NosqlTemplateBase.java Outdated Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/core/NosqlTemplateBase.java Outdated Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/core/NosqlTemplateBase.java Outdated Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/core/NosqlTemplateBase.java Outdated Show resolved Hide resolved
src/main/java/com/oracle/nosql/spring/data/core/mapping/BasicNosqlPersistentProperty.java Outdated Show resolved Hide resolved
Akshay-Sundarraj and others added 6 commits April 21, 2023 17:37
cezarfx
cezarfx reviewed Apr 26, 2023
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
cezarfx
cezarfx previously approved these changes Apr 26, 2023
View reviewed changes
Copy link
Member

@cezarfx cezarfx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, please merge into main branch as a single commit and make sure the checkin comment explains the entire change.

@Akshay-Sundarraj
o. Modified composite key ordering to be unique across both shard and…
feab6da 
… non shard keys.

o. Updated the javadoc for the same
o. Updated the tests
cezarfx
cezarfx reviewed May 4, 2023
View reviewed changes
src/main/java/com/oracle/nosql/spring/data/repository/support/NosqlEntityInformation.java

if (!nonShardMap.isEmpty()) {
int shardMaxOrder =
(int) ((TreeMap<?, ?>) shardMap).lastKey();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid the up castings I would declare the shardMap and nonShardMap as TreeMap.

@Akshay-Sundarraj Akshay-Sundarraj merged commit 0c308ed into main May 5, 2023
@Akshay-Sundarraj Akshay-Sundarraj deleted the feature/composite-key branch May 12, 2023 10:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cezarfx cezarfx cezarfx approved these changes

Assignees
No one assigned
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Akshay-Sundarraj @cezarfx