Skip to content

Commit c58a259

Browse files
authored
Use macro override method (#113)
* Use macro override method * Remove redundant paren
1 parent 5c51af5 commit c58a259

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

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
@@ -119,7 +119,7 @@ public void execute(SqlCreateView create, CalcitePrepare.Context context) {
119119
viewPath.add(viewName);
120120
HoptimatorViewTableMacro viewTableMacro = new HoptimatorViewTableMacro(CalciteSchema.from(schemaPlus),
121121
sql, schemaPath, viewPath, false);
122-
ViewTable viewTable = (ViewTable) viewTableMacro.apply(connectionProperties);
122+
ViewTable viewTable = (ViewTable) viewTableMacro.apply(Collections.singletonList(connectionProperties));
123123
try {
124124
ValidationService.validateOrThrow(viewTable, TranslatableTable.class);
125125
if (create.getReplace()) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.linkedin.hoptimator.jdbc;
22

3+
import java.util.Collections;
34
import java.util.List;
45
import java.util.Properties;
56

@@ -24,7 +25,7 @@ public MaterializedViewTable(ViewTable viewTable) {
2425
}
2526

2627
public MaterializedViewTable(HoptimatorViewTableMacro viewTableMacro, Properties connectionProperties) {
27-
this((ViewTable) viewTableMacro.apply(connectionProperties));
28+
this((ViewTable) viewTableMacro.apply(Collections.singletonList(connectionProperties)));
2829
}
2930

3031
public ViewTable viewTable() {

hoptimator-jdbc/src/main/java/com/linkedin/hoptimator/jdbc/schema/HoptimatorViewTableMacro.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ public HoptimatorViewTableMacro(CalciteSchema schema, String viewSql,
2727
this.modifiable = modifiable;
2828
}
2929

30-
public TranslatableTable apply(Properties properties) {
30+
@Override
31+
public TranslatableTable apply(List<? extends @Nullable Object> arguments) {
32+
Properties properties = new Properties();
33+
if (!arguments.isEmpty()) {
34+
properties = (Properties) arguments.get(0);
35+
}
3136
CalciteConnection connection;
3237
try {
3338
connection = DriverManager.getConnection("jdbc:calcite:", properties)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private Table makeView(SchemaPlus parentSchema, Row row, Properties connectionPr
114114
if (row.MATERIALIZED) {
115115
return new MaterializedViewTable(viewTableMacro, connectionProperties);
116116
} else {
117-
return viewTableMacro.apply(connectionProperties);
117+
return viewTableMacro.apply(Collections.singletonList(connectionProperties));
118118
}
119119
}
120120

0 commit comments

Comments
 (0)