1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00

Merge pull request #607 from mariadb-corporation/MCOL-520

Mcol 520
This commit is contained in:
Patrick LeBlanc
2018-11-07 10:37:10 -06:00
committed by GitHub
163 changed files with 2295 additions and 21026 deletions

View File

@ -52,10 +52,10 @@ def find_paths():
"""Find DBRoot and BulkRoot."""
try:
config_file = os.environ['CALPONT_CONFIG_FILE']
config_file = os.environ['COLUMNSTORE_CONFIG_FILE']
except KeyError:
try:
logger.info("Environment variable CALPONT_CONFIG_FILE not set, looking for system Columnstore.xml")
logger.info("Environment variable COLUMNSTORE_CONFIG_FILE not set, looking for system Columnstore.xml")
config_file = '/usr/local/mariadb/columnstore/etc/Columnstore.xml'
os.lstat(config_file)
except:
@ -185,10 +185,6 @@ def main():
clean up old files, sort the index inserts and generally rock and roll
"""
start_dir = curdir=os.getcwd() # remember where we started
if not os.access('.', os.W_OK):
os.chdir('/tmp')
logger.warn('Changing to /tmp to have permission to write files')
if not os.environ.has_key('LD_LIBRARY_PATH'):
logger.info('No environment variable LD_LIBRARY_PATH')

View File

@ -6,7 +6,7 @@ def find_paths():
"""Find DBRoot and BulkRoot."""
try:
config_file = os.environ['CALPONT_CONFIG_FILE']
config_file = os.environ['COLUMNSTORE_CONFIG_FILE']
except KeyError:
try:
config_file = '/usr/local/mariadb/columnstore/etc/Columnstore.xml'
@ -71,10 +71,6 @@ def main():
"""
Validate indexes..
"""
if not os.access('.', os.W_OK):
os.chdir('/tmp')
print 'Changing to /tmp to have permission to write files'
if len(os.getenv('LD_LIBRARY_PATH'))<5:
print 'Suspicous LD_LIBRARY_PATH: %s'%os.getenv('LD_LIBRARY_PATH')

View File

@ -49,10 +49,10 @@ def find_paths():
"""Find DBRoot and BulkRoot."""
try:
config_file = os.environ['CALPONT_CONFIG_FILE']
config_file = os.environ['COLUMNSTORE_CONFIG_FILE']
except KeyError:
try:
logger.info("Environment variable CALPONT_CONFIG_FILE not set, looking for system Columnstore.xml")
logger.info("Environment variable COLUMNSTORE_CONFIG_FILE not set, looking for system Columnstore.xml")
config_file = '/usr/local/mariadb/columnstore/etc/Columnstore.xml'
os.lstat(config_file)
except:
@ -182,10 +182,6 @@ def main():
clean up old files, sort the index inserts and generally rock and roll
"""
start_dir = curdir=os.getcwd() # remember where we started
if not os.access('.', os.W_OK):
os.chdir('/tmp')
logger.warn('Changing to /tmp to have permission to write files')
if not os.environ.has_key('LD_LIBRARY_PATH'):
logger.info('No environment variable LD_LIBRARY_PATH')