database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2026-01-06 08:21:10 +03:00
Code Activity

Merge pull request #2075 from mariadb-corporation/updates-from-5.6.2-2-develop

Browse Source 
Updates from 5.6.2 2 develop
This commit is contained in:
Roman Nozdrin
2021-09-02 15:46:44 +03:00
committed by GitHub
parent 6ef2af1fae 1d2114a0d5
commit 7d7c982d9e
6 changed files with 2007 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/mariadb-plugin-columnstore.install vendored
View File

@@ -10,6 +10,7 @@ usr/bin/ExeMgr
usr/bin/PrimProc
usr/bin/StorageManager
usr/bin/WriteEngineServer
usr/bin/autoConfigure
usr/bin/clearShm
usr/bin/cleartablelock
usr/bin/columnstore-post-install

3
oam/etc/Columnstore.xml
View File

@@ -447,7 +447,6 @@
<MySQLRep>n</MySQLRep>
<DBRootStorageType>internal</DBRootStorageType>
<UMStorageType>internal</UMStorageType>
<EEPackageType>binary</EEPackageType>
<SystemLogConfigFile>/etc/rsyslog.d/49-columnstore.conf</SystemLogConfigFile>
<Cloud>unassigned</Cloud>
<AmazonVPCNextPrivateIP>autoassign</AmazonVPCNextPrivateIP>
@@ -521,7 +520,7 @@
<!-- <RowAggrThreads>4</RowAggrThreads> --> <!-- Default value is the number of cores -->
<!-- <RowAggrBuckets>32</RowAggrBuckets> --> <!-- Default value is number of cores * 4 -->
<!-- <RowAggrRowGroupsPerThread>20</RowAggrRowGroupsPerThread> --> <!-- Default value is 20 -->
<!-- <AllowDiskBasedAggregation>N</AllowDiskBasedAggregation> --> <!-- Default value is N -->
<AllowDiskBasedAggregation>N</AllowDiskBasedAggregation>
</RowAggregation>
<CrossEngineSupport>
<Host>127.0.0.1</Host>

10
oam/install_scripts/columnstore-post-install.in
View File

@@ -92,9 +92,14 @@ if [ -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave ]; then
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf
fi
# Make copy of the new .xml file in 2 places so its preserved if something goes wrong in autoConfigure
# Original Columnstore.xml will still be in .rpmsave
if [ -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.rpmsave ]; then
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.rpmnew
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.new
/bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.rpmsave @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml
@ENGINE_BINDIR@/autoConfigure
mv -f @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml.new @ENGINE_SYSCONFDIR@/columnstore/Columnstore.xml
fi
touch /dev/shm/columnstore-test && rm /dev/shm/columnstore-test
@@ -209,10 +214,7 @@ fi
# upgrade the columnstore.cnf file
if [ -f @MARIADB_MYCNFDIR@/columnstore.cnf.rpmsave ]; then
@ENGINE_BINDIR@/mycnfUpgrade > @ENGINE_LOGDIR@/install/mycnfUpgrade.log 2>&1
if [ $? -ne 0 ]; then
echo "Error: Problem upgrade columnstore.cnf, check @ENGINE_LOGDIR@/install/mycnfUpgrade.log"
fi
cp -f @MARIADB_MYCNFDIR@/columnstore.cnf.rpmsave @MARIADB_MYCNFDIR@/columnstore.cnf
fi
if [ $user = "root" ]; then

1
tools/CMakeLists.txt
View File

@@ -12,3 +12,4 @@ add_subdirectory(ddlcleanup)
add_subdirectory(idbmeminfo)
add_subdirectory(rebuildEM)
add_subdirectory(passwd)
add_subdirectory(configMgt)

13
tools/configMgt/CMakeLists.txt Normal file
View File

@@ -0,0 +1,13 @@
include_directories( ${ENGINE_COMMON_INCLUDES} )
########### next target ###############
set(autoConfigure_SRCS autoConfigure.cpp)
add_executable(autoConfigure ${autoConfigure_SRCS})
target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-engine)

1985
tools/configMgt/autoConfigure.cpp Normal file
View File

File diff suppressed because it is too large Load Diff