Skip to content

Commit 5e39ebf

Browse files
ibmmqmetibmmqmet
authored
Merge pull request #90 from ibm-messaging/v912
MQ V9.1.2 support
2 parents 7486f4a + ca4ac3b commit 5e39ebf

20 files changed

+399
-98
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
# Changelog
2+
Newest updates are at the top of this file.
3+
4+
## March 20 2019 - v4.0.0
5+
* Update for MQ 9.1.2 - ApplName now settable during Connect
6+
* BREAKING API: deprecated Inq()/MQINQ implementation replaced.
7+
* Fixes to callback functions for EVENT processing
8+
* mqmetric - Improve handling of z/OS channel status where multiple instances of the same name
9+
* mqmetric - More accurate testing of model queue default maxdepth for status replies
10+
* mqmetric - Was ignoring an error in subscription processing
211

312
## January 24 2019
413
* Deal with callback functions being called unexpectedly (#75)

‎Dockerfile-build-samples

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ FROM $BASE_IMAGE
1919
RUN mkdir -p "$GOPATH/src/github.com/ibm-messaging/mq-golang/samples"
2020
WORKDIR $GOPATH/src/github.com/ibm-messaging/mq-golang/samples
2121

22-
COPY ./samples/clientconn clientconn
2322
COPY ./samples/mqitest mqitest
2423

25-
RUN go install ./clientconn \
26-
&& go install ./mqitest
24+
RUN go install ./mqitest

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ For example,
115115
116116
export CGO_CFLAGS="-I$MQ_INSTALLATION_PATH/inc"
117117
118-
export CGO_LDFLAGS="-L$MQ_INSTALLATION_PATH/lib64 -Wl,rpath=$MQ_INSTALLATION_PATH/lib64"
119-
or on Darwin
120118
export CGO_LDFLAGS="-L$MQ_INSTALLATION_PATH/lib64 -Wl,-rpath,$MQ_INSTALLATION_PATH/lib64"
121119
```
122120

‎ibmmq/cmqc_darwin.go

Lines changed: 24 additions & 9 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, 2018
17+
* Copyright (c) IBM Corporation 1993, 2019
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: 112018 5:02 PM
34-
* Build Level: p911-L181120.1
33+
* Generated on: 3/8/19 4:14 PM
34+
* Build Level: p912-L190308
3535
* Build Type: Production
3636
* <END_BUILDINFO>
3737
*/
@@ -194,7 +194,7 @@ var (
194194
MQBACF_FIRST int32 = 7001
195195
MQBACF_GENERIC_CONNECTION_ID int32 = 7007
196196
MQBACF_GROUP_ID int32 = 7012
197-
MQBACF_LAST_USED int32 = 7035
197+
MQBACF_LAST_USED int32 = 7037
198198
MQBACF_MESSAGE_DATA int32 = 7020
199199
MQBACF_MQBO_STRUCT int32 = 7021
200200
MQBACF_MQCBC_STRUCT int32 = 7023
@@ -209,7 +209,9 @@ var (
209209
MQBACF_MQSTS_STRUCT int32 = 7031
210210
MQBACF_MSG_ID int32 = 7013
211211
MQBACF_ORIGIN_UOW_ID int32 = 7008
212+
MQBACF_PROPERTIES_DATA int32 = 7037
212213
MQBACF_Q_MGR_UOW_ID int32 = 7009
214+
MQBACF_REQUEST_ID int32 = 7036
213215
MQBACF_RESPONSE_ID int32 = 7004
214216
MQBACF_RESPONSE_SET int32 = 7003
215217
MQBACF_SUB_CORREL_ID int32 = 7032
@@ -851,6 +853,7 @@ var (
851853
MQCFT_REPORT int32 = 12
852854
MQCFT_RESPONSE int32 = 2
853855
MQCFT_STATISTICS int32 = 21
856+
MQCFT_STATUS int32 = 27
854857
MQCFT_STRING int32 = 4
855858
MQCFT_STRING_FILTER int32 = 14
856859
MQCFT_STRING_LIST int32 = 6
@@ -979,7 +982,7 @@ var (
979982
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
980983
MQCMDI_SEC_TIMER_ZERO int32 = 14
981984
MQCMDI_SEC_UPPERCASE int32 = 21
982-
MQCMDL_CURRENT_LEVEL int32 = 911
985+
MQCMDL_CURRENT_LEVEL int32 = 912
983986
MQCMDL_LEVEL_1 int32 = 100
984987
MQCMDL_LEVEL_101 int32 = 101
985988
MQCMDL_LEVEL_110 int32 = 110
@@ -1016,6 +1019,7 @@ var (
10161019
MQCMDL_LEVEL_905 int32 = 905
10171020
MQCMDL_LEVEL_910 int32 = 910
10181021
MQCMDL_LEVEL_911 int32 = 911
1022+
MQCMDL_LEVEL_912 int32 = 912
10191023
MQCMD_ACCOUNTING_MQI int32 = 167
10201024
MQCMD_ACCOUNTING_Q int32 = 168
10211025
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1148,6 +1152,8 @@ var (
11481152
MQCMD_INQUIRE_TRACE int32 = 125
11491153
MQCMD_INQUIRE_USAGE int32 = 126
11501154
MQCMD_INQUIRE_XR_CAPABILITY int32 = 214
1155+
MQCMD_INTER_Q_MGR_BALANCE int32 = 219
1156+
MQCMD_INTER_Q_MGR_STATUS int32 = 218
11511157
MQCMD_LOGGER_EVENT int32 = 91
11521158
MQCMD_MOVE_Q int32 = 127
11531159
MQCMD_MQXR_DIAGNOSTICS int32 = 196
@@ -1226,8 +1232,8 @@ var (
12261232
MQCNO_ALL_CONVS_SHARE int32 = 262144
12271233
MQCNO_CD_FOR_OUTPUT_ONLY int32 = 524288
12281234
MQCNO_CLIENT_BINDING int32 = 2048
1229-
MQCNO_CURRENT_LENGTH int32 = 224
1230-
MQCNO_CURRENT_VERSION int32 = 6
1235+
MQCNO_CURRENT_LENGTH int32 = 256
1236+
MQCNO_CURRENT_VERSION int32 = 7
12311237
MQCNO_FASTPATH_BINDING int32 = 1
12321238
MQCNO_HANDLE_SHARE_BLOCK int32 = 64
12331239
MQCNO_HANDLE_SHARE_NONE int32 = 32
@@ -1239,6 +1245,7 @@ var (
12391245
MQCNO_LENGTH_4 int32 = 168
12401246
MQCNO_LENGTH_5 int32 = 200
12411247
MQCNO_LENGTH_6 int32 = 224
1248+
MQCNO_LENGTH_7 int32 = 256
12421249
MQCNO_LOCAL_BINDING int32 = 1024
12431250
MQCNO_NONE int32 = 0
12441251
MQCNO_NO_CONV_SHARING int32 = 65536
@@ -1259,6 +1266,7 @@ var (
12591266
MQCNO_VERSION_4 int32 = 4
12601267
MQCNO_VERSION_5 int32 = 5
12611268
MQCNO_VERSION_6 int32 = 6
1269+
MQCNO_VERSION_7 int32 = 7
12621270
MQCODL_AS_INPUT int32 = -1
12631271
MQCOMPRESS_ANY int32 = 268435455
12641272
MQCOMPRESS_NONE int32 = 0
@@ -1562,13 +1570,17 @@ var (
15621570
MQFUN_TYPE_USERDEF int32 = 4
15631571
MQGACF_ACTIVITY int32 = 8005
15641572
MQGACF_ACTIVITY_TRACE int32 = 8013
1573+
MQGACF_ALL_APPLS int32 = 8020
1574+
MQGACF_APPL_BALANCE int32 = 8021
1575+
MQGACF_APPL_STATUS int32 = 8018
15651576
MQGACF_APP_DIST_LIST int32 = 8014
1577+
MQGACF_CHANGED_APPLS int32 = 8019
15661578
MQGACF_CHL_STATISTICS_DATA int32 = 8012
15671579
MQGACF_COMMAND_CONTEXT int32 = 8001
15681580
MQGACF_COMMAND_DATA int32 = 8002
15691581
MQGACF_EMBEDDED_MQMD int32 = 8006
15701582
MQGACF_FIRST int32 = 8001
1571-
MQGACF_LAST_USED int32 = 8017
1583+
MQGACF_LAST_USED int32 = 8021
15721584
MQGACF_MESSAGE int32 = 8007
15731585
MQGACF_MONITOR_CLASS int32 = 8015
15741586
MQGACF_MONITOR_ELEMENT int32 = 8017
@@ -1751,7 +1763,7 @@ var (
17511763
MQIACF_INVALID_DEST_COUNT int32 = 1371
17521764
MQIACF_ITEM_COUNT int32 = 1378
17531765
MQIACF_KNOWN_DEST_COUNT int32 = 1369
1754-
MQIACF_LAST_USED int32 = 1423
1766+
MQIACF_LAST_USED int32 = 1424
17551767
MQIACF_LDAP_CONNECTION_STATUS int32 = 1409
17561768
MQIACF_LISTENER_ATTRS int32 = 1222
17571769
MQIACF_LISTENER_STATUS_ATTRS int32 = 1223
@@ -1765,6 +1777,7 @@ var (
17651777
MQIACF_MESSAGE_COUNT int32 = 1290
17661778
MQIACF_MODE int32 = 1008
17671779
MQIACF_MONITORING int32 = 1258
1780+
MQIACF_MOVABLE_APPL_COUNT int32 = 1424
17681781
MQIACF_MOVE_COUNT int32 = 1171
17691782
MQIACF_MOVE_TYPE int32 = 1145
17701783
MQIACF_MOVE_TYPE_ADD int32 = 1147
@@ -3349,6 +3362,7 @@ var (
33493362
MQRCCF_PROGRAM_NOT_AVAILABLE int32 = 3176
33503363
MQRCCF_PSCLUS_DISABLED_TOPDEF int32 = 3359
33513364
MQRCCF_PSCLUS_TOPIC_EXISTS int32 = 3360
3365+
MQRCCF_PS_REQUIRED_MQUC int32 = 3383
33523366
MQRCCF_PUBSUB_INHIBITED int32 = 3318
33533367
MQRCCF_PUB_OPTIONS_ERROR int32 = 3084
33543368
MQRCCF_PURGE_VALUE_ERROR int32 = 3046
@@ -3657,6 +3671,7 @@ var (
36573671
MQRC_IMPO_ERROR int32 = 2464
36583672
MQRC_INCOMPLETE_GROUP int32 = 2241
36593673
MQRC_INCOMPLETE_MSG int32 = 2242
3674+
MQRC_INCOMPLETE_TRANSACTION int32 = 2147
36603675
MQRC_INCONSISTENT_BROWSE int32 = 2259
36613676
MQRC_INCONSISTENT_CCSIDS int32 = 2243
36623677
MQRC_INCONSISTENT_ENCODINGS int32 = 2244

‎ibmmq/cmqc_linux_amd64.go

Lines changed: 24 additions & 9 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, 2018
17+
* Copyright (c) IBM Corporation 1993, 2019
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: 112018 5:02 PM
34-
* Build Level: p911-L181120.1
33+
* Generated on: 3/8/19 4:14 PM
34+
* Build Level: p912-L190308
3535
* Build Type: Production
3636
* <END_BUILDINFO>
3737
*/
@@ -194,7 +194,7 @@ var (
194194
MQBACF_FIRST int32 = 7001
195195
MQBACF_GENERIC_CONNECTION_ID int32 = 7007
196196
MQBACF_GROUP_ID int32 = 7012
197-
MQBACF_LAST_USED int32 = 7035
197+
MQBACF_LAST_USED int32 = 7037
198198
MQBACF_MESSAGE_DATA int32 = 7020
199199
MQBACF_MQBO_STRUCT int32 = 7021
200200
MQBACF_MQCBC_STRUCT int32 = 7023
@@ -209,7 +209,9 @@ var (
209209
MQBACF_MQSTS_STRUCT int32 = 7031
210210
MQBACF_MSG_ID int32 = 7013
211211
MQBACF_ORIGIN_UOW_ID int32 = 7008
212+
MQBACF_PROPERTIES_DATA int32 = 7037
212213
MQBACF_Q_MGR_UOW_ID int32 = 7009
214+
MQBACF_REQUEST_ID int32 = 7036
213215
MQBACF_RESPONSE_ID int32 = 7004
214216
MQBACF_RESPONSE_SET int32 = 7003
215217
MQBACF_SUB_CORREL_ID int32 = 7032
@@ -851,6 +853,7 @@ var (
851853
MQCFT_REPORT int32 = 12
852854
MQCFT_RESPONSE int32 = 2
853855
MQCFT_STATISTICS int32 = 21
856+
MQCFT_STATUS int32 = 27
854857
MQCFT_STRING int32 = 4
855858
MQCFT_STRING_FILTER int32 = 14
856859
MQCFT_STRING_LIST int32 = 6
@@ -979,7 +982,7 @@ var (
979982
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
980983
MQCMDI_SEC_TIMER_ZERO int32 = 14
981984
MQCMDI_SEC_UPPERCASE int32 = 21
982-
MQCMDL_CURRENT_LEVEL int32 = 911
985+
MQCMDL_CURRENT_LEVEL int32 = 912
983986
MQCMDL_LEVEL_1 int32 = 100
984987
MQCMDL_LEVEL_101 int32 = 101
985988
MQCMDL_LEVEL_110 int32 = 110
@@ -1016,6 +1019,7 @@ var (
10161019
MQCMDL_LEVEL_905 int32 = 905
10171020
MQCMDL_LEVEL_910 int32 = 910
10181021
MQCMDL_LEVEL_911 int32 = 911
1022+
MQCMDL_LEVEL_912 int32 = 912
10191023
MQCMD_ACCOUNTING_MQI int32 = 167
10201024
MQCMD_ACCOUNTING_Q int32 = 168
10211025
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1148,6 +1152,8 @@ var (
11481152
MQCMD_INQUIRE_TRACE int32 = 125
11491153
MQCMD_INQUIRE_USAGE int32 = 126
11501154
MQCMD_INQUIRE_XR_CAPABILITY int32 = 214
1155+
MQCMD_INTER_Q_MGR_BALANCE int32 = 219
1156+
MQCMD_INTER_Q_MGR_STATUS int32 = 218
11511157
MQCMD_LOGGER_EVENT int32 = 91
11521158
MQCMD_MOVE_Q int32 = 127
11531159
MQCMD_MQXR_DIAGNOSTICS int32 = 196
@@ -1226,8 +1232,8 @@ var (
12261232
MQCNO_ALL_CONVS_SHARE int32 = 262144
12271233
MQCNO_CD_FOR_OUTPUT_ONLY int32 = 524288
12281234
MQCNO_CLIENT_BINDING int32 = 2048
1229-
MQCNO_CURRENT_LENGTH int32 = 224
1230-
MQCNO_CURRENT_VERSION int32 = 6
1235+
MQCNO_CURRENT_LENGTH int32 = 256
1236+
MQCNO_CURRENT_VERSION int32 = 7
12311237
MQCNO_FASTPATH_BINDING int32 = 1
12321238
MQCNO_HANDLE_SHARE_BLOCK int32 = 64
12331239
MQCNO_HANDLE_SHARE_NONE int32 = 32
@@ -1239,6 +1245,7 @@ var (
12391245
MQCNO_LENGTH_4 int32 = 168
12401246
MQCNO_LENGTH_5 int32 = 200
12411247
MQCNO_LENGTH_6 int32 = 224
1248+
MQCNO_LENGTH_7 int32 = 256
12421249
MQCNO_LOCAL_BINDING int32 = 1024
12431250
MQCNO_NONE int32 = 0
12441251
MQCNO_NO_CONV_SHARING int32 = 65536
@@ -1259,6 +1266,7 @@ var (
12591266
MQCNO_VERSION_4 int32 = 4
12601267
MQCNO_VERSION_5 int32 = 5
12611268
MQCNO_VERSION_6 int32 = 6
1269+
MQCNO_VERSION_7 int32 = 7
12621270
MQCODL_AS_INPUT int32 = -1
12631271
MQCOMPRESS_ANY int32 = 268435455
12641272
MQCOMPRESS_NONE int32 = 0
@@ -1562,13 +1570,17 @@ var (
15621570
MQFUN_TYPE_USERDEF int32 = 4
15631571
MQGACF_ACTIVITY int32 = 8005
15641572
MQGACF_ACTIVITY_TRACE int32 = 8013
1573+
MQGACF_ALL_APPLS int32 = 8020
1574+
MQGACF_APPL_BALANCE int32 = 8021
1575+
MQGACF_APPL_STATUS int32 = 8018
15651576
MQGACF_APP_DIST_LIST int32 = 8014
1577+
MQGACF_CHANGED_APPLS int32 = 8019
15661578
MQGACF_CHL_STATISTICS_DATA int32 = 8012
15671579
MQGACF_COMMAND_CONTEXT int32 = 8001
15681580
MQGACF_COMMAND_DATA int32 = 8002
15691581
MQGACF_EMBEDDED_MQMD int32 = 8006
15701582
MQGACF_FIRST int32 = 8001
1571-
MQGACF_LAST_USED int32 = 8017
1583+
MQGACF_LAST_USED int32 = 8021
15721584
MQGACF_MESSAGE int32 = 8007
15731585
MQGACF_MONITOR_CLASS int32 = 8015
15741586
MQGACF_MONITOR_ELEMENT int32 = 8017
@@ -1751,7 +1763,7 @@ var (
17511763
MQIACF_INVALID_DEST_COUNT int32 = 1371
17521764
MQIACF_ITEM_COUNT int32 = 1378
17531765
MQIACF_KNOWN_DEST_COUNT int32 = 1369
1754-
MQIACF_LAST_USED int32 = 1423
1766+
MQIACF_LAST_USED int32 = 1424
17551767
MQIACF_LDAP_CONNECTION_STATUS int32 = 1409
17561768
MQIACF_LISTENER_ATTRS int32 = 1222
17571769
MQIACF_LISTENER_STATUS_ATTRS int32 = 1223
@@ -1765,6 +1777,7 @@ var (
17651777
MQIACF_MESSAGE_COUNT int32 = 1290
17661778
MQIACF_MODE int32 = 1008
17671779
MQIACF_MONITORING int32 = 1258
1780+
MQIACF_MOVABLE_APPL_COUNT int32 = 1424
17681781
MQIACF_MOVE_COUNT int32 = 1171
17691782
MQIACF_MOVE_TYPE int32 = 1145
17701783
MQIACF_MOVE_TYPE_ADD int32 = 1147
@@ -3349,6 +3362,7 @@ var (
33493362
MQRCCF_PROGRAM_NOT_AVAILABLE int32 = 3176
33503363
MQRCCF_PSCLUS_DISABLED_TOPDEF int32 = 3359
33513364
MQRCCF_PSCLUS_TOPIC_EXISTS int32 = 3360
3365+
MQRCCF_PS_REQUIRED_MQUC int32 = 3383
33523366
MQRCCF_PUBSUB_INHIBITED int32 = 3318
33533367
MQRCCF_PUB_OPTIONS_ERROR int32 = 3084
33543368
MQRCCF_PURGE_VALUE_ERROR int32 = 3046
@@ -3657,6 +3671,7 @@ var (
36573671
MQRC_IMPO_ERROR int32 = 2464
36583672
MQRC_INCOMPLETE_GROUP int32 = 2241
36593673
MQRC_INCOMPLETE_MSG int32 = 2242
3674+
MQRC_INCOMPLETE_TRANSACTION int32 = 2147
36603675
MQRC_INCONSISTENT_BROWSE int32 = 2259
36613676
MQRC_INCONSISTENT_CCSIDS int32 = 2243
36623677
MQRC_INCONSISTENT_ENCODINGS int32 = 2244

0 commit comments

Comments
 (0)