You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2016/03/24 19:49:25 UTC
[3/3] calcite git commit: [CALCITE-1128] Remove unused member and fix
pb builder use
[CALCITE-1128] Remove unused member and fix pb builder use
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/48d8ebf5
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/48d8ebf5
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/48d8ebf5
Branch: refs/heads/master
Commit: 48d8ebf57fcb9890854dcdec4c26a4bd8ff26a9c
Parents: 406372f
Author: Josh Elser <el...@apache.org>
Authored: Thu Mar 24 14:27:44 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Mar 24 14:28:39 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/calcite/avatica/remote/Service.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/48d8ebf5/avatica/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/java/org/apache/calcite/avatica/remote/Service.java b/avatica/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
index 2ead933..0f45947 100644
--- a/avatica/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
+++ b/avatica/core/src/main/java/org/apache/calcite/avatica/remote/Service.java
@@ -2844,7 +2844,6 @@ public interface Service {
&& Objects.equals(connectionId, ((PrepareAndExecuteBatchRequest) o).connectionId)
&& statementId == ((PrepareAndExecuteBatchRequest) o).statementId
&& Objects.equals(sqlCommands, ((PrepareAndExecuteBatchRequest) o).sqlCommands);
-
}
}
@@ -2852,10 +2851,6 @@ public interface Service {
* Request object to execute a batch of commands.
*/
class ExecuteBatchRequest extends Request {
- private static final FieldDescriptor UPDATE_BATCH_FIELD_DESCRIPTOR = Requests
- .ExecuteBatchRequest.getDescriptor()
- .findFieldByNumber(Requests.ExecuteBatchRequest.UPDATES_FIELD_NUMBER);
-
public final String connectionId;
public final int statementId;
// Each update in a batch has a list of TypedValue's
@@ -2933,7 +2928,11 @@ public interface Service {
}
}
- return builder.setConnectionId(connectionId).setStatementId(statementId).build();
+ if (null != connectionId) {
+ builder.setConnectionId(connectionId);
+ }
+
+ return builder.setStatementId(statementId).build();
}
@Override public int hashCode() {