1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Commit Graph

204 Commits

Author SHA1 Message Date
Roman Nozdrin
32d3e3f6a3 MCOL-3991 MCS doesn't build mcsAdmin anymore.
Removed MDB network port check from postConfigure.
2020-05-14 14:07:13 +00:00
Jose
ee27116cf6 MCOL-3991 New single package on debian-based systems 2020-05-12 13:36:24 +00:00
Jose
98abf95eae MCOL-3991 MCS is now single package and properly uninstalls 2020-05-12 13:36:24 +00:00
Roman Nozdrin
6987ac40e1 MCOL-3982 Avoid using autotools for libmarias3 and remove libxml2 from libmarias3 dependencies. 2020-05-06 12:45:34 +00:00
Roman Nozdrin
6f3ae1b429 MCOL-3941 Ninja now builds MCS.
Generated files in utils/loggingcpp/ are now moved into bin dir.
2020-04-20 13:35:30 +00:00
Patrick LeBlanc
01240cc9e0 Merge pull request #1071 from mariadb-corporation/fix-upgrade
Fix Upgrade
2020-03-02 10:21:23 -05:00
benthompson15
95f0caaf63 Merge pull request #1007 from LinuxJedi/MCOL-3707
MCOL-3707 Packaging pre/post functions
2020-02-28 13:58:16 -05:00
Andrew Hutchings
ff96140949 Merge pull request #983 from drrtuy/fixing-debug-build_1
Refactored MDB relation names decoding in DDL code.
2019-12-13 19:24:57 +00:00
Roman Nozdrin
7acfddddb7 Refactored MDB relation names decoding in DDL code.
SH now takes all or nothing thus we need to change if conditions that rules our GBH.

Small warning fixes for GCC8.2

Disabled GBH.
2019-12-13 11:38:19 -06:00
Andrew Hutchings
54c6cc1f06 Fix cmake for combined build bintar build
INSTALL_SYSCONF2DIR is not set if the build is not RPM or DEB which
causes cmake to fail. When we make generic paths work correctly we
should correct this.
2019-12-11 15:13:42 +00:00
Andrew Hutchings
49994f7bc3 Fix warnings found in DEBUG combined build
Fixes:
* Irrelevant where conditions
* Irrelevant const
* A potential infinite loop in treenode
* Bad implicit case fallthroughs
* Explicit markings for required case fallthroughs
* Unused variables
* Unused function

Also disabled some warnings for now which we should fix later.
2019-12-10 16:33:08 +00:00
benthompson15
207fb3f588 Merge pull request #960 from LinuxJedi/unified_build
Unified build for ES and MCS
2019-12-05 01:19:23 +01:00
Roman Nozdrin
766d84ada8 MCOL-3585 Enabled MCOL-498 by default for all dbroots. 2019-12-04 06:49:31 -06:00
Andrew Hutchings
7489d0bfd0 MCOL-3625 Rename packages
Rename packages to MariaDB-columnstore-engine, MariaDB-columnstore-libs
and MariaDB-columnstore-platform.

Also add the "columnstore-" prefix the the components so that MariaDB's
packaging system understands then and add a line to include them in
MariaDB's packaging.

In addition
* Fix S3 building for dist source build
* Fix Debian 10 dependency issue
* Fix git handling for dist builds
* Add support for MariaDB's RPM building
* Use MariaDB's PCRE and readline
* Removes a few dead files
* Fix Boost noncopyable includes
2019-12-04 11:04:39 +00:00
Andrew Hutchings
a8cd34f86d Add support for building from server 2019-12-03 21:21:28 +00:00
Andrew Hutchings
efe829784d MCOL-3624 Move jemalloc to an LD_PRELOAD
Linking will become an issue for the unified build and it is an issue
for jemalloc 5.x. Instead we will LD_PRELOAD on the forked ColumnStore
specific processes.
2019-12-03 21:21:28 +00:00
Andrew Hutchings
8ab9ebb0f4 MCOL-3606 Make ColumnStore use generic paths
ColumnStore now uses standard bin/lib paths for pretty much everything.
Data path is now hard-coded to /var/lib/columnstore.

This patch also:

* Removes v1 decompression
* Removes a bunch of unneeded files
* Removes COLUMNSTORE_INSTALL_DIR / $INSTALLDIR
* Makes my.cnf.d work for all platforms (MCOL-3558)
* Changes configcpp to use recursive mutex (fixes possible config write deadlock)
* Fixes MCOL-3599 Fix regr functions, The library was installed in the wrong location
* Fixes a bunch of Ubuntu packaging issues
* Changes the binary names of several of the executables so as not to
clash with potential executables from other packages
2019-11-09 16:53:05 +00:00
Patrick LeBlanc
0c18eb2dd4 Fixed a couple paths in the top-level cmakelists file. 2019-11-08 15:42:45 -05:00
Andrew Hutchings
ebb22a96a3 MCOL-3551 Use generic MariaDB Server paths
This branch enforces the use of generic MariaDB server paths for their
binaries and data rather than custom paths.

/usr/local/mariadb/columnstore is now only for columnstore with this
patch.

It should be noted that this removes the auto-mounting of external
MariaDB UM data storage for AWS.

This is also a fix for MCOL-3510 after buildbot changes are made.

Also... MCOL-3552 Use columnstore.cnf to load plugins

The ColumnStore plugins now load using a columnstore.cnf instead of a
SQL sequence to be more in-line with MariaDB's methods.
2019-10-13 09:34:37 +01:00
Gagan Goel
594ee22999 Add status variables to show ColumnStore version and commit hash. 2019-10-09 10:43:35 -04:00
Andrew Hutchings
59d1caae02 Fix CMake dependencies
Some odd quirks with CMake mean that marias3 has to be in the top level
CMake. Also made submodule checkout happen at cmake time.
2019-09-25 11:30:32 +01:00
Andrew Hutchings
97bda78c3b Move config files
This patch:

* Moves config files from /usr/local/mariadb/columnstore/etc to
ENGINE_SYSCONFDIR/columnstore (ENGINE_SYSCONFDIR is /etc by default)
* Sets a define called MCSSYSCONFDIR whic contains the
ENGINE_SYSCONFDIR compile time setting
* Modifies scripts and code to use the new paths
* Removes a whole bunch of files we don't use
2019-09-09 14:13:56 +01:00
Andrew Hutchings
74d68b4db3 Fix my.cnf clash
This patch:

* Moves ColumnStore my.cnf to /etc/my.cnf.d/columnstore.cnf
* Removes unneeded entries from columnstore.cnf
* Removes some things that used my.cnf and are now dead
* Also removes utils/scenarios
* Modifies things that use extra defaults file to use the standard one
* Makes sure that C++11 standard is used for older CMake versions

With this patch we no longer need to set -DINSTALL_SYSCONF2DIR and
-DINSTALL_SYSCONFDIR when building MariaDB server.
2019-09-04 18:51:02 +01:00
Patrick LeBlanc
fbdf1a5308 Merge branch 'develop' into S3-project 2019-08-14 15:37:14 -05:00
Patrick LeBlanc
1b1e956c63 Checkpointing changes for merging storagemanager -> CS. 2019-08-14 13:05:50 -05:00
Roman Nozdrin
6fd5b2f22d MCOL-2178 Merging with 10.4
SELECT_LEX had been moved in THD so changed all references.
        Avoid writing CS decimal scales into MDB decimal fields
            d-only dec attribute. WIP
        Replaced infinidb_vtable with a singleton MIGR.
        Merged with MCOL-2121.
        Added new wsrep include paths needed by UDaF code.
        Removed .vcxproj from Connector code.
2019-08-01 12:54:17 -04:00
David Mott
9022fa426d minor fixups 2019-05-04 02:14:40 -05:00
David Mott
515b93cc3d remove faulty test code 2019-04-29 01:28:54 -05:00
David Mott
4b9d046c6e Fully resolve potentially ambiguous symbols by removing using namespace statements from headers which have a cascading effect. This causes potential behavior changes when switching to c++11 since symbols can be exported from std and boost while both have been imported into the global namespace. 2019-04-29 01:21:15 -05:00
David Mott
f29f909482 Add -DSERVER_BUILD_DIR configure parameter to interrogate the server build cache and derive variables and settings 2019-04-25 06:27:28 -05:00
Andrew Hutchings
723ca53669 Merge branch 'develop' into MCOL-498_5 2019-04-24 09:04:39 +01:00
Roman Nozdrin
bc3c780e35 MCOL-498 Revived unit tests for writeengine/shared and add new tests
for extent extention.
Added a getter, moved some methods from protected into public to use
with unit tests, e.g createFile, setPreallocSpace. Added code stub in
FileOp::oid2FileName to use with UT.
2019-04-22 20:02:00 +03:00
David Mott
138a6c5592 move cmake scripts to cmake folder
add boost super build project (currently disabled)
declare BOOST_NO_CXX11_SCOPED_ENUMS on projects that use boost::filesystem
2019-04-19 11:00:43 -05:00
David Mott
241d0b0446 rollback unintended changes 2019-04-17 11:36:56 -05:00
David Mott
2a9c5387c3 Enable c++11 2019-04-17 05:03:28 -05:00
Andrew Hutchings
d4a5c2823b Merge branch 'develop-1.1' into develop-1.2-merge-up-20190214 2019-02-14 15:55:15 +00:00
Andrew Hutchings
6205193845 Disable jemalloc on SLES 2019-02-13 21:50:44 +00:00
Andrew Hutchings
fe453e23fa Merge branch 'develop-1.0' into develop-1.1-merge-up-20190207 2019-02-07 14:55:26 +00:00
Ben Thompson
52a741e6ef MCOL-2136: Force use of jemalloc for build and install. 2019-02-05 17:18:02 -06:00
Ben Thompson
b81455744d Revert "Kill Jemalloc"
This reverts commit e03f7dc885.
2019-02-05 13:43:21 -06:00
David Mott
38bd6e1e3c respect relative paths for SERVER_BUILD_INCLUDE_DIR and SERVER_SOURCE_ROOT_DIR 2019-01-25 10:33:59 -06:00
David Mott
e12f0fc984 fix to MCOL-2110 Cant build engine out-of-source
Prefixing SERVER_BUILD_INCLUDE_DIR and SERVER_SOURCE_ROOT_DIR with CMAKE_BINARY_DIR works in the case of the engine and server build folders being siblings to each other and relative paths supplied to cmake. If the build folders are not siblings and absolute paths are supplied to cmake it fails. Using GET_FILENAME_COMPONENT will resolve the correct path in both cases.
2019-01-25 06:54:16 -06:00
Andrew Hutchings
82bd9e29f5 Merge branch 'develop-1.1' into 1.1-merge-up-2018-12-20b 2018-12-20 20:55:00 +00:00
Ben Thompson
177b472ad4 MCOL-2007: add gitversionEngine file to builds/packages 2018-12-18 15:23:55 -06:00
David Hall
1b4063666b Merge branch 'develop' into MCOL-521-b 2018-09-10 13:55:52 -05:00
Andrew Hutchings
580a3ec123 MCOL-1647 Fix TIME regressions
Fixes the following:

* Read past buffer end in intToDatetime / intToTime
* Allow intToTime to convert datetime
* Allow intToTime to convert shortened time values
* Allow stringToTime to convert datetime and int time values
* Fix saturation / bad values in intToTime and stringToTime
* Fix TIME return in STR_TO_DATE()
* Fix NULL return on type inequality for TIMEDIFF()
* Fix zero day calculation error in ADDTIME()/SUBTIME()
* Fix DATETIME to int calculation error in aggregate bit operations
* Make the new harderning flags optional with -DSECURITY_HARDENED_NEW
2018-08-17 07:55:51 +01:00
David Hall
f4af014435 MCOL-521 Put regr functions in their own library 2018-08-16 17:10:52 -05:00
Andrew Hutchings
e248920ad0 MCOL-1378 Add more hardening flags
More modern stack and bounds protection flags. Most won't activate until
GCC 8 is used but it makes us ready for that.
2018-06-22 21:28:25 +01:00
Roman Nozdrin
8a3c5e08e2 MCOL-1073 DecomSvr service was removed. 2018-05-13 22:02:08 +03:00
Andrew Hutchings
21d8f04a65 Merge branch 'develop-1.1' into 1.1-mergeup-20180224 2018-02-24 11:07:24 -05:00