Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
bd_bench
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
simcaq
bd_bench
Commits
227eff81
Project 'c3sl/c3docs/c3hpc-user-docs' was moved to 'root/c3hpc/user-docs'. Please update any links and bookmarks that may still have the old path.
Commit
227eff81
authored
11 years ago
by
hannes
Browse files
Options
Downloads
Patches
Plain Diff
fixes in script
parent
b500e0a5
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
ehannes.sh
+7
-6
7 additions, 6 deletions
ehannes.sh
with
7 additions
and
6 deletions
ehannes.sh
+
7
−
6
View file @
227eff81
...
@@ -153,7 +153,7 @@ runQuery() { # runQuery PHASE REP DROPC
...
@@ -153,7 +153,7 @@ runQuery() { # runQuery PHASE REP DROPC
# run query
# run query
eval
"
$TIMEOUTCMD$TIMINGCMD$CLIENTCMD$QFILE
"
>
$QRDIR
/
$DB
-SF
$SF
-coldrun
$coldrun
-
$qn
.out
eval
"
$TIMEOUTCMD$TIMINGCMD$CLIENTCMD$QFILE
"
>
$QRDIR
/
$DB
-SF
$SF
-coldrun
$coldrun
-
$qn
.out
QTIME
=
`
cat
$DIR
/.time
`
QTIME
=
`
cat
$DIR
/.time
`
echo
-e
"
$LOGPREFIX
\t
$1
\t
$qn
\t
$REP
\t
$QTIME
"
>>
$RESFL
echo
-e
"
$LOGPREFIX
\t
$1
\t
$qn
\t
$REP
\t
$QTIME
"
|
tee
-a
$RESFL
if
[
"
$3
"
-gt
0
]
;
then
if
[
"
$3
"
-gt
0
]
;
then
# shutdown db
# shutdown db
...
@@ -281,7 +281,6 @@ do
...
@@ -281,7 +281,6 @@ do
DBVER
=
$PGVER
DBVER
=
$PGVER
fi
fi
# TODO: does postgres run with a missing shared_preload?
if
[
"
$DB
"
==
"citusdata"
]
;
then
if
[
"
$DB
"
==
"citusdata"
]
;
then
# Citusdata installer
# Citusdata installer
if
[
!
-f
$PINS
/lib/cstore_fdw.so
]
;
then
if
[
!
-f
$PINS
/lib/cstore_fdw.so
]
;
then
...
@@ -338,10 +337,12 @@ do
...
@@ -338,10 +337,12 @@ do
echo
"Failed to install MariaDB"
echo
"Failed to install MariaDB"
exit
-1
exit
-1
fi
fi
# http://mysql.rjweb.org/doc.php/memory
DBSOCK
=
$DIR
/.mariadb.socket
DBSOCK
=
$DIR
/.mariadb.socket
SERVERCMD
=
"
$MAINS
/bin/mysqld
\
SERVERCMD
=
"
$MAINS
/bin/mysqld
\
--lower_case_table_names=1
\
--lower_case_table_names=1
\
--innodb_buffer_pool_size=10G
\
--key_buffer_size=10M
\
--basedir=
$MAINS
-P
$PORT
--pid-file=
$DIR
/.mariadb.pid --socket=
$DBSOCK
--datadir="
--basedir=
$MAINS
-P
$PORT
--pid-file=
$DIR
/.mariadb.pid --socket=
$DBSOCK
--datadir="
CLIENTCMD
=
"
$MAINS
/bin/mysql -u root --socket=
$DBSOCK
tpch < "
CLIENTCMD
=
"
$MAINS
/bin/mysql -u root --socket=
$DBSOCK
tpch < "
INITFCMD
=
"
$MAINS
/scripts/mysql_install_db --basedir=
$MAINS
--datadir="
INITFCMD
=
"
$MAINS
/scripts/mysql_install_db --basedir=
$MAINS
--datadir="
...
@@ -376,17 +377,17 @@ do
...
@@ -376,17 +377,17 @@ do
sed
-e
"s|DIR|
$SFDDIR
|"
$SCDIR
/
$DB
.load.sql
>
$DIR
/.
$DB
.load.sql.local
sed
-e
"s|DIR|
$SFDDIR
|"
$SCDIR
/
$DB
.load.sql
>
$DIR
/.
$DB
.load.sql.local
eval
"
$TIMINGCMD$CLIENTCMD$DIR
/.
$DB
.load.sql.local"
>
/dev/null
eval
"
$TIMINGCMD$CLIENTCMD$DIR
/.
$DB
.load.sql.local"
>
/dev/null
LDTIME
=
`
cat
$DIR
/.time
`
LDTIME
=
`
cat
$DIR
/.time
`
echo
-e
"
$LOGPREFIX
\t
load
\t\t\t
$LDTIME
"
>>
$RESFL
echo
-e
"
$LOGPREFIX
\t
load
\t\t\t
$LDTIME
"
|
tee
-a
$RESFL
# constraints
# constraints
eval
"
$TIMINGCMD$CLIENTCMD$SCDIR
/
$DB
.constraints.sql"
>
/dev/null
eval
"
$TIMINGCMD$CLIENTCMD$SCDIR
/
$DB
.constraints.sql"
>
/dev/null
CTTIME
=
`
cat
$DIR
/.time
`
CTTIME
=
`
cat
$DIR
/.time
`
echo
-e
"
$LOGPREFIX
\t
constraints
\t\t\t
$CTTIME
"
>>
$RESFL
echo
-e
"
$LOGPREFIX
\t
constraints
\t\t\t
$CTTIME
"
|
tee
-a
$RESFL
# analyze/vacuum
# analyze/vacuum
eval
"
$TIMINGCMD$CLIENTCMD$SCDIR
/
$DB
.analyze.sql"
>
/dev/null
eval
"
$TIMINGCMD$CLIENTCMD$SCDIR
/
$DB
.analyze.sql"
>
/dev/null
AZTIME
=
`
cat
$DIR
/.time
`
AZTIME
=
`
cat
$DIR
/.time
`
echo
-e
"
$LOGPREFIX
\t
analyze
\t\t\t
$AZTIME
"
>>
$RESFL
echo
-e
"
$LOGPREFIX
\t
analyze
\t\t\t
$AZTIME
"
|
tee
-a
$RESFL
shutdown
shutdown
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment