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/10/09 18:26:21 UTC
incubator-calcite git commit: [CALCITE-914] Add JsonSubType for
ExecuteResponse, and fix JSON docs (Josh Elser)
Repository: incubator-calcite
Updated Branches:
refs/heads/master 6385cf5d0 -> b1e91e1e6
[CALCITE-914] Add JsonSubType for ExecuteResponse, and fix JSON docs (Josh Elser)
Close apache/incubator-calcite#143
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/b1e91e1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/b1e91e1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/b1e91e1e
Branch: refs/heads/master
Commit: b1e91e1e6b3cb240899ce4448cea0c22c2ebce30
Parents: 6385cf5
Author: Josh Elser <el...@apache.org>
Authored: Wed Oct 7 23:44:58 2015 -0400
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Oct 9 08:41:50 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/calcite/avatica/remote/Service.java | 3 ++-
site/_docs/avatica_json_reference.md | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/b1e91e1e/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 757032a..577e32c 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
@@ -106,7 +106,8 @@ public interface Service {
@JsonSubTypes.Type(value = CloseConnectionResponse.class,
name = "closeConnection"),
@JsonSubTypes.Type(value = ConnectionSyncResponse.class, name = "connectionSync"),
- @JsonSubTypes.Type(value = DatabasePropertyResponse.class, name = "databaseProperties") })
+ @JsonSubTypes.Type(value = DatabasePropertyResponse.class, name = "databaseProperties"),
+ @JsonSubTypes.Type(value = ExecuteResponse.class, name = "executeResults") })
abstract class Response {
abstract Response deserialize(Message genericMsg);
abstract Message serialize();
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/b1e91e1e/site/_docs/avatica_json_reference.md
----------------------------------------------------------------------
diff --git a/site/_docs/avatica_json_reference.md b/site/_docs/avatica_json_reference.md
index d84aa59..ce624ae 100644
--- a/site/_docs/avatica_json_reference.md
+++ b/site/_docs/avatica_json_reference.md
@@ -337,7 +337,7 @@ that only contains this count and no additional data.
{% highlight json %}
{
- "response": "Service$ExecuteResponse",
+ "response": "executeResults",
"resultSets": [ ResultSetResponse, ResultSetResponse, ... ]
}
{% endhighlight %}