You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2023/12/29 09:51:11 UTC
(ignite) branch master updated: IGNITE-14823 Resource abbrevation (#11158)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 1c32eb284cb IGNITE-14823 Resource abbrevation (#11158)
1c32eb284cb is described below
commit 1c32eb284cb010479e8bbc60108992ccd84ba864
Author: Nikolay <ni...@apache.org>
AuthorDate: Fri Dec 29 12:51:02 2023 +0300
IGNITE-14823 Resource abbrevation (#11158)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java | 6 +++---
.../internal/processors/query/h2/opt/GridLuceneInputStream.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
index 92fd60cca4e..5691de426ec 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -58,7 +58,7 @@ reference,ref
#regularexpression,regex
repository,repo
#request,req
-#resource,rsrc
+resource,rsrc
#response,res
#returnValue,retVal
#sender,snd
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
index 71195d14f2b..0cffda9635d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
@@ -133,10 +133,10 @@ class ClientIgniteSetImpl<T> implements ClientIgniteSet<T> {
Function<PayloadInputChannel, ClientAutoCloseableIterator<T>> payloadReader = in -> {
List<T> page = readPage(in);
boolean hasNext = in.in().readBoolean();
- Long resourceId = hasNext ? in.in().readLong() : null;
- ClientChannel resourceCh = hasNext ? in.clientChannel() : null;
+ Long rsrcId = hasNext ? in.in().readLong() : null;
+ ClientChannel rsrcCh = hasNext ? in.clientChannel() : null;
- return new PagedIterator(resourceCh, resourceId, page);
+ return new PagedIterator(rsrcCh, rsrcId, page);
};
if (colocated) {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
index c8552a27a92..abc3ca96911 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
@@ -189,9 +189,9 @@ public class GridLuceneInputStream extends IndexInput implements Cloneable {
if (offset < 0 || length < 0 || offset + length > this.length)
throw new IllegalArgumentException("slice() " + sliceDescription + " out of bounds: " + this);
- final String newResourceDescription = (sliceDescription == null) ? toString() : (toString() + " [slice=" + sliceDescription + "]");
+ final String newRsrcDescription = (sliceDescription == null) ? toString() : (toString() + " [slice=" + sliceDescription + "]");
- return new SlicedInputStream(newResourceDescription, offset, length);
+ return new SlicedInputStream(newRsrcDescription, offset, length);
}
/**