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/02/08 18:25:08 UTC
[9/9] incubator-calcite git commit: [CALCITE-573] Use user-given
names in RelOptUtil.createProject and createRename
[CALCITE-573] Use user-given names in RelOptUtil.createProject and createRename
Close apache/incubator-calcite#46
Close apache/incubator-calcite#45 (went in a few commits back)
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/e237804b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/e237804b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/e237804b
Branch: refs/heads/master
Commit: e237804b0e4d7ac17249708a5cf823e0c1fe1625
Parents: 8f1e3b2
Author: Trevor Hartman <tr...@gmail.com>
Authored: Wed Feb 4 09:53:25 2015 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Sun Feb 8 01:26:23 2015 -0800
----------------------------------------------------------------------
.../java/org/apache/calcite/avatica/Meta.java | 27 ++++++++++++++------
1 file changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/e237804b/avatica/src/main/java/org/apache/calcite/avatica/Meta.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/Meta.java b/avatica/src/main/java/org/apache/calcite/avatica/Meta.java
index 2e1f823..107c4c9 100644
--- a/avatica/src/main/java/org/apache/calcite/avatica/Meta.java
+++ b/avatica/src/main/java/org/apache/calcite/avatica/Meta.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import java.lang.reflect.Field;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -315,16 +316,15 @@ public interface Meta {
public final List<ColumnMetaData> columns;
public final String sql;
public final List<AvaticaParameter> parameters;
- public final Map<String, Object> internalParameters;
+ public final transient Map<String, Object> internalParameters;
public final CursorFactory cursorFactory;
- @JsonCreator
- public Signature(@JsonProperty("columns") List<ColumnMetaData> columns,
- @JsonProperty("sql") String sql,
- @JsonProperty("parameters") List<AvaticaParameter> parameters,
- @JsonProperty("internalParameters") Map<String, Object>
- internalParameters,
- @JsonProperty("cursorFactory") CursorFactory cursorFactory) {
+ /** Creates a Signature. */
+ public Signature(List<ColumnMetaData> columns,
+ String sql,
+ List<AvaticaParameter> parameters,
+ Map<String, Object> internalParameters,
+ CursorFactory cursorFactory) {
this.columns = columns;
this.sql = sql;
this.parameters = parameters;
@@ -332,6 +332,17 @@ public interface Meta {
this.cursorFactory = cursorFactory;
}
+ /** Used by Jackson to create a Signature by de-serializing JSON. */
+ @JsonCreator
+ public static Signature create(
+ @JsonProperty("columns") List<ColumnMetaData> columns,
+ @JsonProperty("sql") String sql,
+ @JsonProperty("parameters") List<AvaticaParameter> parameters,
+ @JsonProperty("cursorFactory") CursorFactory cursorFactory) {
+ return new Signature(columns, sql, parameters,
+ Collections.<String, Object>emptyMap(), cursorFactory);
+ }
+
/** Returns a copy of this Signature, substituting given CursorFactory. */
public Signature setCursorFactory(CursorFactory cursorFactory) {
return new Signature(columns, sql, parameters, internalParameters,