diff options
| author | Christopher Brown <ccbrown112@gmail.com> | 2017-09-01 12:09:35 -0500 |
|---|---|---|
| committer | Christopher Brown <ccbrown112@gmail.com> | 2017-09-01 12:09:35 -0500 |
| commit | df94be8f3775ec63bbb896070c0565f733fd3033 (patch) | |
| tree | 0cc77dc84813674d61ae77bed7a4d73883a768ee /store | |
| parent | 48763a00b9d1dee74c788d149bed3c669fa9afbf (diff) | |
| download | chat-df94be8f3775ec63bbb896070c0565f733fd3033.tar.gz chat-df94be8f3775ec63bbb896070c0565f733fd3033.tar.bz2 chat-df94be8f3775ec63bbb896070c0565f733fd3033.zip | |
[PLT-7055] Modified code arrangement for compatibility with 32-bit ARM (#7281)
Squashed commit of the following:
commit ba8e052d40f27123fbb5a94e9b30c05f51b90d36
Author: Christopher Brown <ccbrown112@gmail.com>
Date: Fri Sep 1 12:08:57 2017 -0500
style fixes
commit 121649f92f313813d9f105ddffb7d02ce5d3736f
Author: Syakyr Surani <coding@syakyr.me>
Date: Sat Aug 26 10:19:14 2017 +0800
Added comments for ARM/x86 (32-bit) compatibility
commit 4bd13dd0e378cd4866bd5aed762f2b4fb75d7de9
Author: Syakyr Surani <coding@syakyr.me>
Date: Sat Aug 26 05:20:43 2017 +0800
Added comments for ARM/x86 (32-bit) compatibility
commit 78027f616ab736076cef0b1fd8b3266b3c3010dc
Author: Syakyr Surani <coding@syakyr.me>
Date: Thu Aug 24 03:01:06 2017 +0800
[PLT-7055] Modified code arrangement for compatibility with 32-bit ARM
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_supplier.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/store/sql_supplier.go b/store/sql_supplier.go index 442c55ce9..53153d911 100644 --- a/store/sql_supplier.go +++ b/store/sql_supplier.go @@ -83,12 +83,14 @@ type SqlSupplierOldStores struct { } type SqlSupplier struct { + // rrCounter and srCounter should be kept first. + // See https://github.com/mattermost/platform/pull/7281 + rrCounter int64 + srCounter int64 next LayeredStoreSupplier master *gorp.DbMap replicas []*gorp.DbMap searchReplicas []*gorp.DbMap - rrCounter int64 - srCounter int64 oldStores SqlSupplierOldStores } |