Skip to content

Commit aeb8b20

Browse files
authored
Fix case statement exception (#100)
* Fix case statement * Various checkstyle compaints
1 parent bada97a commit aeb8b20

File tree

11 files changed

+14
-21
lines changed

11 files changed

+14
-21
lines changed

deploy/samples/kafkadb.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ spec:
3737
properties.bootstrap.servers = one-kafka-bootstrap.kafka.svc.cluster.local:9094
3838
value.format = json
3939
scan.startup.mode = earliest-offset
40+
key.fields = KEY
41+
value.fields-include = EXCEPT_KEY
4042
4143
---
4244

deploy/samples/venicedb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ spec:
2323
key.fields-prefix = {{keyPrefix:}}
2424
key.fields = {{keys:KEY}}
2525
key.type = {{keyType:PRIMITIVE}}
26-
value.fields-include: EXCEPT_KEY
26+
value.fields-include = EXCEPT_KEY

hoptimator-jdbc/src/main/java/com/linkedin/hoptimator/jdbc/BuiltinCatalogProvider.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.Collection;
44
import java.util.Collections;
5-
import java.util.Properties;
65

76
import com.linkedin.hoptimator.Catalog;
87
import com.linkedin.hoptimator.CatalogProvider;

hoptimator-jdbc/src/main/java/com/linkedin/hoptimator/jdbc/HoptimatorConnection.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package com.linkedin.hoptimator.jdbc;
22

3-
import java.sql.Connection;
4-
import java.sql.Statement;
53
import java.sql.SQLException;
4+
import java.sql.Statement;
65
import java.util.Properties;
76

87
import org.apache.calcite.jdbc.CalciteConnection;
@@ -24,15 +23,15 @@ public HoptimatorConnection(CalciteConnection connection, Properties connectionP
2423

2524
@Override
2625
public Statement createStatement() throws SQLException {
27-
return connection.createStatement();
26+
return connection.createStatement();
2827
}
2928

3029
public Properties connectionProperties() {
3130
return connectionProperties;
3231
}
3332

3433
public CalcitePrepare.Context createPrepareContext() {
35-
return connection.createPrepareContext();
34+
return connection.createPrepareContext();
3635
}
3736

3837
public CalciteConnection calciteConnection() {

hoptimator-jdbc/src/main/java/com/linkedin/hoptimator/jdbc/HoptimatorDdlExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public void execute(SqlCreateMaterializedView create, CalcitePrepare.Context con
173173
MaterializedViewTable materializedViewTable = new MaterializedViewTable(viewTableMacro);
174174
RelDataType viewRowType = materializedViewTable.getRowType(typeFactory);
175175

176-
// Suport "partial views", i.e. CREATE VIEW FOO$BAR, where the view name
176+
// Support "partial views", i.e. CREATE VIEW FOO$BAR, where the view name
177177
// is "foo-bar" and the sink is just FOO.
178178
String sinkName = viewName.split("\\$", 2)[0];
179179
List<String> sinkPath = new ArrayList<>();

hoptimator-k8s/src/main/java/com/linkedin/hoptimator/k8s/K8sCatalog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.linkedin.hoptimator.k8s;
22

3-
import java.util.Properties;
43
import java.sql.SQLException;
54
import java.sql.Wrapper;
5+
import java.util.Properties;
66

77
import org.apache.calcite.schema.SchemaPlus;
88
import org.slf4j.Logger;

hoptimator-k8s/src/main/java/com/linkedin/hoptimator/k8s/K8sContext.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
package com.linkedin.hoptimator.k8s;
22

33
import java.io.File;
4-
import java.io.InputStream;
54
import java.io.IOException;
5+
import java.io.InputStream;
66
import java.io.Reader;
77
import java.nio.file.Files;
8-
import java.nio.file.Path;
98
import java.nio.file.Paths;
109
import java.time.Duration;
11-
import java.util.Optional;
1210
import java.util.Properties;
1311

14-
import org.slf4j.Logger;
15-
import org.slf4j.LoggerFactory;
16-
1712
import io.kubernetes.client.apimachinery.GroupVersion;
1813
import io.kubernetes.client.common.KubernetesListObject;
1914
import io.kubernetes.client.common.KubernetesObject;
@@ -86,12 +81,12 @@ public K8sContext(Properties connectionProperties) {
8681
throw new RuntimeException(e);
8782
}
8883
}
89-
84+
9085
if (server != null) {
9186
info += " Accessing " + server + ".";
9287
this.apiClient.setBasePath(server);
9388
}
94-
89+
9590
if (truststore != null) {
9691
try {
9792
InputStream in = Files.newInputStream(Paths.get(truststore));

hoptimator-kafka/src/test/resources/kafka-ddl.id

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ spec:
1313
entryClass: com.linkedin.hoptimator.flink.runner.FlinkRunner
1414
args:
1515
- CREATE DATABASE IF NOT EXISTS `KAFKA` WITH ()
16-
- CREATE TABLE IF NOT EXISTS `KAFKA`.`existing-topic-2` (`KEY` VARCHAR, `VALUE` BINARY) WITH ('connector'='kafka', 'properties.bootstrap.servers'='one-kafka-bootstrap.kafka.svc.cluster.local:9094', 'scan.startup.mode'='earliest-offset', 'topic'='existing-topic-2', 'value.format'='json')
16+
- CREATE TABLE IF NOT EXISTS `KAFKA`.`existing-topic-2` (`KEY` VARCHAR, `VALUE` BINARY) WITH ('connector'='kafka', 'key.fields'='KEY', 'properties.bootstrap.servers'='one-kafka-bootstrap.kafka.svc.cluster.local:9094', 'scan.startup.mode'='earliest-offset', 'topic'='existing-topic-2', 'value.fields-include'='EXCEPT_KEY', 'value.format'='json')
1717
- CREATE DATABASE IF NOT EXISTS `KAFKA` WITH ()
18-
- CREATE TABLE IF NOT EXISTS `KAFKA`.`existing-topic-1` (`KEY` VARCHAR, `VALUE` BINARY) WITH ('connector'='kafka', 'properties.bootstrap.servers'='one-kafka-bootstrap.kafka.svc.cluster.local:9094', 'scan.startup.mode'='earliest-offset', 'topic'='existing-topic-1', 'value.format'='json')
18+
- CREATE TABLE IF NOT EXISTS `KAFKA`.`existing-topic-1` (`KEY` VARCHAR, `VALUE` BINARY) WITH ('connector'='kafka', 'key.fields'='KEY', 'properties.bootstrap.servers'='one-kafka-bootstrap.kafka.svc.cluster.local:9094', 'scan.startup.mode'='earliest-offset', 'topic'='existing-topic-1', 'value.fields-include'='EXCEPT_KEY', 'value.format'='json')
1919
- INSERT INTO `KAFKA`.`existing-topic-1` (`KEY`, `VALUE`) SELECT * FROM `KAFKA`.`existing-topic-2`
2020
jarURI: file:///opt/hoptimator-flink-runner.jar
2121
parallelism: 1

hoptimator-operator/src/main/java/com/linkedin/hoptimator/operator/HoptimatorOperatorApp.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.kubernetes.client.extended.controller.ControllerManager;
2222
import io.kubernetes.client.informer.SharedInformerFactory;
2323
import io.kubernetes.client.openapi.ApiClient;
24-
import io.kubernetes.client.util.Config;
2524

2625
import com.linkedin.hoptimator.catalog.Resource;
2726
import com.linkedin.hoptimator.k8s.K8sApiEndpoints;

hoptimator-util/src/main/java/com/linkedin/hoptimator/util/ConfigService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.io.StringReader;
44
import java.util.Properties;
55
import java.util.ServiceLoader;
6-
import javax.annotation.Nullable;
76

87
import org.slf4j.Logger;
98
import org.slf4j.LoggerFactory;

hoptimator-util/src/main/java/com/linkedin/hoptimator/util/planner/ScriptImplementor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public void implement(SqlWriter w) {
179179
private static final SqlShuttle REMOVE_ROW_CONSTRUCTOR = new SqlShuttle() {
180180
@Override
181181
public SqlNode visit(SqlCall call) {
182-
List<SqlNode> operands = call.getOperandList().stream().map(x -> x.accept(this)).collect(Collectors.toList());
182+
List<SqlNode> operands = call.getOperandList().stream().map(x -> x == null ? x : x.accept(this)).collect(Collectors.toList());
183183
if ((call.getKind() == SqlKind.ROW || call.getKind() == SqlKind.COLUMN_LIST
184184
|| call.getOperator() instanceof SqlRowOperator) && operands.size() > 1) {
185185
return IMPLIED_ROW_OPERATOR.createCall(call.getParserPosition(), operands);

0 commit comments

Comments
 (0)