You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2023/09/11 05:26:49 UTC
[jackrabbit-oak] 13/29: OAK-10199 : fixed the VGC IT test cases failures for RDB
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch DetailedGC/OAK-10199
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 94602ba4c4f56ef0b99e42157cde0179c1901c36
Author: Rishabh Kumar <di...@adobe.com>
AuthorDate: Tue Jun 20 01:28:41 2023 +0530
OAK-10199 : fixed the VGC IT test cases failures for RDB
---
.../jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
index 59dfb968b0..87d0f4b4dd 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
@@ -20,6 +20,7 @@ import static java.util.List.of;
import static java.util.stream.Collectors.joining;
import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.oak.plugins.document.Document.ID;
import static org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.CHAR2OCTETRATIO;
import static org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.asBytes;
import static org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.asDocumentStoreException;
@@ -461,7 +462,7 @@ public class RDBDocumentStoreJDBC {
+ excludeKeyPatterns + ", conditions=" + conditions + ", limit=" + limit)
: null);
stmt = prepareQuery(connection, tmd, fields, minId,
- maxId, excludeKeyPatterns, conditions, limit, of("ID"));
+ maxId, excludeKeyPatterns, conditions, limit, of(ID));
rs = stmt.executeQuery();
while (rs.next() && result.size() < limit) {
int field = 1;
@@ -968,7 +969,7 @@ public class RDBDocumentStoreJDBC {
tmp.put(NodeDocument.SD_TYPE, "SDTYPE");
tmp.put(NodeDocument.SD_MAX_REV_TIME_IN_SECS, "SDMAXREVTIME");
tmp.put(RDBDocumentStore.VERSIONPROP, "VERSION");
- tmp.put(NodeDocument.ID, "ID");
+ tmp.put(ID, "ID");
INDEXED_PROP_MAPPING = Collections.unmodifiableMap(tmp);
}