Skip to content

Commit 4946a61

Browse files
amitsadaphulerschlussel
authored andcommitted
Incorporate review comments
- Use ImmutableList instead of Arrays.List - Remove declarations for VerifyException - Minor formatting changes
1 parent 78d46f1 commit 4946a61

File tree

2 files changed

+40
-36
lines changed

2 files changed

+40
-36
lines changed

testing-mysql-server-5/src/main/java/com/facebook/presto/testing/mysql/EmbeddedMySql5.java

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@
1313
*/
1414
package com.facebook.presto.testing.mysql;
1515

16-
import com.google.common.base.VerifyException;
1716
import com.google.common.collect.ImmutableList;
1817

1918
import java.io.IOException;
20-
import java.util.Arrays;
2119
import java.util.List;
2220

2321
final class EmbeddedMySql5
@@ -32,48 +30,54 @@ public EmbeddedMySql5(MySqlOptions mySqlOptions)
3230
@Override
3331
public List<String> getInitializationArguments()
3432
{
35-
List<String> list = Arrays.asList(
36-
"--no-defaults",
37-
"--skip-sync-frm",
38-
"--innodb-flush-method=nosync",
39-
"--datadir=" + getDataDirectory());
33+
ImmutableList.Builder<String> iList = ImmutableList.<String>builder()
34+
.add(
35+
"--no-defaults",
36+
"--skip-sync-frm",
37+
"--innodb-flush-method=nosync",
38+
"--datadir=" + getDataDirectory());
4039

4140
if (isMariadb) {
42-
return ImmutableList.<String>builder().addAll(list).add("--basedir=" + getBaseDirectory()).build();
41+
return iList.add("--basedir=" + getBaseDirectory()).build();
4342
}
4443
else {
45-
return ImmutableList.<String>builder().addAll(list).add("--initialize-insecure").build();
44+
return iList.add("--initialize-insecure").build();
4645
}
4746
}
4847

4948
@Override
50-
public List<String> getStartArguments() throws VerifyException
49+
public List<String> getStartArguments()
5150
{
52-
List<String> list = Arrays.asList(
53-
"--no-defaults",
54-
"--default-time-zone=+00:00",
55-
"--skip-sync-frm",
56-
"--innodb-flush-method=nosync",
57-
"--innodb-flush-log-at-trx-commit=0",
58-
"--innodb-doublewrite=0",
59-
"--bind-address=localhost",
60-
"--port=" + String.valueOf(getPort()),
61-
"--datadir=" + getDataDirectory(),
62-
"--socket=" + getSocketDirectory());
51+
ImmutableList.Builder<String> iList = ImmutableList.<String>builder()
52+
.add(
53+
"--no-defaults",
54+
"--default-time-zone=+00:00",
55+
"--skip-sync-frm",
56+
"--innodb-flush-method=nosync",
57+
"--innodb-flush-log-at-trx-commit=0",
58+
"--innodb-doublewrite=0",
59+
"--bind-address=localhost",
60+
"--port=" + String.valueOf(getPort()),
61+
"--datadir=" + getDataDirectory(),
62+
"--socket=" + getSocketDirectory());
6363

6464
if (isMariadb) {
65-
return ImmutableList.<String>builder().addAll(list).add(
66-
"--basedir=" + getBaseDirectory(),
67-
"--plugin-dir=" + getMariadbPluginDirectory(),
68-
"--log-error=" + getDataDirectory() + "mariadb.log",
69-
"--pid-file=" + getDataDirectory() + "mariadb.pid").build();
65+
return iList
66+
.add(
67+
"--basedir=" + getBaseDirectory(),
68+
"--plugin-dir=" + getMariadbPluginDirectory(),
69+
"--log-error=" + getDataDirectory() + "mariadb.log",
70+
"--pid-file=" + getDataDirectory() + "mariadb.pid")
71+
.build();
7072
}
7173
else {
72-
return ImmutableList.<String>builder().addAll(list).add(
73-
"--skip-ssl",
74-
"--disable-partition-engine-check",
75-
"--explicit_defaults_for_timestamp",
76-
"--lc_messages_dir=" + getShareDirectory()).build();
74+
return iList
75+
.add(
76+
"--skip-ssl",
77+
"--disable-partition-engine-check",
78+
"--explicit_defaults_for_timestamp",
79+
"--lc_messages_dir=" + getShareDirectory())
80+
.build();
7781
}
7882
}
7983
}

testing-mysql-server-base/src/main/java/com/facebook/presto/testing/mysql/AbstractEmbeddedMySql.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public abstract class AbstractEmbeddedMySql
7373
protected final boolean isMariadb = System.getProperty("os.arch").equals("ppc64le");
7474

7575
public AbstractEmbeddedMySql(MySqlOptions mySqlOptions)
76-
throws IOException, VerifyException
76+
throws IOException
7777
{
7878
this.startupWait = requireNonNull(mySqlOptions.getStartupWait(), "startupWait is null");
7979
this.shutdownWait = requireNonNull(mySqlOptions.getShutdownWait(), "shutdownWait is null");
@@ -114,7 +114,7 @@ public Connection getMySqlDatabase()
114114
return DriverManager.getConnection(getJdbcUrl("root", "mysql"));
115115
}
116116

117-
protected String getMariadbInstallDb() throws VerifyException
117+
protected String getMariadbInstallDb()
118118
{
119119
if (!isMariadb) {
120120
throw new VerifyException("mysql_install_db not applicable to non-mariadb installations");
@@ -147,7 +147,7 @@ protected String getSocketDirectory()
147147
return (isMariadb ? getDataDirectory() + "mysql.sock" : serverDirectory.resolve("mysql.sock").toString());
148148
}
149149

150-
protected String getMariadbPluginDirectory() throws VerifyException
150+
protected String getMariadbPluginDirectory()
151151
{
152152
if (!isMariadb) {
153153
throw new VerifyException("--plugin-dir option not applicable to non-mariadb installations");
@@ -206,7 +206,7 @@ private static int randomPort()
206206
}
207207
}
208208

209-
private void initialize() throws VerifyException
209+
private void initialize()
210210
{
211211
if (isMariadb) {
212212
system(ImmutableList.<String>builder()
@@ -223,7 +223,7 @@ private void initialize() throws VerifyException
223223
}
224224

225225
private Process startMysqld()
226-
throws IOException, VerifyException
226+
throws IOException
227227
{
228228
Process process = new ProcessBuilder(ImmutableList.<String>builder().add(getMysqld()).addAll(getStartArguments()).build())
229229
.redirectErrorStream(true)

0 commit comments

Comments
 (0)