Skip to content

Commit 1780e59

Browse files
ibmmqmetibmmqmet
committed
Update for MQ 9.1.5
Fix #137 #140
1 parent 960cf5f commit 1780e59

15 files changed

+127
-51
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Changelog
22
Newest updates are at the top of this file.
33

4+
## Apr 02 2020 - v4.1.4
5+
* Update for MQ 9.1.5
6+
* ibmmq - Add message and header compression for MQCD (#137)
7+
* ibmmq - Set endianness just once (#140)
8+
* mqmetric - Add better diagnostics when running out of object handles
9+
* mqmetric - Make sure strings don't include embedded nulls
10+
411
## January 09 2020 - v4.1.3
512
* mqmetric - Discovery of shared queues (ibm-messaging/mq-metric-samples#26)
613
* mqmetric - Add DESCR attribute from queues and channels to permit labelling in metrics (ibm-messaging/mq-metric-samples#16)

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# © Copyright IBM Corporation 2019
1+
# © Copyright IBM Corporation 2019, 2020
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \
5252
# Location of the downloadable MQ client package \
5353
ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \
5454
RDTAR="IBM-MQC-Redist-LinuxX64.tar.gz" \
55-
VRMF=9.1.4.0
55+
VRMF=9.1.5.0
5656

5757
# Install the MQ client from the Redistributable package. This also contains the
5858
# header files we need to compile against.

‎buildSamples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# © Copyright IBM Corporation 2019
1+
# © Copyright IBM Corporation 2019, 2020
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
module github.com/ibm-messaging/mq-golang
2+
3+
go 1.13

‎ibmmq/cmqc_darwin.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ package ibmmq
1414
* for each value; those can be found in other header files such as
1515
* cmqc.h.
1616
****************************************************************
17-
* Copyright (c) IBM Corporation 1993, 2019
17+
* Copyright (c) IBM Corporation 1993, 2020
1818
*
1919
* Licensed under the Apache License, Version 2.0 (the "License");
2020
* you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ package ibmmq
3030
****************************************************************
3131
*
3232
* <BEGIN_BUILDINFO>
33-
* Generated on: 11/19/19 1:20 PM
34-
* Build Level: p914-L191119
33+
* Generated on: 3/16/20 3:14 PM
34+
* Build Level: p915-L200316
3535
* Build Type: Production
3636
* <END_BUILDINFO>
3737
*/
@@ -1002,7 +1002,7 @@ const (
10021002
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
10031003
MQCMDI_SEC_TIMER_ZERO int32 = 14
10041004
MQCMDI_SEC_UPPERCASE int32 = 21
1005-
MQCMDL_CURRENT_LEVEL int32 = 914
1005+
MQCMDL_CURRENT_LEVEL int32 = 915
10061006
MQCMDL_LEVEL_1 int32 = 100
10071007
MQCMDL_LEVEL_101 int32 = 101
10081008
MQCMDL_LEVEL_110 int32 = 110
@@ -1042,6 +1042,7 @@ const (
10421042
MQCMDL_LEVEL_912 int32 = 912
10431043
MQCMDL_LEVEL_913 int32 = 913
10441044
MQCMDL_LEVEL_914 int32 = 914
1045+
MQCMDL_LEVEL_915 int32 = 915
10451046
MQCMD_ACCOUNTING_MQI int32 = 167
10461047
MQCMD_ACCOUNTING_Q int32 = 168
10471048
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1760,6 +1761,8 @@ const (
17601761
MQIACF_CONN_INFO_TYPE int32 = 1110
17611762
MQIACF_CONV_REASON_CODE int32 = 1072
17621763
MQIACF_CTL_OPERATION int32 = 1366
1764+
MQIACF_CUR_MAX_FILE_SIZE int32 = 1438
1765+
MQIACF_CUR_Q_FILE_SIZE int32 = 1437
17631766
MQIACF_DB2_CONN_STATUS int32 = 1150
17641767
MQIACF_DELETE_OPTIONS int32 = 1092
17651768
MQIACF_DESTINATION_CLASS int32 = 1273
@@ -1798,7 +1801,7 @@ const (
17981801
MQIACF_INVALID_DEST_COUNT int32 = 1371
17991802
MQIACF_ITEM_COUNT int32 = 1378
18001803
MQIACF_KNOWN_DEST_COUNT int32 = 1369
1801-
MQIACF_LAST_USED int32 = 1436
1804+
MQIACF_LAST_USED int32 = 1438
18021805
MQIACF_LDAP_CONNECTION_STATUS int32 = 1409
18031806
MQIACF_LISTENER_ATTRS int32 = 1222
18041807
MQIACF_LISTENER_STATUS_ATTRS int32 = 1223
@@ -2446,7 +2449,7 @@ const (
24462449
MQIA_IP_ADDRESS_VERSION int32 = 93
24472450
MQIA_KEY_REUSE_COUNT int32 = 267
24482451
MQIA_LAST int32 = 2000
2449-
MQIA_LAST_USED int32 = 273
2452+
MQIA_LAST_USED int32 = 274
24502453
MQIA_LDAP_AUTHORMD int32 = 263
24512454
MQIA_LDAP_NESTGRP int32 = 264
24522455
MQIA_LDAP_SECURE_COMM int32 = 261
@@ -2466,6 +2469,7 @@ const (
24662469
MQIA_MAX_PRIORITY int32 = 14
24672470
MQIA_MAX_PROPERTIES_LENGTH int32 = 192
24682471
MQIA_MAX_Q_DEPTH int32 = 15
2472+
MQIA_MAX_Q_FILE_SIZE int32 = 274
24692473
MQIA_MAX_Q_TRIGGERS int32 = 90
24702474
MQIA_MAX_RECOVERY_TASKS int32 = 171
24712475
MQIA_MAX_RESPONSES int32 = 230
@@ -3088,6 +3092,7 @@ const (
30883092
MQQDT_PREDEFINED int32 = 1
30893093
MQQDT_SHARED_DYNAMIC int32 = 4
30903094
MQQDT_TEMPORARY_DYNAMIC int32 = 3
3095+
MQQFS_DEFAULT int32 = -1
30913096
MQQF_CLWL_USEQ_ANY int32 = 64
30923097
MQQF_CLWL_USEQ_LOCAL int32 = 128
30933098
MQQF_LOCAL_Q int32 = 1

‎ibmmq/cmqc_linux_amd64.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ package ibmmq
1414
* for each value; those can be found in other header files such as
1515
* cmqc.h.
1616
****************************************************************
17-
* Copyright (c) IBM Corporation 1993, 2019
17+
* Copyright (c) IBM Corporation 1993, 2020
1818
*
1919
* Licensed under the Apache License, Version 2.0 (the "License");
2020
* you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ package ibmmq
3030
****************************************************************
3131
*
3232
* <BEGIN_BUILDINFO>
33-
* Generated on: 11/19/19 1:20 PM
34-
* Build Level: p914-L191119
33+
* Generated on: 3/16/20 3:14 PM
34+
* Build Level: p915-L200316
3535
* Build Type: Production
3636
* <END_BUILDINFO>
3737
*/
@@ -1002,7 +1002,7 @@ const (
10021002
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
10031003
MQCMDI_SEC_TIMER_ZERO int32 = 14
10041004
MQCMDI_SEC_UPPERCASE int32 = 21
1005-
MQCMDL_CURRENT_LEVEL int32 = 914
1005+
MQCMDL_CURRENT_LEVEL int32 = 915
10061006
MQCMDL_LEVEL_1 int32 = 100
10071007
MQCMDL_LEVEL_101 int32 = 101
10081008
MQCMDL_LEVEL_110 int32 = 110
@@ -1042,6 +1042,7 @@ const (
10421042
MQCMDL_LEVEL_912 int32 = 912
10431043
MQCMDL_LEVEL_913 int32 = 913
10441044
MQCMDL_LEVEL_914 int32 = 914
1045+
MQCMDL_LEVEL_915 int32 = 915
10451046
MQCMD_ACCOUNTING_MQI int32 = 167
10461047
MQCMD_ACCOUNTING_Q int32 = 168
10471048
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1760,6 +1761,8 @@ const (
17601761
MQIACF_CONN_INFO_TYPE int32 = 1110
17611762
MQIACF_CONV_REASON_CODE int32 = 1072
17621763
MQIACF_CTL_OPERATION int32 = 1366
1764+
MQIACF_CUR_MAX_FILE_SIZE int32 = 1438
1765+
MQIACF_CUR_Q_FILE_SIZE int32 = 1437
17631766
MQIACF_DB2_CONN_STATUS int32 = 1150
17641767
MQIACF_DELETE_OPTIONS int32 = 1092
17651768
MQIACF_DESTINATION_CLASS int32 = 1273
@@ -1798,7 +1801,7 @@ const (
17981801
MQIACF_INVALID_DEST_COUNT int32 = 1371
17991802
MQIACF_ITEM_COUNT int32 = 1378
18001803
MQIACF_KNOWN_DEST_COUNT int32 = 1369
1801-
MQIACF_LAST_USED int32 = 1436
1804+
MQIACF_LAST_USED int32 = 1438
18021805
MQIACF_LDAP_CONNECTION_STATUS int32 = 1409
18031806
MQIACF_LISTENER_ATTRS int32 = 1222
18041807
MQIACF_LISTENER_STATUS_ATTRS int32 = 1223
@@ -2446,7 +2449,7 @@ const (
24462449
MQIA_IP_ADDRESS_VERSION int32 = 93
24472450
MQIA_KEY_REUSE_COUNT int32 = 267
24482451
MQIA_LAST int32 = 2000
2449-
MQIA_LAST_USED int32 = 273
2452+
MQIA_LAST_USED int32 = 274
24502453
MQIA_LDAP_AUTHORMD int32 = 263
24512454
MQIA_LDAP_NESTGRP int32 = 264
24522455
MQIA_LDAP_SECURE_COMM int32 = 261
@@ -2466,6 +2469,7 @@ const (
24662469
MQIA_MAX_PRIORITY int32 = 14
24672470
MQIA_MAX_PROPERTIES_LENGTH int32 = 192
24682471
MQIA_MAX_Q_DEPTH int32 = 15
2472+
MQIA_MAX_Q_FILE_SIZE int32 = 274
24692473
MQIA_MAX_Q_TRIGGERS int32 = 90
24702474
MQIA_MAX_RECOVERY_TASKS int32 = 171
24712475
MQIA_MAX_RESPONSES int32 = 230
@@ -3088,6 +3092,7 @@ const (
30883092
MQQDT_PREDEFINED int32 = 1
30893093
MQQDT_SHARED_DYNAMIC int32 = 4
30903094
MQQDT_TEMPORARY_DYNAMIC int32 = 3
3095+
MQQFS_DEFAULT int32 = -1
30913096
MQQF_CLWL_USEQ_ANY int32 = 64
30923097
MQQF_CLWL_USEQ_LOCAL int32 = 128
30933098
MQQF_LOCAL_Q int32 = 1

‎ibmmq/cmqc_linux_ppc64le.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ package ibmmq
1414
* for each value; those can be found in other header files such as
1515
* cmqc.h.
1616
****************************************************************
17-
* Copyright (c) IBM Corporation 1993, 2019
17+
* Copyright (c) IBM Corporation 1993, 2020
1818
*
1919
* Licensed under the Apache License, Version 2.0 (the "License");
2020
* you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ package ibmmq
3030
****************************************************************
3131
*
3232
* <BEGIN_BUILDINFO>
33-
* Generated on: 11/19/19 1:20 PM
34-
* Build Level: p914-L191119
33+
* Generated on: 3/16/20 3:14 PM
34+
* Build Level: p915-L200316
3535
* Build Type: Production
3636
* <END_BUILDINFO>
3737
*/
@@ -1002,7 +1002,7 @@ const (
10021002
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
10031003
MQCMDI_SEC_TIMER_ZERO int32 = 14
10041004
MQCMDI_SEC_UPPERCASE int32 = 21
1005-
MQCMDL_CURRENT_LEVEL int32 = 914
1005+
MQCMDL_CURRENT_LEVEL int32 = 915
10061006
MQCMDL_LEVEL_1 int32 = 100
10071007
MQCMDL_LEVEL_101 int32 = 101
10081008
MQCMDL_LEVEL_110 int32 = 110
@@ -1042,6 +1042,7 @@ const (
10421042
MQCMDL_LEVEL_912 int32 = 912
10431043
MQCMDL_LEVEL_913 int32 = 913
10441044
MQCMDL_LEVEL_914 int32 = 914
1045+
MQCMDL_LEVEL_915 int32 = 915
10451046
MQCMD_ACCOUNTING_MQI int32 = 167
10461047
MQCMD_ACCOUNTING_Q int32 = 168
10471048
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1760,6 +1761,8 @@ const (
17601761
MQIACF_CONN_INFO_TYPE int32 = 1110
17611762
MQIACF_CONV_REASON_CODE int32 = 1072
17621763
MQIACF_CTL_OPERATION int32 = 1366
1764+
MQIACF_CUR_MAX_FILE_SIZE int32 = 1438
1765+
MQIACF_CUR_Q_FILE_SIZE int32 = 1437
17631766
MQIACF_DB2_CONN_STATUS int32 = 1150
17641767
MQIACF_DELETE_OPTIONS int32 = 1092
17651768
MQIACF_DESTINATION_CLASS int32 = 1273
@@ -1798,7 +1801,7 @@ const (
17981801
MQIACF_INVALID_DEST_COUNT int32 = 1371
17991802
MQIACF_ITEM_COUNT int32 = 1378
18001803
MQIACF_KNOWN_DEST_COUNT int32 = 1369
1801-
MQIACF_LAST_USED int32 = 1436
1804+
MQIACF_LAST_USED int32 = 1438
18021805
MQIACF_LDAP_CONNECTION_STATUS int32 = 1409
18031806
MQIACF_LISTENER_ATTRS int32 = 1222
18041807
MQIACF_LISTENER_STATUS_ATTRS int32 = 1223
@@ -2446,7 +2449,7 @@ const (
24462449
MQIA_IP_ADDRESS_VERSION int32 = 93
24472450
MQIA_KEY_REUSE_COUNT int32 = 267
24482451
MQIA_LAST int32 = 2000
2449-
MQIA_LAST_USED int32 = 273
2452+
MQIA_LAST_USED int32 = 274
24502453
MQIA_LDAP_AUTHORMD int32 = 263
24512454
MQIA_LDAP_NESTGRP int32 = 264
24522455
MQIA_LDAP_SECURE_COMM int32 = 261
@@ -2466,6 +2469,7 @@ const (
24662469
MQIA_MAX_PRIORITY int32 = 14
24672470
MQIA_MAX_PROPERTIES_LENGTH int32 = 192
24682471
MQIA_MAX_Q_DEPTH int32 = 15
2472+
MQIA_MAX_Q_FILE_SIZE int32 = 274
24692473
MQIA_MAX_Q_TRIGGERS int32 = 90
24702474
MQIA_MAX_RECOVERY_TASKS int32 = 171
24712475
MQIA_MAX_RESPONSES int32 = 230
@@ -3088,6 +3092,7 @@ const (
30883092
MQQDT_PREDEFINED int32 = 1
30893093
MQQDT_SHARED_DYNAMIC int32 = 4
30903094
MQQDT_TEMPORARY_DYNAMIC int32 = 3
3095+
MQQFS_DEFAULT int32 = -1
30913096
MQQF_CLWL_USEQ_ANY int32 = 64
30923097
MQQF_CLWL_USEQ_LOCAL int32 = 128
30933098
MQQF_LOCAL_Q int32 = 1

‎ibmmq/cmqc_linux_s390x.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ package ibmmq
1414
* for each value; those can be found in other header files such as
1515
* cmqc.h.
1616
****************************************************************
17-
* Copyright (c) IBM Corporation 1993, 2019
17+
* Copyright (c) IBM Corporation 1993, 2020
1818
*
1919
* Licensed under the Apache License, Version 2.0 (the "License");
2020
* you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@ package ibmmq
3030
****************************************************************
3131
*
3232
* <BEGIN_BUILDINFO>
33-
* Generated on: 11/19/19 1:20 PM
34-
* Build Level: p914-L191119
33+
* Generated on: 3/16/20 3:14 PM
34+
* Build Level: p915-L200316
3535
* Build Type: Production
3636
* <END_BUILDINFO>
3737
*/
@@ -1002,7 +1002,7 @@ const (
10021002
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
10031003
MQCMDI_SEC_TIMER_ZERO int32 = 14
10041004
MQCMDI_SEC_UPPERCASE int32 = 21
1005-
MQCMDL_CURRENT_LEVEL int32 = 914
1005+
MQCMDL_CURRENT_LEVEL int32 = 915
10061006
MQCMDL_LEVEL_1 int32 = 100
10071007
MQCMDL_LEVEL_101 int32 = 101
10081008
MQCMDL_LEVEL_110 int32 = 110
@@ -1042,6 +1042,7 @@ const (
10421042
MQCMDL_LEVEL_912 int32 = 912
10431043
MQCMDL_LEVEL_913 int32 = 913
10441044
MQCMDL_LEVEL_914 int32 = 914
1045+
MQCMDL_LEVEL_915 int32 = 915
10451046
MQCMD_ACCOUNTING_MQI int32 = 167
10461047
MQCMD_ACCOUNTING_Q int32 = 168
10471048
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1760,6 +1761,8 @@ const (
17601761
MQIACF_CONN_INFO_TYPE int32 = 1110
17611762
MQIACF_CONV_REASON_CODE int32 = 1072
17621763
MQIACF_CTL_OPERATION int32 = 1366
1764+
MQIACF_CUR_MAX_FILE_SIZE int32 = 1438
1765+
MQIACF_CUR_Q_FILE_SIZE int32 = 1437
17631766
MQIACF_DB2_CONN_STATUS int32 = 1150
17641767
MQIACF_DELETE_OPTIONS int32 = 1092
17651768
MQIACF_DESTINATION_CLASS int32 = 1273
@@ -1798,7 +1801,7 @@ const (
17981801
MQIACF_INVALID_DEST_COUNT int32 = 1371
17991802
MQIACF_ITEM_COUNT int32 = 1378
18001803
MQIACF_KNOWN_DEST_COUNT int32 = 1369
1801-
MQIACF_LAST_USED int32 = 1436
1804+
MQIACF_LAST_USED int32 = 1438
18021805
MQIACF_LDAP_CONNECTION_STATUS int32 = 1409
18031806
MQIACF_LISTENER_ATTRS int32 = 1222
18041807
MQIACF_LISTENER_STATUS_ATTRS int32 = 1223
@@ -2446,7 +2449,7 @@ const (
24462449
MQIA_IP_ADDRESS_VERSION int32 = 93
24472450
MQIA_KEY_REUSE_COUNT int32 = 267
24482451
MQIA_LAST int32 = 2000
2449-
MQIA_LAST_USED int32 = 273
2452+
MQIA_LAST_USED int32 = 274
24502453
MQIA_LDAP_AUTHORMD int32 = 263
24512454
MQIA_LDAP_NESTGRP int32 = 264
24522455
MQIA_LDAP_SECURE_COMM int32 = 261
@@ -2466,6 +2469,7 @@ const (
24662469
MQIA_MAX_PRIORITY int32 = 14
24672470
MQIA_MAX_PROPERTIES_LENGTH int32 = 192
24682471
MQIA_MAX_Q_DEPTH int32 = 15
2472+
MQIA_MAX_Q_FILE_SIZE int32 = 274
24692473
MQIA_MAX_Q_TRIGGERS int32 = 90
24702474
MQIA_MAX_RECOVERY_TASKS int32 = 171
24712475
MQIA_MAX_RESPONSES int32 = 230
@@ -3088,6 +3092,7 @@ const (
30883092
MQQDT_PREDEFINED int32 = 1
30893093
MQQDT_SHARED_DYNAMIC int32 = 4
30903094
MQQDT_TEMPORARY_DYNAMIC int32 = 3
3095+
MQQFS_DEFAULT int32 = -1
30913096
MQQF_CLWL_USEQ_ANY int32 = 64
30923097
MQQF_CLWL_USEQ_LOCAL int32 = 128
30933098
MQQF_LOCAL_Q int32 = 1

0 commit comments

Comments
 (0)