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/11 20:38:51 UTC
calcite git commit: Formatting; remove tabs
Repository: calcite
Updated Branches:
refs/heads/master 963ba1b1b -> 83fedf32f
Formatting; remove tabs
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/83fedf32
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/83fedf32
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/83fedf32
Branch: refs/heads/master
Commit: 83fedf32ff1017a157e983bd94faff3d2a4dc482
Parents: 963ba1b
Author: Julian Hyde <jh...@apache.org>
Authored: Thu Dec 10 12:18:07 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Thu Dec 10 12:18:07 2015 -0800
----------------------------------------------------------------------
.../calcite/avatica/server/AvaticaHandler.java | 2 +
.../avatica/server/AvaticaJsonHandler.java | 5 +-
.../avatica/server/AvaticaProtobufHandler.java | 3 +-
.../server/DelegatingAvaticaHandler.java | 51 ++++++++------------
.../calcite/avatica/remote/AbstractHandler.java | 3 +-
.../calcite/avatica/remote/AbstractService.java | 3 +-
.../apache/calcite/avatica/remote/Service.java | 12 ++---
.../org/apache/calcite/avatica/util/Base64.java | 14 +++---
.../remote/ProtobufTranslationImplTest.java | 12 ++---
.../calcite/avatica/test/JsonHandlerTest.java | 3 +-
.../calcite/rel/rel2sql/SqlImplementor.java | 6 ++-
src/main/config/checkstyle/checker.xml | 8 +--
12 files changed, 53 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaHandler.java
----------------------------------------------------------------------
diff --git a/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaHandler.java b/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaHandler.java
index d5501b9..42b13c9 100644
--- a/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaHandler.java
+++ b/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaHandler.java
@@ -28,3 +28,5 @@ public interface AvaticaHandler extends Handler {
void setServerRpcMetadata(RpcMetadataResponse metadata);
}
+
+// End AvaticaHandler.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaJsonHandler.java
----------------------------------------------------------------------
diff --git a/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaJsonHandler.java b/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaJsonHandler.java
index 106d53d..51ffba6 100644
--- a/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaJsonHandler.java
+++ b/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaJsonHandler.java
@@ -81,8 +81,7 @@ public class AvaticaJsonHandler extends AbstractHandler implements AvaticaHandle
}
}
- @Override
- public void setServerRpcMetadata(RpcMetadataResponse metadata) {
+ @Override public void setServerRpcMetadata(RpcMetadataResponse metadata) {
// Set the metadata for the normal service calls
service.setRpcMetadata(metadata);
// Also add it to the handler to include with exceptions
@@ -90,4 +89,4 @@ public class AvaticaJsonHandler extends AbstractHandler implements AvaticaHandle
}
}
-// End AvaticaHandler.java
+// End AvaticaJsonHandler.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaProtobufHandler.java
----------------------------------------------------------------------
diff --git a/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaProtobufHandler.java b/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaProtobufHandler.java
index bd4a8c9..dcaf05e 100644
--- a/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaProtobufHandler.java
+++ b/avatica-server/src/main/java/org/apache/calcite/avatica/server/AvaticaProtobufHandler.java
@@ -73,8 +73,7 @@ public class AvaticaProtobufHandler extends AbstractHandler implements AvaticaHa
}
}
- @Override
- public void setServerRpcMetadata(RpcMetadataResponse metadata) {
+ @Override public void setServerRpcMetadata(RpcMetadataResponse metadata) {
// Set the metadata for the normal service calls
service.setRpcMetadata(metadata);
// Also add it to the handler to include with exceptions
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/avatica-server/src/main/java/org/apache/calcite/avatica/server/DelegatingAvaticaHandler.java
----------------------------------------------------------------------
diff --git a/avatica-server/src/main/java/org/apache/calcite/avatica/server/DelegatingAvaticaHandler.java b/avatica-server/src/main/java/org/apache/calcite/avatica/server/DelegatingAvaticaHandler.java
index 4b2457c..b45c3e7 100644
--- a/avatica-server/src/main/java/org/apache/calcite/avatica/server/DelegatingAvaticaHandler.java
+++ b/avatica-server/src/main/java/org/apache/calcite/avatica/server/DelegatingAvaticaHandler.java
@@ -33,9 +33,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
- * An AvaticaHandler implementation which delegates to a provided Jetty Handler instance.
+ * An AvaticaHandler implementation that delegates to a provided Jetty Handler instance.
*
- * This implementation provides a no-op implementation for
+ * <p>This implementation provides a no-op implementation for
* {@link #setServerRpcMetadata(RpcMetadataResponse)}.
*/
public class DelegatingAvaticaHandler implements AvaticaHandler {
@@ -47,80 +47,67 @@ public class DelegatingAvaticaHandler implements AvaticaHandler {
this.handler = Objects.requireNonNull(handler);
}
- @Override
- public void handle(String target, Request baseRequest, HttpServletRequest request,
+ @Override public void handle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException {
handler.handle(target, baseRequest, request, response);
}
- @Override
- public void setServer(Server server) {
+ @Override public void setServer(Server server) {
handler.setServer(server);
}
- @Override
- public Server getServer() {
+ @Override public Server getServer() {
return handler.getServer();
}
- @Override
- public void destroy() {
+ @Override public void destroy() {
handler.destroy();
}
- @Override
- public void start() throws Exception {
+ @Override public void start() throws Exception {
handler.start();
}
- @Override
- public void stop() throws Exception {
+ @Override public void stop() throws Exception {
handler.stop();
}
- @Override
- public boolean isRunning() {
+ @Override public boolean isRunning() {
return handler.isRunning();
}
- @Override
- public boolean isStarted() {
+ @Override public boolean isStarted() {
return handler.isStarted();
}
- @Override
- public boolean isStarting() {
+ @Override public boolean isStarting() {
return handler.isStarting();
}
- @Override
- public boolean isStopping() {
+ @Override public boolean isStopping() {
return handler.isStopping();
}
- @Override
- public boolean isStopped() {
+ @Override public boolean isStopped() {
return handler.isStopped();
}
- @Override
- public boolean isFailed() {
+ @Override public boolean isFailed() {
return handler.isFailed();
}
- @Override
- public void addLifeCycleListener(Listener listener) {
+ @Override public void addLifeCycleListener(Listener listener) {
handler.addLifeCycleListener(listener);
}
- @Override
- public void removeLifeCycleListener(Listener listener) {
+ @Override public void removeLifeCycleListener(Listener listener) {
handler.removeLifeCycleListener(listener);
}
- @Override
- public void setServerRpcMetadata(RpcMetadataResponse metadata) {
+ @Override public void setServerRpcMetadata(RpcMetadataResponse metadata) {
LOG.warn("Setting RpcMetadata is not implemented for DelegatingAvaticaHandler");
}
}
+
+// End DelegatingAvaticaHandler.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/avatica/src/main/java/org/apache/calcite/avatica/remote/AbstractHandler.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/remote/AbstractHandler.java b/avatica/src/main/java/org/apache/calcite/avatica/remote/AbstractHandler.java
index 9565598..1968fcd 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/remote/AbstractHandler.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/remote/AbstractHandler.java
@@ -146,8 +146,7 @@ public abstract class AbstractHandler<T> implements Handler<T> {
return sb.toString();
}
- @Override
- public void setRpcMetadata(RpcMetadataResponse metadata) {
+ @Override public void setRpcMetadata(RpcMetadataResponse metadata) {
this.metadata = metadata;
}
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/avatica/src/main/java/org/apache/calcite/avatica/remote/AbstractService.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/remote/AbstractService.java b/avatica/src/main/java/org/apache/calcite/avatica/remote/AbstractService.java
index ecb4adb..ffaa360 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/remote/AbstractService.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/remote/AbstractService.java
@@ -150,8 +150,7 @@ public abstract class AbstractService implements Service {
return new ExecuteResponse(results, r.missingStatement, rpcMetadata);
}
- @Override
- public void setRpcMetadata(RpcMetadataResponse metadata) {
+ @Override public void setRpcMetadata(RpcMetadataResponse metadata) {
// OK if this is null
this.rpcMetadata = metadata;
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/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 d7b450c..89ed01e 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
@@ -3131,8 +3131,7 @@ public interface Service {
this.serverAddress = serverAddress;
}
- @Override
- RpcMetadataResponse deserialize(Message genericMsg) {
+ @Override RpcMetadataResponse deserialize(Message genericMsg) {
if (!(genericMsg instanceof Responses.RpcMetadata)) {
throw new IllegalArgumentException("Expected RpcMetadata, but got "
+ genericMsg.getClass().getName());
@@ -3141,8 +3140,7 @@ public interface Service {
return fromProto((Responses.RpcMetadata) genericMsg);
}
- @Override
- Responses.RpcMetadata serialize() {
+ @Override Responses.RpcMetadata serialize() {
return Responses.RpcMetadata.newBuilder().setServerAddress(serverAddress).build();
}
@@ -3157,16 +3155,14 @@ public interface Service {
return new RpcMetadataResponse(serverAddress);
}
- @Override
- public int hashCode() {
+ @Override public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((serverAddress == null) ? 0 : serverAddress.hashCode());
return result;
}
- @Override
- public boolean equals(Object obj) {
+ @Override public boolean equals(Object obj) {
return this == obj || (obj instanceof RpcMetadataResponse
&& Objects.equals(serverAddress, ((RpcMetadataResponse) obj).serverAddress));
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/avatica/src/main/java/org/apache/calcite/avatica/util/Base64.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/util/Base64.java b/avatica/src/main/java/org/apache/calcite/avatica/util/Base64.java
index 1811b48..f6af109 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/util/Base64.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/util/Base64.java
@@ -231,8 +231,8 @@ public class Base64
private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
-
-
+
+
/* ******** S T A N D A R D B A S E 6 4 A L P H A B E T ******** */
/** The 64 valid Base64 values. */
@@ -288,8 +288,8 @@ public class Base64
-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 231 - 243
-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255
};
-
-
+
+
/* ******** U R L S A F E B A S E 6 4 A L P H A B E T ******** */
/**
@@ -416,7 +416,7 @@ public class Base64
-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255
};
-
+
/* ******** D E T E R M I N E W H I C H A L H A B E T ******** */
@@ -435,7 +435,7 @@ public class Base64
} else {
return _STANDARD_ALPHABET;
}
- } // end getAlphabet
+ } // end getAlphabet
/**
@@ -453,7 +453,7 @@ public class Base64
} else {
return _STANDARD_DECODABET;
}
- } // end getAlphabet
+ } // end getAlphabet
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/avatica/src/test/java/org/apache/calcite/avatica/remote/ProtobufTranslationImplTest.java
----------------------------------------------------------------------
diff --git a/avatica/src/test/java/org/apache/calcite/avatica/remote/ProtobufTranslationImplTest.java b/avatica/src/test/java/org/apache/calcite/avatica/remote/ProtobufTranslationImplTest.java
index 998bba4..83fd426 100644
--- a/avatica/src/test/java/org/apache/calcite/avatica/remote/ProtobufTranslationImplTest.java
+++ b/avatica/src/test/java/org/apache/calcite/avatica/remote/ProtobufTranslationImplTest.java
@@ -295,15 +295,15 @@ public class ProtobufTranslationImplTest<T> {
}
responses.add(new DatabasePropertyResponse(propertyMap, rpcMetadata));
- responses.add(new ExecuteResponse(Arrays.asList(results1, results1, results1), false,
- rpcMetadata));
+ responses.add(
+ new ExecuteResponse(Arrays.asList(results1, results1, results1), false, rpcMetadata));
responses.add(new FetchResponse(frame, false, false, rpcMetadata));
responses.add(new FetchResponse(frame, true, true, rpcMetadata));
responses.add(new FetchResponse(frame, false, true, rpcMetadata));
responses.add(
new PrepareResponse(
- new Meta.StatementHandle("connectionId", Integer.MAX_VALUE,
- signature), rpcMetadata));
+ new Meta.StatementHandle("connectionId", Integer.MAX_VALUE, signature),
+ rpcMetadata));
StringWriter sw = new StringWriter();
new Exception().printStackTrace(new PrintWriter(sw));
@@ -321,8 +321,8 @@ public class ProtobufTranslationImplTest<T> {
// Some tests to make sure ErrorResponse doesn't fail.
responses.add(new ErrorResponse((List<String>) null, null, 0, null, null, null));
- responses.add(new ErrorResponse(Arrays.asList("stacktrace1", "stacktrace2"), null, 0, null,
- null, null));
+ responses.add(
+ new ErrorResponse(Arrays.asList("stacktrace1", "stacktrace2"), null, 0, null, null, null));
return responses;
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/avatica/src/test/java/org/apache/calcite/avatica/test/JsonHandlerTest.java
----------------------------------------------------------------------
diff --git a/avatica/src/test/java/org/apache/calcite/avatica/test/JsonHandlerTest.java b/avatica/src/test/java/org/apache/calcite/avatica/test/JsonHandlerTest.java
index bbfc4a7..6fb9ce3 100644
--- a/avatica/src/test/java/org/apache/calcite/avatica/test/JsonHandlerTest.java
+++ b/avatica/src/test/java/org/apache/calcite/avatica/test/JsonHandlerTest.java
@@ -119,8 +119,7 @@ public class JsonHandlerTest {
return null;
}
- @Override
- public void setRpcMetadata(RpcMetadataResponse metadata) {}
+ @Override public void setRpcMetadata(RpcMetadataResponse metadata) {}
}
/**
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java
index 3c23614..a4a0481 100644
--- a/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java
+++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/SqlImplementor.java
@@ -433,7 +433,11 @@ public abstract class SqlImplementor {
public abstract SqlNode field(int ordinal);
/** Converts an expression from {@link RexNode} to {@link SqlNode}
- * format. */
+ * format.
+ *
+ * @param program Required only if {@code rex} contains {@link RexLocalRef}
+ * @param rex Expression to convert
+ */
public SqlNode toSql(RexProgram program, RexNode rex) {
switch (rex.getKind()) {
case LOCAL_REF:
http://git-wip-us.apache.org/repos/asf/calcite/blob/83fedf32/src/main/config/checkstyle/checker.xml
----------------------------------------------------------------------
diff --git a/src/main/config/checkstyle/checker.xml b/src/main/config/checkstyle/checker.xml
index 500eaa4..32c98eb 100644
--- a/src/main/config/checkstyle/checker.xml
+++ b/src/main/config/checkstyle/checker.xml
@@ -76,7 +76,7 @@ limitations under the License.
<!-- Checks for class design -->
<!-- See http://checkstyle.sf.net/config_design.html -->
<!-- Utility class should not be instantiated, they must have a
- private constructor -->
+ private constructor -->
<module name="HideUtilityClassConstructor"/>
<!-- Checks for common coding problems -->
@@ -101,9 +101,9 @@ limitations under the License.
<!-- Don't declare multiple variables in the same statement -->
<module name="MultipleVariableDeclarations" />
<!-- String literals more than one character long should not be
- repeated several times -->
+ repeated several times -->
<!-- the "unchecked" string is also accepted to allow
- @SuppressWarnings("unchecked") -->
+ @SuppressWarnings("unchecked") -->
<!-- Disabling for now until we have a better ignoreStringsRegexp -->
<!--
<module name="MultipleStringLiterals" >
@@ -163,7 +163,7 @@ limitations under the License.
<!-- Checks for Naming Conventions. -->
<!-- See http://checkstyle.sf.net/config_naming.html -->
<!-- Constant names should obey the traditional all uppercase
- naming convention -->
+ naming convention -->
<module name="ConstantName"/>
<module name="LocalFinalVariableName">
<!-- Allow '_' except first. -->