Andrew Hutchings
9390ee05fb
Revert "MCOL-1559 Some string trailing blank stuff"
...
This reverts commit e5d76e142b .
2019-05-23 13:49:08 +01:00
Andrew Hutchings
922e828d6c
Revert "MCOL-1559 trailing white space comparison"
...
This reverts commit aa802f44c5 .
2019-05-23 13:48:56 +01:00
Andrew Hutchings
e7a331f3f8
Revert "MCOL-1559 trim spaces before compare"
...
This reverts commit 8d553ae9fb .
2019-05-23 13:48:43 +01:00
Andrew Hutchings
f3449fe2f4
Revert "MCOL-1559 trailing space compare"
...
This reverts commit 5b581f53cb .
2019-05-23 13:48:31 +01:00
Andrew Hutchings
73f7307ca2
Revert "MCOL-1559 trailing space compare"
...
This reverts commit e2cb644484 .
2019-05-23 13:48:18 +01:00
Andrew Hutchings
8b1c0f6101
Revert "MCOL-1559 trim constant varchar string before adding filter"
...
This reverts commit b6484dda4a .
2019-05-23 13:48:00 +01:00
Andrew Hutchings
182e31e282
Revert "MCOL-1559 backout trim before setting compare. Shouldn't do this in all cases."
...
This reverts commit d78944d9ff .
2019-05-23 13:47:42 +01:00
Andrew Hutchings
fa0947caaa
Revert "MCOL-1559 remove unused boost/trim header"
...
This reverts commit 28e743bf38 .
2019-05-23 13:47:20 +01:00
Ben Thompson
6d6c51cdd6
Remove assertions that are bad.
2019-05-22 15:05:03 -05:00
Patrick LeBlanc
4f20e2cb80
Merge pull request #772 from drrtuy/MCOL-537_3
...
MCOL-537 Regression test doesn't tolerate 'failed' in stderr, stdout.
2019-05-22 09:50:28 -05:00
Patrick LeBlanc
05e98265a8
Updated libmarias3
2019-05-22 08:50:37 -05:00
Patrick LeBlanc
0c4e549b7a
Fixed a couple compiler warnings/errors.
2019-05-22 08:50:19 -05:00
Patrick LeBlanc
68ffceaa68
Merge branch 'develop' of github.com:pleblanc1976/storage-manager into develop
2019-05-21 16:06:08 -05:00
Patrick LeBlanc
0dcbc10b5e
Added assertions around the file deletes in syncwithjournal.
2019-05-21 16:05:27 -05:00
Patrick LeBlanc
88de938913
Added logging to an error path in the s3 lib that looked like it should
...
have one.
2019-05-21 16:04:33 -05:00
Patrick LeBlanc
1e1fa5dbd5
Added a sigusr1 handler that prints current cache size.
2019-05-21 16:03:56 -05:00
Ben Thompson
d0a56fd3d4
Change how makespace is called on write when new objects are created. added some inserts and comments on potential bug.
2019-05-21 14:34:25 -05:00
Patrick LeBlanc
04aaff4c2b
Undid the undoing of a fix that was OK to begin with. Cache is in fact
...
supposed to delete the new file not the old one after a flush.
2019-05-20 16:11:36 -05:00
Patrick LeBlanc
168a1dd194
Undid a bad fix I made where Cache would potentially delete the
...
wrong file on a flush.
2019-05-20 15:51:45 -05:00
Patrick LeBlanc
b8d4891a18
Added some commented debugging printouts & some assertions around
...
deletion to make sure we're deleting things.
2019-05-20 10:52:47 -05:00
Roman Nozdrin
e12a2acd53
MCOL-537 Regression test doesn't tolerate 'failed' in stderr, stdout.
...
I reformulate the messages.
Changed version in preprocessor conditions to avoid compilation
warnings in Debian 9.
Disabled sign-compare check for generated files in DML/DDL.
2019-05-20 18:30:52 +03:00
Roman Nozdrin
122038e36a
Merge pull request #767 from mariadb-corporation/develop-1.2-merge-up-20190517
...
Merge develop-1.1 into develop-1.2
2019-05-20 13:50:36 +03:00
Patrick LeBlanc
28495c7e90
Fixed a bug in sync with journal where a cloud object would
...
not be deleted after a journal merge.
2019-05-17 16:02:34 -05:00
Andrew Hutchings
ea2ff9cd11
Merge branch 'develop-1.1' into develop-1.2-merge-up-20190517
2019-05-17 20:43:49 +01:00
Andrew Hutchings
4628346746
Merge pull request #766 from mariadb-corporation/MCOL-3314-1.1
...
MCOL-3314 When setting up statistics functions for the UM, use values…
2019-05-17 20:34:26 +01:00
Andrew Hutchings
8afc3f85d3
Merge pull request #765 from mariadb-corporation/MCOL-3314
...
MCOL-3314 When setting up statistics functions for the UM, use values…
2019-05-17 20:33:55 +01:00
Patrick LeBlanc
3d67df18bf
Merge branch 'develop' of github.com:mariadb-corporation/mariadb-columnstore-engine into S3-project
2019-05-17 13:24:09 -05:00
David Hall
01ff86096a
MCOL-3314 When setting up statistics functions for the UM, use values that actually exist.
2019-05-17 12:45:09 -05:00
David Hall
750b6ea0ff
MCOL-3314 When setting up statistics functions for the UM, use values that actually exist.
2019-05-17 12:43:18 -05:00
Patrick LeBlanc
8b29e3f9ce
Fixed a bug where Cache could delete the wrong file after a flush.
2019-05-17 12:11:57 -05:00
Patrick LeBlanc
77b682f9cd
Fixed a few problems in Sync.
...
- flushObject() could wait on an element in objNames which
doesn't exist, and so it would not get processed.
- process() would not always delete its job from objNames
- Added add'l debugging printouts and a fallback case for when
syncWithJournal does not find a journal file.
- noticed a name collision between the scoped ops in syncWithJournal (harmless)
2019-05-17 09:09:24 -05:00
Patrick LeBlanc
eb3608bf70
Fixed a race in Cache usage during delete & truncate ops.
...
An object could be flushed between the existence check & the delete
done by delete() & truncate(). Made it atomic within Cache.
2019-05-17 09:07:49 -05:00
Roman Nozdrin
92d662491a
Merge pull request #761 from mariadb-corporation/develop-1.2-merge-up-20190514
...
Merge develop-1.1 into develop-1.2
2019-05-16 21:50:05 +03:00
Patrick LeBlanc
886acd8b08
Removed the LIBS=-lm from Cmakelists. For some reason not necessary
...
in this release. Also, for some reason, we are now linking dynamically
instead of statically.
2019-05-16 13:47:13 -05:00
Patrick LeBlanc
8ec7e4a9af
Fixed a couple bugs in S3Storage.
...
- there was no closing of any file descriptors (!!)
- there was the typo in the connection pruning code s.t. nothing
would get pruned.
- added -lm to the libmarias3 stuff, was getting a linker error, not sure why.
2019-05-16 13:31:00 -05:00
Patrick LeBlanc
b1478f347b
Strengthen a minor assert in SharedCloser utility.
2019-05-16 11:56:42 -05:00
Patrick LeBlanc
cd83b26d6b
Was incrementing the wrong iterator, causing infinite loop.
2019-05-16 11:55:43 -05:00
Roman Nozdrin
355e2f914f
Merge pull request #759 from mariadb-corporation/develop-merge-up-20190514
...
Merge develop-1.2 into develop
2019-05-15 11:27:53 +03:00
Roman Nozdrin
0af69944c1
Merge pull request #756 from mariadb-corporation/MCOL-3296
...
MCOL-3296
2019-05-14 23:09:38 +03:00
Andrew Hutchings
45df72a416
Fix issue during merge
2019-05-14 14:36:46 +01:00
Andrew Hutchings
ee6575b013
Merge branch 'develop-1.1' into develop-1.2-merge-up-20190514
2019-05-14 14:26:41 +01:00
Andrew Hutchings
e3fe883a9c
Fix merge issues
2019-05-14 14:18:11 +01:00
Andrew Hutchings
020b211bb7
Merge branch 'develop-1.2' into develop-merge-up-20190514
2019-05-14 13:58:33 +01:00
Patrick LeBlanc
6c4afdf18b
Merge pull request #758 from drrtuy/repair_skip_oam_init
...
Repairs develop build mode w OAM disabled.
2019-05-13 14:41:12 -05:00
Patrick LeBlanc
15dbd1eec8
Fixed a one-char type in an error msg in s3storage.
2019-05-13 12:13:59 -05:00
Patrick LeBlanc
e23051ea0c
Added a comment to IOC. We could use some noise reduction
...
in copyFile.
2019-05-13 12:13:12 -05:00
Patrick LeBlanc
aad393dd34
Fixed a bug in Sync where we were using an object through a
...
reference to a shared pointer. A deref of the shared ptr could
trigger the dtor of the object while threads are waiting. Fixed that
by properly copying the shared ptr.
2019-05-13 12:11:16 -05:00
Patrick LeBlanc
19859de510
Added a test to the s3 module, attempt to copy a non-existant file.
2019-05-13 12:10:48 -05:00
Roman Nozdrin
cdc570bf42
Repairs develop build mode w OAM disabled. Now one can use
...
-DSKIP_OAM_INIT=1 instead of using environmental variable.
2019-05-13 18:32:35 +03:00
Roman Nozdrin
f3be1db554
Merge pull request #745 from ssedov/develop-1.1
...
MCOL-2051: CS uses 'NULL' literal as NULL when UPDATEs varchar field
2019-05-12 21:29:02 +03:00