Skip to content

Commit 2351780

Browse files
committed
Add JSON to WriterTarget
1 parent c1491ef commit 2351780

File tree

6 files changed

+818
-37
lines changed

6 files changed

+818
-37
lines changed

presto-main-base/src/main/java/com/facebook/presto/sql/planner/CanonicalPlan.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/
1414
package com.facebook.presto.sql.planner;
1515

16+
import com.facebook.airlift.log.Logger;
1617
import com.facebook.presto.common.plan.PlanCanonicalizationStrategy;
1718
import com.facebook.presto.spi.PrestoException;
1819
import com.facebook.presto.spi.plan.PlanNode;
@@ -29,6 +30,7 @@
2930

3031
public class CanonicalPlan
3132
{
33+
private static final Logger log = Logger.get(CanonicalPlan.class);
3234
private final PlanNode plan;
3335
private final PlanCanonicalizationStrategy strategy;
3436

presto-main-base/src/main/java/com/facebook/presto/sql/planner/CanonicalPlanGenerator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
import com.facebook.presto.sql.planner.plan.SequenceNode;
6767
import com.facebook.presto.sql.planner.plan.TopNRowNumberNode;
6868
import com.fasterxml.jackson.annotation.JsonCreator;
69+
import com.fasterxml.jackson.annotation.JsonIgnore;
6970
import com.fasterxml.jackson.annotation.JsonProperty;
7071
import com.fasterxml.jackson.core.JsonProcessingException;
7172
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -1081,7 +1082,7 @@ private Optional<List<Integer>> orderSourcesByTables(List<PlanNode> sources)
10811082
return Optional.of(sourceToPosition.values().stream().collect(toImmutableList()));
10821083
}
10831084

1084-
private static class CanonicalWriterTarget
1085+
public static class CanonicalWriterTarget
10851086
extends TableWriterNode.WriterTarget
10861087
{
10871088
private final ConnectorId connectorId;
@@ -1110,13 +1111,15 @@ public String getWriterTargetType()
11101111
}
11111112

11121113
@Override
1114+
@JsonIgnore
11131115
public SchemaTableName getSchemaTableName()
11141116
{
11151117
// Just return a sample table name, which is always same
11161118
return new SchemaTableName("schema", "table");
11171119
}
11181120

11191121
@Override
1122+
@JsonIgnore
11201123
public Optional<List<OutputColumnMetadata>> getOutputColumns()
11211124
{
11221125
return Optional.empty();

presto-spi/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@
102102
<dependency>
103103
<groupId>com.fasterxml.jackson.core</groupId>
104104
<artifactId>jackson-databind</artifactId>
105-
<scope>test</scope>
105+
<scope>provided</scope>
106106
</dependency>
107107

108108
<dependency>
109109
<groupId>com.fasterxml.jackson.core</groupId>
110110
<artifactId>jackson-core</artifactId>
111-
<scope>test</scope>
111+
<scope>provided</scope>
112112
</dependency>
113113

114114
<dependency>
@@ -146,5 +146,11 @@
146146
<artifactId>commons-math3</artifactId>
147147
<scope>test</scope>
148148
</dependency>
149+
150+
<dependency>
151+
<groupId>javax.inject</groupId>
152+
<artifactId>javax.inject</artifactId>
153+
<scope>test</scope>
154+
</dependency>
149155
</dependencies>
150156
</project>

presto-spi/src/main/java/com/facebook/presto/spi/ColumnMetadata.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public Map<String, Object> getProperties()
8989
{
9090
return properties;
9191
}
92+
9293
public Builder toBuilder()
9394
{
9495
return ColumnMetadata.builder()

0 commit comments

Comments
 (0)