Merge branch 'candidate-5.2.0'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

CMakeLists.txt

@@ -133,18 +133,22 @@ endif (APPLE OR WIN32)
 INCLUDE(InstallRequiredSystemLibraries)
 if ( PLATFORM )
     set(CPACK_PACKAGE_NAME "hpccsystems-platform")
-    set(PACKAGE_FILE_NAME_PREFIX "hpccsystems-platform")
+    set(PACKAGE_FILE_NAME_PREFIX "hpccsystems-platform-${projname}")
 else()
     set(CPACK_PACKAGE_NAME "hpccsystems-clienttools-${majorver}.${minorver}")
     set(PACKAGE_FILE_NAME_PREFIX  "hpccsystems-clienttools")
 endif()
 SET(CPACK_PACKAGE_VERSION_MAJOR ${majorver})
 SET(CPACK_PACKAGE_VERSION_MINOR ${minorver})
-SET(CPACK_PACKAGE_VERSION_PATCH ${point}${stagever})
+SET(CPACK_PACKAGE_VERSION_PATCH ${point}-${stagever})
 set ( CPACK_PACKAGE_CONTACT "HPCCSystems <ossdevelopment@lexisnexis.com>" )
 set( CPACK_SOURCE_GENERATOR TGZ )
-set ( CPACK_RPM_PACKAGE_VERSION "${projname}")
-SET(CPACK_RPM_PACKAGE_RELEASE "${version}${stagever}")
+
+set ( CPACK_RPM_PACKAGE_VERSION "${version}" )
+SET(CPACK_RPM_PACKAGE_RELEASE "${stagever}")
+SET(CPACK_RPM_PACKAGE_VENDOR "HPCC Systems")
+SET(CPACK_PACKAGE_VENDOR "HPCC Systems")
+
 if ( ${ARCH64BIT} EQUAL 1 )
     set ( CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
 else( ${ARCH64BIT} EQUAL 1 )
@@ -175,19 +179,19 @@ elseif ( UNIX )
     message ( "-- Auto Detecting Packaging type")
     message ( "-- distro uses ${packageManagement}, revision is ${packageRevisionArch}" )
     if ( "${packageManagement}" STREQUAL "RPM" AND WITH_PLUGINS )
-        set ( CPACK_RPM_PACKAGE_VERSION "${projname}-with-plugins" )
         set ( CPACK_RPM_SPEC_MORE_DEFINE
 "%define _use_internal_dependency_generator 0
 %define __getdeps() while read file; do /usr/lib/rpm/rpmdeps -%{1} ${file}; done | /bin/sort -u
 %define __find_provides /bin/sh -c '%{__getdeps P}'
 %define __find_requires /bin/sh -c '%{__grep} -v libRembed.so | %{__getdeps R}'" )
+        set ( PACKAGE_FILE_NAME_PREFIX "${PACKAGE_FILE_NAME_PREFIX}-with-plugins")
     endif()
     if ( "${packageManagement}" STREQUAL "DEB" )
-        set( CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}${packageRevisionArch}" )
+        set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}-${stagever}${packageRevisionArch}")
     elseif ( "${packageManagement}" STREQUAL "RPM" )
-        set( CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}.${packageRevisionArch}" )
+        set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}-${stagever}.${packageRevisionArch}")
     else()
-        set( CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}${CPACK_SYSTEM_NAME}" )
+        set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}_${stagever}${CPACK_SYSTEM_NAME}")
     endif ()
 endif ()
 MESSAGE ( "-- Current release version is ${CPACK_PACKAGE_FILE_NAME}" )
@@ -261,6 +265,10 @@ if ( UNIX )
             set ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/sbin/deb/postinst;${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/prerm;${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/sbin/deb/postrm" )
         endif ( CLIENTTOOLS_ONLY )
 
+        # Standard sections values:
+        # https://www.debian.org/doc/debian-policy/ch-archive.html/#s-subsections
+        SET(CPACK_DEBIAN_PACKAGE_SECTION "devel")
+
     elseif ( "${packageManagement}" STREQUAL "RPM" )
         set ( CPACK_GENERATOR "${packageManagement}" )
         ###
@@ -272,10 +280,15 @@ if ( UNIX )
             set ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/clienttools/install/postinst" )
             set ( CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/clienttools/install/prerm" )
             set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/clienttools/install/postrm" )
+            set ( CPACK_RPM_PACKAGE_GROUP "development/libraries")
+            set ( CPACK_RPM_PACKAGE_SUMMARY "HPCC Systems Client Tools." )
         else ( CLIENTTOOLS_ONLY )
             set ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/sbin/deb/postinst" )
             set ( CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/prerm" )
             set ( CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/sbin/deb/postrm" )
+            # Standard group names: http://fedoraroject.org/wiki/RPMGroups
+            set ( CPACK_RPM_PACKAGE_GROUP "development/system")
+            set ( CPACK_RPM_PACKAGE_SUMMARY "${PACKAGE_FILE_NAME_PREFIX}")
         endif ( CLIENTTOOLS_ONLY )
     else()
         message("WARNING: Unsupported package ${packageManagement}.")
@@ -293,12 +306,12 @@ if ( UNIX )
     set ( CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
 endif ( UNIX )
 if ( PLATFORM )
+    set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE_FILE_NAME_PREFIX}")
 else ( PLATFORM )
     if ( APPLE OR WIN32 )
         set ( CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}${CPACK_SYSTEM_NAME}" )
     endif()
     set ( CPACK_MONOLITHIC_INSTALL TRUE )
-    set ( CPACK_PACKAGE_VENDOR "HPCC Systems" )
     file(WRITE "${PROJECT_BINARY_DIR}/welcome.txt"
         "HPCC Systems - Client Tools\r"
         "===========================\r\r"

cmake_modules/dependencies/lucid.cmake

@@ -1 +1 @@
-set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.40.0, libicu42, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, zip")
+set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.40.0, libicu42, libxslt1.1, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive1, rsync, zip")

cmake_modules/dependencies/precise.cmake

@@ -1 +1 @@
-set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.46.1, libicu48, libxalan110, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive12, rsync, libapr1, libaprutil1, zip")
+set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-regex1.46.1, libicu48, libxslt1.1, libxerces-c28, binutils, libldap-2.4-2, openssl, zlib1g, g++, openssh-client, openssh-server, expect, libarchive12, rsync, libapr1, libaprutil1, zip")

initfiles/bash/etc/init.d/hpcc_common.in

@@ -408,7 +408,7 @@ start_dafilesrv() {
       return $?
    else
       printf "Starting %-21s" "$compName.... "
-      log_failure_msg "Already started"
+      log_success_msg "Already started"
       return 0
    fi
 }
@@ -429,17 +429,17 @@ startCmd() {
        RCSTART=$?
        if [ ${RCSTART} -ne 0 ];then
           if [ ${DEBUG} != "NO_DEBUG" ]; then
-              log_failure_msg "Pid or lock file exists, but process is not running"
+              log_failure_msg "fixing orphan :: check_status code is ${RCSTART}"              log_failure_msg "Pid or lock file exists, but process is not running"
           fi
           cleanup_component
           removePid ${PIDPATH}
           unlock ${LOCKPATH}
        else
           if [ ${DEBUG} != "NO_DEBUG" ]; then
-              log_failure_msg "Lock or Pid file already exists"
+              log_success_msg "Lock or Pid file already exists"
           else
               #Since component is already started but current script is failed till returning 0
-              log_failure_msg "Already Started"
+              log_success_msg "Already started"
           fi
           return ${RCSTART}
        fi
@@ -525,9 +525,9 @@ stop_component() {
     RCSTOP=$?
     if [ $RCSTOP -ne 0 ];then
        if [ ${DEBUG} != "NO_DEBUG" ]; then
-          log_failure_msg "Failed: Process is not running"
+          log_success_msg "Process already stopped :: check_status code is ${RCSTOP}"
        else
-          log_failure_msg "Already Stopped"
+          log_success_msg "Already stopped"
        fi
        cleanup_component
        removePid ${PIDPATH}

system/jlib/jstats.cpp

@@ -199,13 +199,13 @@ static void formatTimeStamp(StringBuffer & out, unsigned __int64 value)
 #ifdef _WIN32
     struct tm *gmtNow;
     gmtNow = gmtime(&tNow);
-    strftime(timeStamp, 64, "%Y-%m-%d %H:%M:%S", gmtNow);
+    strftime(timeStamp, 64, "%Y-%m-%dT%H:%M:%S", gmtNow);
 #else
     struct tm gmtNow;
     gmtime_r(&tNow, &gmtNow);
-    strftime(timeStamp, 64, "%Y-%m-%d %H:%M:%S", &gmtNow);
+    strftime(timeStamp, 64, "%Y-%m-%dT%H:%M:%S", &gmtNow);
 #endif //_WIN32
-    out.append(timeStamp).appendf(".%03u", us / 1000);
+    out.append(timeStamp).appendf(".%03uZ", us / 1000);
 }
 
 static const unsigned oneKb = 1024;

thorlcr/activities/hashdistrib/thhashdistribslave.cpp

@@ -137,7 +137,12 @@ protected:
             for (unsigned i=0; i<c; i++)
                 dedupList.append(rows.item(i));
             rows.clear(); // NB: dedupList took ownership
-            dedupList.sort(*iCompare, owner.activity->queryMaxCores());
+
+            /* Relatively small sets and senders are parallel so use a single thread
+             * Using the default of a thread per core, would mean contention when all senders are sorting.
+             */
+            dedupList.sort(*iCompare, 1);
+
             OwnedConstThorRow prev;
             for (unsigned i = c; i>0;)
             {