1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00

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
This commit is contained in:
Andrew Hutchings
2019-11-04 11:06:33 +00:00
parent dea1dec507
commit 8ab9ebb0f4
178 changed files with 1310 additions and 18366 deletions

View File

@ -1,397 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id: Columnstore.xml 410 2007-03-30 19:47:18Z dhill $ -->
<Calpont Version="V1.0.0">
<Messageq>
<Dir>/var/tmp</Dir>
</Messageq>
<ExeMgr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8601</Port>
<ServerThreads>50</ServerThreads>
<ServerQueueSize>100</ServerQueueSize>
</ExeMgr>
<JobProc>
<IPAddr>127.0.0.1</IPAddr>
<Port>8602</Port>
</JobProc>
<ProcMgr>
<IPAddr>127.0.0.1</IPAddr>
<Port>8604</Port>
</ProcMgr>
<CalpontConsole>
<IPAddr>127.0.0.1</IPAddr>
<Port>8606</Port>
</CalpontConsole>
<dm1_ProcessMonitor>
<IPAddr>127.0.0.1</IPAddr>
<Port>8630</Port>
</dm1_ProcessMonitor>
<dm2_ProcessMonitor>
<IPAddr>127.0.0.1</IPAddr>
<Port>8632</Port>
</dm2_ProcessMonitor>
<um1_ProcessMonitor>
<IPAddr>127.0.0.1</IPAddr>
<Port>8634</Port>
</um1_ProcessMonitor>
<um2_ProcessMonitor>
<IPAddr>127.0.0.1</IPAddr>
<Port>8636</Port>
</um2_ProcessMonitor>
<um3_ProcessMonitor>
<IPAddr>127.0.0.1</IPAddr>
<Port>8638</Port>
</um3_ProcessMonitor>
<pm1_ProcessMonitor>
<IPAddr>127.0.0.1</IPAddr>
<Port>8640</Port>
</pm1_ProcessMonitor>
<pm2_ProcessMonitor>
<IPAddr>127.0.0.1</IPAddr>
<Port>8642</Port>
</pm2_ProcessMonitor>
<pm3_ProcessMonitor>
<IPAddr>127.0.0.1</IPAddr>
<Port>8644</Port>
</pm3_ProcessMonitor>
<ms1_ProcessMonitor>
<IPAddr>127.0.0.1</IPAddr>
<Port>8650</Port>
</ms1_ProcessMonitor>
<DDLProc>
<IPAddr>127.0.0.1</IPAddr>
<Port>8612</Port>
</DDLProc>
<DMLProc>
<IPAddr>127.0.0.1</IPAddr>
<Port>8614</Port>
</DMLProc>
<PrimitiveServers>
<Count>5</Count>
<ServerThreads>1</ServerThreads>
<ServerQueueSize>100</ServerQueueSize>
<ProcessorThreads>30</ProcessorThreads>
<ProcessorQueueSize>100</ProcessorQueueSize>
<ReadThreads>200</ReadThreads>
<ReadQueueSize>400</ReadQueueSize>
<DebugLevel>0</DebugLevel>
<LBID_Mask>31</LBID_Mask>
<LBID_Shift>10</LBID_Shift>
<DataElementsPerMessage>1024</DataElementsPerMessage>
<JoinElementsPerMessage>1024</JoinElementsPerMessage>
<MinNumDeliverable>1000</MinNumDeliverable>
<MinNumExecutable>1000</MinNumExecutable>
<ThrottleToCompletion>1</ThrottleToCompletion>
</PrimitiveServers>
<PrimitiveServer1>
<PM1>PMS1</PM1>
<PM2>PMS2</PM2>
<PM3>PMS3</PM3>
<PM4>PMS4</PM4>
</PrimitiveServer1>
<PrimitiveServer2>
<PM1>PMS5</PM1>
<PM2>PMS6</PM2>
<PM3>PMS7</PM3>
<PM4>PMS8</PM4>
</PrimitiveServer2>
<PrimitiveServer3>
<PM1>PMS9</PM1>
<PM2>PMS10</PM2>
<PM3>PMS11</PM3>
<PM4>PMS12</PM4>
</PrimitiveServer3>
<PrimitiveServer4>
<PM1>PMS13</PM1>
<PM2>PMS14</PM2>
<PM3>PMS15</PM3>
<PM4>PMS16</PM4>
</PrimitiveServer4>
<PrimitiveServer5>
<PM1>PMS17</PM1>
<PM2>PMS18</PM2>
<PM3>PMS19</PM3>
<PM4>PMS20</PM4>
</PrimitiveServer5>
<PMS1>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS1>
<PMS2>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS2>
<PMS3>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS3>
<PMS4>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS4>
<PMS5>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS5>
<PMS6>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS6>
<PMS7>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS7>
<PMS8>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS8>
<PMS9>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS9>
<PMS10>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS10>
<PMS11>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS11>
<PMS12>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS12>
<PMS13>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS13>
<PMS14>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS14>
<PMS15>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS15>
<PMS16>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS16>
<PMS17>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS17>
<PMS18>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS18>
<PMS19>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS19>
<PMS20>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS20>
<PMS21>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS21>
<PMS22>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS22>
<PMS23>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS23>
<PMS24>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS24>
<PMS25>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS25>
<PMS26>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS26>
<PMS27>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS27>
<PMS28>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS28>
<PMS29>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS29>
<PMS30>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS30>
<PMS31>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS31>
<PMS32>
<IPAddr>127.0.0.1</IPAddr>
<Port>8620</Port>
</PMS32>
<ProcStatusControl>
<IPAddr>127.0.0.1</IPAddr>
<Port>8625</Port>
</ProcStatusControl>
<SystemConfig>
<SystemVersion>V1.0.0.0</SystemVersion>
<ModuleHeartbeatPeriod>5</ModuleHeartbeatPeriod>
<ModuleHeartbeatCount>3</ModuleHeartbeatCount>
<ProcessHeartbeatPeriod>60</ProcessHeartbeatPeriod>
<DBRoot>/usr/local/mariadb/columnstore/data</DBRoot>
<DBRMRoot>/home/pleblanc/DBRMRoot_test</DBRMRoot>
<RAIDCriticalThreshold>90</RAIDCriticalThreshold>
<RAIDMajorThreshold>80</RAIDMajorThreshold>
<RAIDMinorThreshold>70</RAIDMinorThreshold>
<ParentOAMModuleName>dm1</ParentOAMModuleName>
</SystemConfig>
<BackupConfig>
<BackupDestination>NONE</BackupDestination>
<BackupSource>NONE</BackupSource>
</BackupConfig>
<SystemModuleConfig>
<ModuleType1>dm</ModuleType1>
<ModuleDesc1>Director Module</ModuleDesc1>
<ModuleCount1>1</ModuleCount1>
<ModuleIPAddr1-1>127.0.0.1</ModuleIPAddr1-1>
<ModuleServerName1-1>Unassigned</ModuleServerName1-1>
<ModuleCPUCriticalThreshold1>90</ModuleCPUCriticalThreshold1>
<ModuleCPUMajorThreshold1>80</ModuleCPUMajorThreshold1>
<ModuleCPUMinorThreshold1>70</ModuleCPUMinorThreshold1>
<ModuleCPUMinorClearThreshold1>60</ModuleCPUMinorClearThreshold1>
<ModuleDiskCriticalThreshold1>90</ModuleDiskCriticalThreshold1>
<ModuleDiskMajorThreshold1>80</ModuleDiskMajorThreshold1>
<ModuleDiskMinorThreshold1>70</ModuleDiskMinorThreshold1>
<ModuleMemCriticalThreshold1>90</ModuleMemCriticalThreshold1>
<ModuleMemMajorThreshold1>80</ModuleMemMajorThreshold1>
<ModuleMemMinorThreshold1>70</ModuleMemMinorThreshold1>
<ModuleSwapCriticalThreshold1>90</ModuleSwapCriticalThreshold1>
<ModuleSwapMajorThreshold1>80</ModuleSwapMajorThreshold1>
<ModuleSwapMinorThreshold1>70</ModuleSwapMinorThreshold1>
<ModuleDiskMonitorFileSystem1-1>/</ModuleDiskMonitorFileSystem1-1>
<ModuleType2>um</ModuleType2>
<ModuleDesc2>User Module</ModuleDesc2>
<ModuleCount2>1</ModuleCount2>
<ModuleIPAddr1-2>127.0.0.1</ModuleIPAddr1-2>
<ModuleServerName1-2>Unassigned</ModuleServerName1-2>
<ModuleCPUCriticalThreshold2>90</ModuleCPUCriticalThreshold2>
<ModuleCPUMajorThreshold2>80</ModuleCPUMajorThreshold2>
<ModuleCPUMinorThreshold2>70</ModuleCPUMinorThreshold2>
<ModuleCPUMinorClearThreshold2>60</ModuleCPUMinorClearThreshold2>
<ModuleDiskCriticalThreshold2>90</ModuleDiskCriticalThreshold2>
<ModuleDiskMajorThreshold2>80</ModuleDiskMajorThreshold2>
<ModuleDiskMinorThreshold2>70</ModuleDiskMinorThreshold2>
<ModuleMemCriticalThreshold2>90</ModuleMemCriticalThreshold2>
<ModuleMemMajorThreshold2>80</ModuleMemMajorThreshold2>
<ModuleMemMinorThreshold2>70</ModuleMemMinorThreshold2>
<ModuleSwapCriticalThreshold2>90</ModuleSwapCriticalThreshold2>
<ModuleSwapMajorThreshold2>80</ModuleSwapMajorThreshold2>
<ModuleSwapMinorThreshold2>70</ModuleSwapMinorThreshold2>
<ModuleDiskMonitorFileSystem1-2>/</ModuleDiskMonitorFileSystem1-2>
<ModuleType3>pm</ModuleType3>
<ModuleDesc3>Performance Module</ModuleDesc3>
<ModuleCount3>1</ModuleCount3>
<ModuleIPAddr1-3>127.0.0.1</ModuleIPAddr1-3>
<ModuleServerName1-3>Unassigned</ModuleServerName1-3>
<ModuleCPUCriticalThreshold3>90</ModuleCPUCriticalThreshold3>
<ModuleCPUMajorThreshold3>80</ModuleCPUMajorThreshold3>
<ModuleCPUMinorThreshold3>70</ModuleCPUMinorThreshold3>
<ModuleCPUMinorClearThreshold3>60</ModuleCPUMinorClearThreshold3>
<ModuleDiskCriticalThreshold3>90</ModuleDiskCriticalThreshold3>
<ModuleDiskMajorThreshold3>80</ModuleDiskMajorThreshold3>
<ModuleDiskMinorThreshold3>70</ModuleDiskMinorThreshold3>
<ModuleMemCriticalThreshold3>90</ModuleMemCriticalThreshold3>
<ModuleMemMajorThreshold3>80</ModuleMemMajorThreshold3>
<ModuleMemMinorThreshold3>70</ModuleMemMinorThreshold3>
<ModuleSwapCriticalThreshold3>90</ModuleSwapCriticalThreshold3>
<ModuleSwapMajorThreshold3>80</ModuleSwapMajorThreshold3>
<ModuleSwapMinorThreshold3>70</ModuleSwapMinorThreshold3>
<ModuleDiskMonitorFileSystem1-3>/</ModuleDiskMonitorFileSystem1-3>
<ModuleType4>mm</ModuleType4>
<ModuleDesc4>Management Module</ModuleDesc4>
<ModuleCount4>0</ModuleCount4>
<ModuleIPAddr1-4>127.0.0.1</ModuleIPAddr1-4>
<ModuleServerName1-4>Unassigned</ModuleServerName1-4>
<ModuleCPUCriticalThreshold4>90</ModuleCPUCriticalThreshold4>
<ModuleCPUMajorThreshold4>80</ModuleCPUMajorThreshold4>
<ModuleCPUMinorThreshold4>70</ModuleCPUMinorThreshold4>
<ModuleCPUMinorClearThreshold4>60</ModuleCPUMinorClearThreshold4>
<ModuleDiskCriticalThreshold4>90</ModuleDiskCriticalThreshold4>
<ModuleDiskMajorThreshold4>80</ModuleDiskMajorThreshold4>
<ModuleDiskMinorThreshold4>70</ModuleDiskMinorThreshold4>
<ModuleMemCriticalThreshold4>90</ModuleMemCriticalThreshold4>
<ModuleMemMajorThreshold4>80</ModuleMemMajorThreshold4>
<ModuleMemMinorThreshold4>70</ModuleMemMinorThreshold4>
<ModuleSwapCriticalThreshold4>90</ModuleSwapCriticalThreshold4>
<ModuleSwapMajorThreshold4>80</ModuleSwapMajorThreshold4>
<ModuleSwapMinorThreshold4>70</ModuleSwapMinorThreshold4>
<ModuleDiskMonitorFileSystem1-4>/</ModuleDiskMonitorFileSystem1-4>
</SystemModuleConfig>
<SessionManager>
<MaxConcurrentTransactions>1000</MaxConcurrentTransactions>
<SharedMemoryTmpFile>/tmp/CalpontShm</SharedMemoryTmpFile>
<TxnIDFile>/tmp/TxnIDFile</TxnIDFile>
</SessionManager>
<VersionBuffer>
<NumVersionBufferFiles>4</NumVersionBufferFiles>
<VersionBufferFileSize>5000000000</VersionBufferFileSize>
<VersionBufferOID0>0</VersionBufferOID0>
<VersionBufferOID1>1</VersionBufferOID1>
<VersionBufferOID2>2</VersionBufferOID2>
<VersionBufferOID3>3</VersionBufferOID3>
</VersionBuffer>
<OIDManager>
<!-- XXXPAT: This is located in tmp so we all have R/W access.
It should be relocated to /usr/local/mariadb/columnstore/share/oidbitmap
on the production machine-->
<OIDBitmapFile>/tmp/oidbitmap</OIDBitmapFile>
<FirstOID>3000</FirstOID>
</OIDManager>
<OracleConnector>
<OnDisconnect>Commit</OnDisconnect> <!-- or Rollback -->
</OracleConnector>
<WriteEngine>
<BulkRoot>/usr/local/mariadb/columnstore/data/bulk</BulkRoot>
</WriteEngine>
<!-- The DBRM configuration entries should look like this.
<DBRM_Master>
<NumSlaves>2</NumSlaves>
<IPAddr>10.100.4.69</IPAddr>
<Port>60310</Port>
</DBRM_Master>
<DBRM_Slave1>
<IPAddr>10.100.4.69</IPAddr>
<Port>60311</Port>
</DBRM_Slave1>
<DBRM_Slave2>
<IPAddr>10.100.4.68</IPAddr>
<Port>60311</Port>
</DBRM_Slave2>
-->
<!-- This is a one-node localhost configuration to use
for testing & integration -->
<DBRM_Master>
<NumSlaves>1</NumSlaves>
<IPAddr>127.0.0.1</IPAddr>
<Port>6231</Port>
</DBRM_Master>
<DBRM_Slave1>
<IPAddr>127.0.0.1</IPAddr>
<Port>6232</Port>
<SaveFiles>/tmp/BRM_SaveFiles</SaveFiles>
</DBRM_Slave1>
</Calpont>