Add 9.1.2 zHyperWrite support

Author: ibmmqmet

CHANGES.md

@@ -83,3 +83,6 @@ Jul 2018 (v4.3.0)
 
 Sep 2018 (v5.0.0)
 * Add support for MySQL imports
+
+Feb 2018 (v5.1.0)
+* Add support for MQ 9.1.2 zHyperWrite

bin/aix/convH

@@ -26,7 +26,7 @@ else
   flags="$flags $optim"
 fi
 
-export PLATFLAGS=$flags CC=$cc VERS=905
+export PLATFLAGS=$flags CC=$cc VERS=912
 make -e -f Makefile.unix $*
 
 rm -f $targdir/convH $targdir/mqsmfcsv

bin/aix/mqsmfcsv

@@ -2,7 +2,7 @@
 CC=i686-w64-mingw32-gcc
 CFLAGS= -I. -m32 -O2
 PLATFLAGS=
-VERS=905
+VERS=912
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

bin/linux/convH

@@ -1,5 +1,5 @@
 CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J /O2
-VERS=905
+VERS=912
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

bin/linux/mqsmfcsv

@@ -120,8 +120,7 @@ BOOL  streamOutput = FALSE;
 BOOL  streamInput = TRUE;
 char *ddlTemplateOpen = NULL;
 char *ddlTemplateClose = NULL;
-char *ddlQuote = "";
-BOOL  ddlFold = FALSE;
+char *ddlQuote = "\"";
 commonFields_t commonF = {0};
 enum outputFormat_e outputFormat = OF_CSV;
 FILE *infoStream;
@@ -259,10 +258,8 @@ int main( int argc, char *argv[] )
         if (!strcmp(mqoptarg,"MYSQL")) {
           ddlQuote="`";
           ddlTemplateOpen = "-";
-          ddlFold = TRUE;
         } else if (!strcmp(mqoptarg,"DB2")) {
-          ddlQuote="";
-          ddlFold = FALSE;
+          ddlQuote="\"";
         } else {
           error = TRUE;
         }

bin/win/mqsmfcsv.exe

@@ -440,7 +440,6 @@ extern FILE *infoStream;
 extern char *ddlTemplateOpen;
 extern char *ddlTemplateClose;
 extern char *ddlQuote;
-extern BOOL  ddlFold;
 
 enum outputFormat_e { OF_CSV=0, OF_SQL=1, OF_JSON=2 };
 extern enum outputFormat_e outputFormat;

src/M

@@ -97,6 +97,15 @@ void printQJST(qjst *p)
   ADDU64 ("IO_Time_Sum_Squares_2", p->qjstiosqu[1]);
   }
 
+  /* MQ 9.1.2 added support for zHyperwrite logging */
+  if (conv16(p->qjstll)>=offsetof(qjst,qjstcp1n))
+  {
+      ADDS32("Copy1_New_Logs"           , p->qjstcp1n);
+      ADDS32("Copy2_New_Logs"           , p->qjstcp2n);
+      ADDS32("New_Logs_ZHW_Capable"     , p->qjsthwc);
+      ADDS32("New_Logs_ZHW_Enabled"     , p->qjsthwe);
+  }
+
   SMFPRINTSTOP;
 
   return;

src/Makefile.gcc.win

@@ -191,19 +191,19 @@ void printDDL(char *name, int type, int len)
   case DDL_SUS: /* a seconds/microseconds field */
     p = strstr(nameCopy,"(US)");
     if (p) *p = 0;
-    fprintf(fp,"%s %s%s_%s%s \t BIGINT\n",comma,ddlQuote,formatDDL(nameCopy),ddlFold?"US":"us",ddlQuote);
+    fprintf(fp,"%s %s%s_%s%s \t BIGINT\n",comma,ddlQuote,formatDDL(nameCopy),"US",ddlQuote);
     break;
 
   case DDL_DATE:
     p = strstr(nameCopy," (DATE)");
     if (p) *p = 0; /* remove the "(DATE)" bit */
-    fprintf(fp,"%s %s%s_%s%s \t DATE\n",comma,ddlQuote,formatDDL(nameCopy),ddlFold?"DATE":"Date",ddlQuote);
+    fprintf(fp,"%s %s%s_%s%s \t DATE\n",comma,ddlQuote,formatDDL(nameCopy),"DATE",ddlQuote);
     break;
   case DDL_TIME:
     p = strstr(nameCopy," (TIME)");
     if (p)
       *p = 0;
-    fprintf(fp,"%s %s%s_%s%s \t CHAR(19)\n",comma,ddlQuote,formatDDL(nameCopy),ddlFold?"TIME":"Time",ddlQuote);
+    fprintf(fp,"%s %s%s_%s%s \t CHAR(19)\n",comma,ddlQuote,formatDDL(nameCopy),"TIME",ddlQuote);
     break;
   }
 
@@ -252,10 +252,7 @@ char *formatDDLMaxLength(char *name,int maxLength)
     /* Get rid of repeated '_' characters */
     if (c != prev || prev != '_')
     {
-      if (ddlFold)
-        *o = toupper(c);
-      else
-        *o = c;
+      *o = toupper(c);
       o++;
     }
     i++;