From 76ae51adfd11878f1555277e539cc51a7f1833c4 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 18 Oct 2024 11:04:59 +0100 Subject: [PATCH 1/3] HPCC-32826 Avoid integer underflow when calculating elapsed cycles Signed-off-by: Gavin Halliday --- system/include/platform.h | 2 +- system/jlib/jdebug.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/include/platform.h b/system/include/platform.h index 2421016a4b1..c72aefb4360 100644 --- a/system/include/platform.h +++ b/system/include/platform.h @@ -492,7 +492,7 @@ typedef unsigned __int64 hash64_t; typedef unsigned __int64 __uint64; typedef __uint64 offset_t; typedef unsigned char byte; -typedef __int64 cycle_t; +typedef __uint64 cycle_t; // This must be unsigned to avoid integer overflow issues when subtracting typedef unsigned __int64 timestamp_type; // BUILD_TAG not needed here anymore - defined in build_tag.h diff --git a/system/jlib/jdebug.cpp b/system/jlib/jdebug.cpp index 5fa81ba1b96..8a4d795c7b5 100644 --- a/system/jlib/jdebug.cpp +++ b/system/jlib/jdebug.cpp @@ -483,8 +483,8 @@ class TimeSectionInfo : public MappingBase unsigned getCount() const { return count; } StringAttr scope; - __int64 totalcycles; - __int64 maxcycles; + cycle_t totalcycles; + cycle_t maxcycles; unsigned count; }; From b37a8bf88b606e98aa14dfb687199e54b656161b Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 18 Oct 2024 16:30:55 +0100 Subject: [PATCH 2/3] Split off 9.8.32 Signed-off-by: Jake Smith --- helm/hpcc/Chart.yaml | 4 ++-- helm/hpcc/templates/_helpers.tpl | 2 +- version.cmake | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml index 169009c09d3..2a53ac0f35e 100644 --- a/helm/hpcc/Chart.yaml +++ b/helm/hpcc/Chart.yaml @@ -6,9 +6,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 9.8.31-closedown0 +version: 9.8.33-closedown0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 9.8.31-closedown0 +appVersion: 9.8.33-closedown0 diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl index bbeb58d63f3..0a1745ca512 100644 --- a/helm/hpcc/templates/_helpers.tpl +++ b/helm/hpcc/templates/_helpers.tpl @@ -1477,7 +1477,7 @@ Pass in dict with .root, .visibility defined {{- end -}} {{- define "hpcc.generateHelmVersion" -}} -helmVersion: 9.8.31-closedown0 +helmVersion: 9.8.33-closedown0 {{- end -}} {{/* diff --git a/version.cmake b/version.cmake index 972d069e4b6..79d0110352e 100644 --- a/version.cmake +++ b/version.cmake @@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" ) set ( HPCC_PROJECT "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 8 ) -set ( HPCC_POINT 31 ) +set ( HPCC_POINT 33 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) -set ( HPCC_TAG_TIMESTAMP "2024-10-14T15:45:14Z" ) +set ( HPCC_TAG_TIMESTAMP "2024-10-18T15:30:55Z" ) ### From 1e4ca268285152954f25a81411f312fd2a3fadd4 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 18 Oct 2024 16:32:02 +0100 Subject: [PATCH 3/3] Split off 9.6.58 Signed-off-by: Jake Smith --- helm/hpcc/Chart.yaml | 4 ++-- helm/hpcc/templates/_helpers.tpl | 2 +- version.cmake | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml index 2bb4aa0f3d1..d8088466d00 100644 --- a/helm/hpcc/Chart.yaml +++ b/helm/hpcc/Chart.yaml @@ -6,9 +6,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 9.6.57-closedown0 +version: 9.6.59-closedown0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 9.6.57-closedown0 +appVersion: 9.6.59-closedown0 diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl index 1e04212ec7f..c6f048f8a40 100644 --- a/helm/hpcc/templates/_helpers.tpl +++ b/helm/hpcc/templates/_helpers.tpl @@ -1477,7 +1477,7 @@ Pass in dict with .root, .visibility defined {{- end -}} {{- define "hpcc.generateHelmVersion" -}} -helmVersion: 9.6.57-closedown0 +helmVersion: 9.6.59-closedown0 {{- end -}} {{/* diff --git a/version.cmake b/version.cmake index 1def3293376..e9a7d9bb1e5 100644 --- a/version.cmake +++ b/version.cmake @@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" ) set ( HPCC_PROJECT "community" ) set ( HPCC_MAJOR 9 ) set ( HPCC_MINOR 6 ) -set ( HPCC_POINT 57 ) +set ( HPCC_POINT 59 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) -set ( HPCC_TAG_TIMESTAMP "2024-10-14T15:46:30Z" ) +set ( HPCC_TAG_TIMESTAMP "2024-10-18T15:32:01Z" ) ###