Skip to content

Commit 4930df9

Browse files
authored
Merge pull request cms-sw#34074 from ggovi/condcore-conddb-tools-improvements-12-120X
Improvements/Fixes for Condition DB tools
2 parents e87276d + 0c2d63a commit 4930df9

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

CondCore/Utilities/python/conddblib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def __init__(self, url):
337337
self.engine.execute('pragma foreign_keys = on')
338338

339339
else:
340-
self.engine = sqlalchemy.create_engine(url)
340+
self.engine = sqlalchemy.create_engine(url, max_identifier_length=30)
341341

342342
self._session = sqlalchemy.orm.scoped_session(sqlalchemy.orm.sessionmaker(bind=self.engine))
343343

CondCore/Utilities/python/o2olib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def getSession( self, db_service, role, authPath ):
127127
url = sqlalchemy_tpl %(username,pwd,db_service)
128128
session = None
129129
try:
130-
self.eng = sqlalchemy.create_engine( url )
130+
self.eng = sqlalchemy.create_engine( url, max_identifier_length=30)
131131
session = sqlalchemy.orm.scoped_session( sqlalchemy.orm.sessionmaker(bind=self.eng))
132132
except sqlalchemy.exc.SQLAlchemyError as dberror:
133133
self.logger.error( str(dberror) )

CondCore/Utilities/scripts/conddb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,6 +1355,11 @@ def listRuns_(args):
13551355
logging.info('Found %s Run entries.'%len(table))
13561356
for i in range(len(table)):
13571357
table[i] = table[i] + ( (calendar.timegm( table[i][1].utctimetuple() ) << 32), (calendar.timegm( table[i][2].utctimetuple() ) << 32) )
1358+
# check if last run is ongoing
1359+
last_start = table[len(table)-1][1]
1360+
last_end = table[len(table)-1][2]
1361+
if last_start==last_end:
1362+
table[len(table)-1]=(table[len(table)-1][0],table[len(table)-1][1],'on going...',table[len(table)-1][3],'-')
13581363
output_table(args, table, ['Run_number','Start_time','End_time','Start_IOV','End_IOV'],
13591364
)
13601365
return 0

0 commit comments

Comments
 (0)