Skip to content

Fix hasMetadata logic #385

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

Merged
merged 1 commit into from
Apr 24, 2023
Merged

Fix hasMetadata logic #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

## [0.11.1] - 2023-04-24
### Bugfixes
- Fix hasMetadata logic

## [0.11.0] - 2023-04-12

### Internal and API changes
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ If you use this code in another project don't forget to add `cartridge-driver` d
<dependency>
<groupId>io.tarantool</groupId>
<artifactId>cartridge-driver</artifactId>
<version>0.11.0</version>
<version>0.11.1</version>
</dependency>
```
## Advanced usage
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/tarantool/driver/core/tuple/TarantoolTupleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ public TarantoolTupleImpl(ArrayValue value, MessagePackMapper mapper, TarantoolS

@Override
public boolean hasMetadata() {
return spaceMetadata == null || spaceMetadata.getSpaceFormatMetadata() == null ||
spaceMetadata.getSpaceFormatMetadata().isEmpty();
return spaceMetadata != null && spaceMetadata.getSpaceFormatMetadata() != null &&
!spaceMetadata.getSpaceFormatMetadata().isEmpty();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/io/tarantool/driver/integration/ClusterTarantoolTupleClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ public void callForTarantoolResultTest() throws Exception {

assertTrue(result.size() >= 3);
TarantoolTuple tuple = result.get(0);
assertFalse(tuple.hasMetadata());
assertTrue(tuple.hasMetadata());
assertEquals(1605, tuple.getInteger("year"));

result = client.call(
Expand All @@ -391,7 +391,7 @@ public void callForTarantoolResultTest() throws Exception {
).get();
assertTrue(result.size() >= 3);
tuple = result.get(0);
assertTrue(tuple.hasMetadata());
assertFalse(tuple.hasMetadata());
}

@Test
Expand Down