You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2015/12/23 00:02:24 UTC
[2/2] calcite git commit: [CALCITE-1034] Use a custom checker for
code style rules that Checkstyle cannot express
[CALCITE-1034] Use a custom checker for code style rules that Checkstyle cannot express
Fix code style to match rules.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/c8709f38
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/c8709f38
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/c8709f38
Branch: refs/heads/master
Commit: c8709f3874740f198b7423d1acc7d31b423725a3
Parents: 60b2825
Author: Julian Hyde <jh...@apache.org>
Authored: Mon Dec 21 23:36:41 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Dec 22 14:04:36 2015 -0800
----------------------------------------------------------------------
.../calcite/avatica/remote/RemoteMetaTest.java | 36 ++++++++++--------
.../apache/calcite/avatica/remote/Service.java | 40 +++++++-------------
.../org/apache/calcite/materialize/Lattice.java | 3 +-
.../calcite/plan/volcano/VolcanoPlanner.java | 3 +-
.../java/org/apache/calcite/test/JdbcTest.java | 3 +-
.../java/org/apache/calcite/util/TestUtil.java | 12 ++++--
.../org/apache/calcite/test/MongoAdapterIT.java | 6 ++-
pom.xml | 7 ++++
.../splunk/search/SplunkConnectionImpl.java | 8 ++--
src/main/config/checkstyle/checker.xml | 2 +
10 files changed, 64 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/c8709f38/avatica-server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java
----------------------------------------------------------------------
diff --git a/avatica-server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java b/avatica-server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java
index bb57692..49a88e7 100644
--- a/avatica-server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java
+++ b/avatica-server/src/test/java/org/apache/calcite/avatica/remote/RemoteMetaTest.java
@@ -513,24 +513,28 @@ public class RemoteMetaTest {
try (final Connection conn = DriverManager.getConnection(url);
final Statement stmt = conn.createStatement()) {
assertFalse(stmt.execute("DROP TABLE IF EXISTS " + productTable));
- assertFalse(stmt.execute(
- String.format("CREATE TABLE %s(id integer, stock integer)", productTable)));
+ assertFalse(
+ stmt.execute(
+ String.format("CREATE TABLE %s(id integer, stock integer)", productTable)));
assertFalse(stmt.execute("DROP TABLE IF EXISTS " + salesTable));
- assertFalse(stmt.execute(
- String.format("CREATE TABLE %s(id integer, units_sold integer)", salesTable)));
+ assertFalse(
+ stmt.execute(
+ String.format("CREATE TABLE %s(id integer, units_sold integer)", salesTable)));
final int productId = 1;
// No products and no sales
- assertFalse(stmt.execute(
- String.format("INSERT INTO %s VALUES(%d, 0)", productTable, productId)));
- assertFalse(stmt.execute(
- String.format("INSERT INTO %s VALUES(%d, 0)", salesTable, productId)));
+ assertFalse(
+ stmt.execute(
+ String.format("INSERT INTO %s VALUES(%d, 0)", productTable, productId)));
+ assertFalse(
+ stmt.execute(
+ String.format("INSERT INTO %s VALUES(%d, 0)", salesTable, productId)));
conn.setAutoCommit(false);
- PreparedStatement productStmt = conn.prepareStatement(String.format(
- "UPDATE %s SET stock = stock + ? WHERE id = ?", productTable));
- PreparedStatement salesStmt = conn.prepareStatement(String.format(
- "UPDATE %s SET units_sold = units_sold + ? WHERE id = ?", salesTable));
+ PreparedStatement productStmt = conn.prepareStatement(
+ String.format("UPDATE %s SET stock = stock + ? WHERE id = ?", productTable));
+ PreparedStatement salesStmt = conn.prepareStatement(
+ String.format("UPDATE %s SET units_sold = units_sold + ? WHERE id = ?", salesTable));
// No stock
assertEquals(0, getInventory(conn, productTable, productId));
@@ -577,8 +581,8 @@ public class RemoteMetaTest {
private int getInventory(Connection conn, String productTable, int productId) throws Exception {
try (Statement stmt = conn.createStatement()) {
- ResultSet results = stmt.executeQuery(String.format(
- "SELECT stock FROM %s WHERE id = %d", productTable, productId));
+ ResultSet results = stmt.executeQuery(
+ String.format("SELECT stock FROM %s WHERE id = %d", productTable, productId));
assertTrue(results.next());
return results.getInt(1);
}
@@ -586,8 +590,8 @@ public class RemoteMetaTest {
private int getSales(Connection conn, String salesTable, int productId) throws Exception {
try (Statement stmt = conn.createStatement()) {
- ResultSet results = stmt.executeQuery(String.format(
- "SELECT units_sold FROM %s WHERE id = %d", salesTable, productId));
+ ResultSet results = stmt.executeQuery(
+ String.format("SELECT units_sold FROM %s WHERE id = %d", salesTable, productId));
assertTrue(results.next());
return results.getInt(1);
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/c8709f38/avatica/src/main/java/org/apache/calcite/avatica/remote/Service.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/remote/Service.java b/avatica/src/main/java/org/apache/calcite/avatica/remote/Service.java
index c6888f4..688a670 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/remote/Service.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/remote/Service.java
@@ -3095,13 +3095,11 @@ public interface Service {
this.connectionId = connectionId;
}
- @Override
- CommitResponse accept(Service service) {
+ @Override CommitResponse accept(Service service) {
return service.apply(this);
}
- @Override
- CommitRequest deserialize(Message genericMsg) {
+ @Override CommitRequest deserialize(Message genericMsg) {
final Requests.CommitRequest msg = ProtobufService.castProtobufMessage(genericMsg,
Requests.CommitRequest.class);
final Descriptor desc = msg.getDescriptorForType();
@@ -3114,8 +3112,7 @@ public interface Service {
return new CommitRequest(connectionId);
}
- @Override
- Requests.CommitRequest serialize() {
+ @Override Requests.CommitRequest serialize() {
Requests.CommitRequest.Builder builder = Requests.CommitRequest.newBuilder();
if (null != connectionId) {
@@ -3125,16 +3122,14 @@ public interface Service {
return builder.build();
}
- @Override
- public int hashCode() {
+ @Override public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((connectionId == null) ? 0 : connectionId.hashCode());
return result;
}
- @Override
- public boolean equals(Object obj) {
+ @Override public boolean equals(Object obj) {
return this == obj || (obj instanceof CommitRequest
&& Objects.equals(connectionId, ((CommitRequest) obj).connectionId));
}
@@ -3148,27 +3143,23 @@ public interface Service {
CommitResponse() {}
- @Override
- CommitResponse deserialize(Message genericMsg) {
+ @Override CommitResponse deserialize(Message genericMsg) {
// Checks the type of genericMsg
ProtobufService.castProtobufMessage(genericMsg, Responses.CommitResponse.class);
return new CommitResponse();
}
- @Override
- Responses.CommitResponse serialize() {
+ @Override Responses.CommitResponse serialize() {
return Responses.CommitResponse.newBuilder().build();
}
- @Override
- public int hashCode() {
+ @Override public int hashCode() {
return 0;
}
- @Override
- public boolean equals(Object obj) {
+ @Override public boolean equals(Object obj) {
return this == obj || obj instanceof CommitResponse;
}
}
@@ -3216,16 +3207,14 @@ public interface Service {
}
- @Override
- public int hashCode() {
+ @Override public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((connectionId == null) ? 0 : connectionId.hashCode());
return result;
}
- @Override
- public boolean equals(Object obj) {
+ @Override public boolean equals(Object obj) {
return this == obj || (obj instanceof RollbackRequest
&& Objects.equals(connectionId, ((RollbackRequest) obj).connectionId));
}
@@ -3248,14 +3237,11 @@ public interface Service {
return Responses.RollbackResponse.newBuilder().build();
}
-
- @Override
- public int hashCode() {
+ @Override public int hashCode() {
return 0;
}
- @Override
- public boolean equals(Object obj) {
+ @Override public boolean equals(Object obj) {
return this == obj || obj instanceof RollbackResponse;
}
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/c8709f38/core/src/main/java/org/apache/calcite/materialize/Lattice.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/materialize/Lattice.java b/core/src/main/java/org/apache/calcite/materialize/Lattice.java
index cc11625..62ab07f 100644
--- a/core/src/main/java/org/apache/calcite/materialize/Lattice.java
+++ b/core/src/main/java/org/apache/calcite/materialize/Lattice.java
@@ -327,7 +327,8 @@ public class Lattice {
}
}
if (CalcitePrepareImpl.DEBUG) {
- System.out.println("Lattice SQL:\n" + buf);
+ System.out.println("Lattice SQL:\n"
+ + buf);
}
buf.append(groupBuf);
return buf.toString();
http://git-wip-us.apache.org/repos/asf/calcite/blob/c8709f38/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java
index c87115f..1389a36 100644
--- a/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java
+++ b/core/src/main/java/org/apache/calcite/plan/volcano/VolcanoPlanner.java
@@ -502,7 +502,8 @@ public class VolcanoPlanner extends AbstractRelOptPlanner {
RelNode rel2 = lattice.rewrite(leafJoinRoot.get());
if (rel2 != null) {
if (CalcitePrepareImpl.DEBUG) {
- System.out.println("use lattice:\n" + RelOptUtil.toString(rel2));
+ System.out.println("use lattice:\n"
+ + RelOptUtil.toString(rel2));
}
latticeUses.add(Pair.of(lattice, rel2));
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/c8709f38/core/src/test/java/org/apache/calcite/test/JdbcTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/JdbcTest.java b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
index d5ac9ba..3ee40e8 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
@@ -4806,7 +4806,8 @@ public class JdbcTest {
new Quidem(bufferedReader, writer, env, connectionFactory).execute();
final String diff = DiffTestCase.diff(inFile, outFile);
if (!diff.isEmpty()) {
- fail("Files differ: " + outFile + " " + inFile + "\n" + diff);
+ fail("Files differ: " + outFile + " " + inFile + "\n"
+ + diff);
}
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/c8709f38/core/src/test/java/org/apache/calcite/util/TestUtil.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/util/TestUtil.java b/core/src/test/java/org/apache/calcite/util/TestUtil.java
index 769bf75..b8da09a 100644
--- a/core/src/test/java/org/apache/calcite/util/TestUtil.java
+++ b/core/src/test/java/org/apache/calcite/util/TestUtil.java
@@ -43,7 +43,8 @@ public abstract class TestUtil {
if (expected == null) {
return;
} else {
- String message = "Expected:\n" + expected
+ String message = "Expected:\n"
+ + expected
+ "\nActual: null";
throw new ComparisonFailure(message, expected, null);
}
@@ -54,9 +55,12 @@ public abstract class TestUtil {
String s = toJavaString(actual);
String message =
- "Expected:\n" + expected
- + "\nActual:\n " + actual
- + "\nActual java:\n" + s + '\n';
+ "Expected:\n"
+ + expected
+ + "\nActual:\n"
+ + actual
+ + "\nActual java:\n"
+ + s + '\n';
throw new ComparisonFailure(message, expected, actual);
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/c8709f38/mongodb/src/test/java/org/apache/calcite/test/MongoAdapterIT.java
----------------------------------------------------------------------
diff --git a/mongodb/src/test/java/org/apache/calcite/test/MongoAdapterIT.java b/mongodb/src/test/java/org/apache/calcite/test/MongoAdapterIT.java
index 09a373d..81628c5 100644
--- a/mongodb/src/test/java/org/apache/calcite/test/MongoAdapterIT.java
+++ b/mongodb/src/test/java/org/apache/calcite/test/MongoAdapterIT.java
@@ -743,12 +743,14 @@ public class MongoAdapterIT {
CalciteAssert.that()
.enable(enabled())
.with(ZIPS)
- .query("select count(*) as c from zips\n" + q)
+ .query("select count(*) as c from zips\n"
+ + q)
.returns("C=" + expected + "\n");
CalciteAssert.that()
.enable(enabled())
.with(ZIPS)
- .query("select * from zips\n" + q)
+ .query("select * from zips\n"
+ + q)
.returnsCount(expected);
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/c8709f38/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7c38c62..9ac5596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -396,6 +396,13 @@ limitations under the License.
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>net.hydromatic</groupId>
+ <artifactId>toolbox</artifactId>
+ <version>0.2</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<!-- override default version 2.8 for access to additional config settings -->
http://git-wip-us.apache.org/repos/asf/calcite/blob/c8709f38/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/SplunkConnectionImpl.java
----------------------------------------------------------------------
diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/SplunkConnectionImpl.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/SplunkConnectionImpl.java
index 7dac41b..69affa1 100644
--- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/SplunkConnectionImpl.java
+++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/search/SplunkConnectionImpl.java
@@ -381,8 +381,8 @@ public class SplunkConnectionImpl implements SplunkConnection {
} catch (IOException ignore) {
StringWriter sw = new StringWriter();
ignore.printStackTrace(new PrintWriter(sw));
- LOGGER.warning(
- ignore.getMessage() + "\n" + sw);
+ LOGGER.warning(ignore.getMessage() + "\n"
+ + sw);
}
}
@@ -423,8 +423,8 @@ public class SplunkConnectionImpl implements SplunkConnection {
} catch (IOException ignore) {
StringWriter sw = new StringWriter();
ignore.printStackTrace(new PrintWriter(sw));
- LOGGER.warning(
- ignore.getMessage() + "\n" + sw);
+ LOGGER.warning(ignore.getMessage() + "\n"
+ + sw);
}
return false;
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/c8709f38/src/main/config/checkstyle/checker.xml
----------------------------------------------------------------------
diff --git a/src/main/config/checkstyle/checker.xml b/src/main/config/checkstyle/checker.xml
index 32c98eb..167511b 100644
--- a/src/main/config/checkstyle/checker.xml
+++ b/src/main/config/checkstyle/checker.xml
@@ -274,4 +274,6 @@ limitations under the License.
<property name="commentFormat" value="CHECKSTYLE: +IGNORE (\d+)"/>
<property name="influenceFormat" value="$1"/>
</module>
+
+ <module name="net.hydromatic.toolbox.checkstyle.HydromaticFileSetCheck"/>
</module>