Skip to content

Commit c8ec37e

Browse files
authored
Merge pull request #334 from databendlabs/feat/add-code-quality
feat: add code quality check ci
2 parents 27f62ee + aeae2dd commit c8ec37e

File tree

13 files changed

+100
-44
lines changed

13 files changed

+100
-44
lines changed

.github/workflows/code-quality.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Code Quality Check
2+
3+
on:
4+
pull_request:
5+
branches: [ main, master ]
6+
push:
7+
branches: [ main, master ]
8+
9+
jobs:
10+
checkstyle:
11+
name: Run Checkstyle
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- name: Set up JDK 11
18+
uses: actions/setup-java@v4
19+
with:
20+
java-version: '11'
21+
distribution: 'temurin'
22+
cache: 'maven'
23+
24+
- name: Run Checkstyle
25+
run: |
26+
mvn checkstyle:checkstyle
27+
mvn checkstyle:check
28+
29+
- name: Report Checkstyle results
30+
uses: jwgmeligmeyling/checkstyle-github-action@master
31+
if: always()
32+
with:
33+
path: '**/checkstyle-result.xml'
34+
35+
- name: Upload Checkstyle results
36+
uses: actions/upload-artifact@v4
37+
if: always()
38+
with:
39+
name: checkstyle-results
40+
path: target/site/checkstyle.html
41+
retention-days: 7

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Checkstyle
2+
target/checkstyle-*
3+
.checkstyle
14
.idea/
25
databend-jdbc/databend-jdbc-debug.log
36
target/

config/checkstyle/checkstyle.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE module PUBLIC
3+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
5+
6+
<module name="Checker">
7+
<property name="charset" value="UTF-8"/>
8+
<property name="severity" value="error"/>
9+
10+
<module name="TreeWalker">
11+
<module name="Regexp">
12+
<property name="format" value="System\.(out|err)\.print(ln)?"/>
13+
<property name="message" value="Use logging framework instead of System.out.println"/>
14+
<property name="illegalPattern" value="true"/>
15+
</module>
16+
17+
<!-- 其他规则 -->
18+
<module name="UnusedImports"/>
19+
<module name="RedundantImport"/>
20+
<module name="IllegalImport"/>
21+
</module>
22+
</module>

databend-client/src/main/java/com/databend/client/DatabendClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.databend.client;
1616

17-
import com.github.zafarkhaja.semver.Version;
1817
import okhttp3.Request;
1918

2019
import java.io.Closeable;

databend-client/src/main/java/com/databend/client/DiscoveryNode.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.fasterxml.jackson.annotation.JsonCreator;
1818
import com.fasterxml.jackson.annotation.JsonProperty;
1919

20-
import java.net.URI;
2120

2221
import static com.google.common.base.MoreObjects.toStringHelper;
2322

databend-client/src/test/java/com/databend/client/TestClientIT.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public void testBasicQueryPagination() {
4242
ClientSettings settings = new ClientSettings(DATABEND_HOST);
4343
AtomicReference<String> lastNodeID = new AtomicReference<>();
4444
DatabendClient cli = new DatabendClientV1(client, "select 1", settings, null, lastNodeID);
45-
System.out.println(cli.getResults().getData());
4645
Assert.assertEquals(cli.getQuery(), "select 1");
4746
Assert.assertEquals(cli.getSession().getDatabase(), DATABASE);
4847
Assert.assertNotNull(cli.getResults());
@@ -66,7 +65,6 @@ public void testConnectionRefused() {
6665
cli.getResults(); // This should trigger the connection attempt
6766
Assert.fail("Expected exception was not thrown");
6867
} catch (Exception e) {
69-
System.out.println(e.getMessage());
7068
Assert.assertTrue(
7169
e instanceof ConnectException || e.getCause() instanceof ConnectException, "Exception should be ConnectionException or contain ConnectionException as cause");
7270

@@ -96,8 +94,6 @@ public void testBasicQueryIDHeader() {
9694
cli.advance();
9795
Assert.assertEquals(cli1.getAdditionalHeaders().get(X_Databend_Query_ID), expectedUUID1);
9896
}
99-
System.out.println(cli1.getResults().getData());
100-
System.out.println(cli1.getAdditionalHeaders());
10197
Assert.assertEquals(cli1.getAdditionalHeaders().get(X_Databend_Query_ID), expectedUUID1);
10298
}
10399

@@ -111,9 +107,6 @@ public void testDiscoverNodes() {
111107
ClientSettings settings = new ClientSettings(DATABEND_HOST, DatabendSession.createDefault(), DEFAULT_QUERY_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_SOCKET_TIMEOUT, PaginationOptions.defaultPaginationOptions(), additionalHeaders, null, DEFAULT_RETRY_ATTEMPTS);
112108
List<DiscoveryNode> nodes = DatabendClientV1.discoverNodes(client, settings);
113109
Assert.assertFalse(nodes.isEmpty());
114-
for (DiscoveryNode node : nodes) {
115-
System.out.println(node.getAddress());
116-
}
117110
}
118111

119112
@Test(groups = {"it"})
@@ -129,7 +122,6 @@ public void testDiscoverNodesUnSupported() {
129122
DatabendClientV1.discoverNodes(client, settings);
130123
Assert.fail("Expected exception was not thrown");
131124
} catch (Exception e) {
132-
System.out.println(e.getMessage());
133125
Assert.assertTrue(e instanceof UnsupportedOperationException, "Exception should be UnsupportedOperationException");
134126
}
135127
}

databend-client/src/test/java/com/databend/client/TestDiscoveryNodes.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.databend.client.errors.QueryErrors;
44
import com.fasterxml.jackson.core.JsonProcessingException;
5-
import io.airlift.json.JsonCodecFactory;
65
import org.testng.Assert;
76
import org.testng.annotations.Test;
87

databend-jdbc/src/main/java/com/databend/jdbc/DatabendConnection.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,6 @@ public void PingDatabendClientV1() throws SQLException {
681681
statement.execute("select 1");
682682
ResultSet r = statement.getResultSet();
683683
while (r.next()) {
684-
//System.out.println(r.getInt(1));
685684
}
686685
} catch (SQLException e) {
687686
throw new DatabendFailedToPingException(String.format("failed to ping databend server: %s", e.getMessage()));
@@ -952,7 +951,7 @@ public void uploadStream(String stageName, String destPrefix, InputStream inputS
952951
}
953952
}
954953
} catch (RuntimeException e) {
955-
System.out.println(e.getMessage());
954+
logger.warning("failed to upload input stream, file size is:" + fileSize / 1024.0 + e.getMessage());
956955
throw new SQLException(e);
957956
} catch (IOException e) {
958957
logger.warning("failed to upload input stream, file size is:" + fileSize / 1024.0 + e.getMessage());
@@ -982,7 +981,6 @@ public void copyIntoTable(String database, String tableName, DatabendCopyParams
982981
requireNonNull(p.getDatabaseTableName(), "tableName is null");
983982
requireNonNull(p.getDatabendStage(), "stage is null");
984983
String sql = getCopyIntoSql(database, p);
985-
System.out.println(sql);
986984
Statement statement = this.createStatement();
987985
statement.execute(sql);
988986
ResultSet rs = statement.getResultSet();
@@ -1037,7 +1035,6 @@ String generalRequest(String path, String body) throws SQLException {
10371035
}
10381036
return response.body().string();
10391037
} catch (IOException e) {
1040-
System.out.println("e = " + e.getMessage());
10411038
if (e.getCause() instanceof ConnectException) {
10421039
if (failReason == null) {
10431040
failReason = e.getMessage();

databend-jdbc/src/main/java/com/databend/jdbc/DatabendStatement.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.databend.jdbc;
22

33
import com.databend.client.DatabendClient;
4-
import com.databend.client.DatabendSession;
54
import com.databend.client.QueryResults;
65
import com.databend.client.StageAttachment;
76
import com.databend.jdbc.annotation.NotImplemented;
@@ -216,8 +215,6 @@ final boolean internalExecute(String sql, StageAttachment attachment) throws SQL
216215
currentUpdateCount = results.getStats().getWriteProgress().getRows().intValue();
217216
}
218217
} else {
219-
// System.out.println("sql is : " + sql);
220-
// System.out.println("[DEBUG] Query Write Progress: " + results.getStats().getWriteProgress());
221218
currentUpdateCount = results.getStats().getWriteProgress().getRows().intValue();
222219
}
223220
}

databend-jdbc/src/main/java/com/databend/jdbc/PresignContext.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.databend.jdbc;
22

3-
import com.databend.client.errors.QueryErrors;
43
import com.fasterxml.jackson.core.JsonProcessingException;
54
import com.fasterxml.jackson.databind.ObjectMapper;
65
import okhttp3.Headers;

0 commit comments

Comments
 (0)