From 434557ec450b40f6389318e40aa9db036f28c80e Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 13 Sep 2024 15:44:19 +0100 Subject: [PATCH 1/2] Split off 9.2.122 Signed-off-by: Jake Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index b98273a4d..ea8d08d2a 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.121-0-SNAPSHOT + 9.2.123-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 3436cd6b2..07248ca9a 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.121-0-SNAPSHOT + 9.2.123-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index b34d2ea9d..7100d21e4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.121-0-SNAPSHOT + 9.2.123-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index bba2309c0..cd6a77539 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.121-0-SNAPSHOT + 9.2.123-0-SNAPSHOT From f3718e405f10536e0574acaad8c3483414dd21a1 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Fri, 20 Sep 2024 09:43:33 -0400 Subject: [PATCH 2/2] HPCC4J-646 RowServiceInputStream set isTLK when reading a TLK (#759) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .../org/hpccsystems/dfs/client/RowServiceInputStream.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java index 3a8b26b77..24036ba96 100644 --- a/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java +++ b/dfsclient/src/main/java/org/hpccsystems/dfs/client/RowServiceInputStream.java @@ -2019,6 +2019,11 @@ private String makeNodeObject() sb.append(getFilePartCopy() + 1); sb.append("\", \n"); + if (this.dataPart.isTLK()) + { + sb.append("\"isTlk\" : \"true\",\n"); + } + // Do not apply filters and limits when inFetchingMode if (inFetchingMode == false) {