Re-merge sec/microsec fields when in SQL mode

Author: ibmmqmet

README.md

@@ -58,6 +58,10 @@ October 2016
 * SMF 115 subtype 231 (CHIN) records do not use same scale for qwhsdurn
 (though this seems to be undocumented)
 
+February 2017
+* STCK durations printed as just microseconds value when in SQL mode. Still
+split as seconds/microseconds otherwise.
+
 
 Pull requests
 =============

bin/aix/mqsmfcsv

@@ -321,11 +321,17 @@ extern char *strCfStatType  (int v);
   ADDDATA("%s,",convDate(v))
 
 #define ADDSTCK(h,v) \
+  if (sqlMode) \
+  sprintf(tmpHead,"%s(US)",h); \
+  else\
   sprintf(tmpHead,"%s(S),%s(US)",h,h); \
   ADDHEAD(tmpHead,DDL_SUS,0); \
   ADDDATA("%s,",convSecUSec(v))
 
 #define ADDSTCKIDX(h,idx,v) \
+  if (sqlMode) \
+  sprintf(tmpHead,"%s{%s}(US)",h,idx); \
+  else \
   sprintf(tmpHead,"%s{%s}(S),%s{%s}(US)",h,idx,h,idx); \
   ADDHEAD(tmpHead,DDL_SUS,0); \
   ADDDATA("%s,",convSecUSec(v))

bin/linux/mqsmfcsv

@@ -79,7 +79,7 @@ void printWTAS(wtas *p)
   ADDU32 ("Journal_Write_Count", p->wtasjwn);
   ADDU32 ("Journal_Write_Bytes", p->wtasjwb);
   ADDSTCK("Journal_Forced_Write_ET", p->wtasjcet);
-  ADDU32 ("Journal_Fored_Write_Count", p->wtasjcn);
+  ADDU32 ("Journal_Forced_Write_Count", p->wtasjcn);
   ADDU32 ("Task_Suspend_Count", p->wtassusn);
   ADDSTCK("Task_Suspend_Time", p->wtassuse);
 

bin/win/mqsmfcsv.exe

@@ -150,7 +150,10 @@ char *convBin(unsigned char *inbuf, int origlen)
 /* DESCRIPTION:                                                       */
 /*   Convert a STCK value into a string showing duration in seconds   */
 /*   and microseconds. The two numbers are comma-separated for use in */
-/*   the CSV output. The input STCK is assumed to be in z/OS          */
+/*   the CSV output as some spreadsheets had problems with 64-bit     */
+/*   values. But in SQL mode, just print a single number as databases */
+/*   are able to handle a BIGINT datatype.                            */
+/*   The input STCK is assumed to be in z/OS                          */
 /*   big-endian format, so must be converted to local endianness first*/
 /**********************************************************************/
 static char usecBuf[64];
@@ -169,7 +172,10 @@ char *convSecUSec(unsigned long long s)
   }
 
   /* Separate fields by ',' for CSV formats */
-  sprintf(usecBuf,"%u, %u ",sec,usec);
+  if (sqlMode)
+    sprintf(usecBuf,"%llu ",s);
+  else
+    sprintf(usecBuf,"%u, %u ",sec,usec);
 
   return usecBuf;
 }

src/mqsmf.h

@@ -78,19 +78,10 @@ void printDDL(char *name, int type, int len)
     }
     break;
   case DDL_SUS:
-    /* Split a heading into sec and usec columns */
-    /* The CSV heading embeds a ',' to do that on the data */
-    p = strchr(nameCopy,',');
-    *p = 0;
-
-    p2 = strstr(nameCopy,"(S)");
+    p2 = strstr(nameCopy,"(US)");
     if (p2) *p2 = 0;
-    fprintf(fp,"%s %s_s \t INTEGER\n",comma,format(nameCopy));
+    fprintf(fp,"%s %s_us \t BIGINT\n",comma,format(nameCopy));
 
-    p = p+1;
-    p2 = strstr(p,"(US)");
-    if (p2) *p2 = 0;
-    fprintf(fp,"%s %s_us \t INTEGER\n",comma,format(p));
     break;
 
   case DDL_DATETIME: