Access static members in static fashion

prestodb · May 29, 2024 · 0a0ac8f · 0a0ac8f
1 parent 88bc1c3
commit 0a0ac8f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/EffectivePredicateExtractor.java
@@ -303,10 +303,10 @@ public Function<RowExpression, RowExpression> expressionOrNullVariables(final Pr
                         nullConjuncts.add(specialForm(IS_NULL, BOOLEAN, variable));
                     }
 
-                    resultDisjunct.add(logicalRowExpressions.and(nullConjuncts.build()));
+                    resultDisjunct.add(LogicalRowExpressions.and(nullConjuncts.build()));
                 }
 
-                return logicalRowExpressions.or(resultDisjunct.build());
+                return LogicalRowExpressions.or(resultDisjunct.build());
             };
         }
 

diff --git a/...ain/src/main/java/com/facebook/presto/sql/planner/optimizations/PlanNodeDecorrelator.java b/...ain/src/main/java/com/facebook/presto/sql/planner/optimizations/PlanNodeDecorrelator.java
@@ -132,7 +132,7 @@ public Optional<DecorrelationResult> visitFilter(FilterNode node, Void context)
             }
 
             RowExpression predicate = node.getPredicate();
-            Map<Boolean, List<RowExpression>> predicates = logicalRowExpressions.extractConjuncts(predicate).stream()
+            Map<Boolean, List<RowExpression>> predicates = LogicalRowExpressions.extractConjuncts(predicate).stream()
                     .collect(Collectors.partitioningBy(PlanNodeDecorrelator.DecorrelatingVisitor.this::isCorrelated));
             List<RowExpression> correlatedPredicates = ImmutableList.copyOf(predicates.get(true));
             List<RowExpression> uncorrelatedPredicates = ImmutableList.copyOf(predicates.get(false));

diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/planPrinter/JsonRenderer.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/planPrinter/JsonRenderer.java
@@ -39,8 +39,8 @@
 public class JsonRenderer
         implements Renderer<String>
 {
-    private static JsonCodec<JsonRenderedNode> codec = JsonCodec.jsonCodec(JsonRenderedNode.class);
-    private static JsonCodec<Map<PlanFragmentId, JsonPlanFragment>> planMapCodec = JsonCodec.mapJsonCodec(PlanFragmentId.class, JsonPlanFragment.class);
+    private final JsonCodec<Map<PlanFragmentId, JsonPlanFragment>> planMapCodec;
+    private final JsonCodec<JsonRenderedNode> codec;
 
     public JsonRenderer(FunctionAndTypeManager functionAndTypeManager)
     {

diff --git a/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotBrokerPageSource.java b/presto-pinot-toolkit/src/test/java/com/facebook/presto/pinot/TestPinotBrokerPageSource.java
@@ -182,15 +182,15 @@ public void testPinotBrokerRequest()
                 new MockPinotClusterInfoFetcher(pinotConfig),
                 objectMapper,
                 PinotBrokerAuthenticationProvider.create(PinotEmptyAuthenticationProvider.instance()));
-        assertEquals(pageSource.getRequestPayload(generatedPinotQuery), "{\"sql\":\"SELECT * FROM myTable\"}");
+        assertEquals(PinotBrokerPageSource.getRequestPayload(generatedPinotQuery), "{\"sql\":\"SELECT * FROM myTable\"}");
 
         generatedPinotQuery = new PinotQueryGenerator.GeneratedPinotQuery(
                 pinotTable.getTableName(),
                 "SELECT * FROM myTable WHERE jsonStr = '\"{\"abc\" : \"def\"}\"'",
                 ImmutableList.of(),
                 false,
                 false);
-        assertEquals(pageSource.getRequestPayload(generatedPinotQuery), "{\"sql\":\"SELECT * FROM myTable WHERE jsonStr = '\\\"{\\\"abc\\\" : \\\"def\\\"}\\\"'\"}");
+        assertEquals(PinotBrokerPageSource.getRequestPayload(generatedPinotQuery), "{\"sql\":\"SELECT * FROM myTable WHERE jsonStr = '\\\"{\\\"abc\\\" : \\\"def\\\"}\\\"'\"}");
     }
 
     @Test(dataProvider = "sqlResponses")

diff --git a/presto-tpcds/src/test/java/com/facebook/presto/tpcds/TestTpcdsMetadataStatistics.java b/presto-tpcds/src/test/java/com/facebook/presto/tpcds/TestTpcdsMetadataStatistics.java
@@ -178,7 +178,7 @@ public void testTableStatisticsSerialization()
 
         Entry<ColumnHandle, ColumnStatistics> entry = tableStatistics.getColumnStatistics().entrySet().iterator().next();
 
-        TableStatistics expectedTableStatistics = tableStatistics.builder()
+        TableStatistics expectedTableStatistics = TableStatistics.builder()
                 .setRowCount(tableStatistics.getRowCount())
                 .setColumnStatistics(entry.getKey(), entry.getValue())
                 .build();