[CALCITE-4114] Remove method CalciteAssert.forceDecorrelate (Jiatao Tao)

Remove because its name is misleading. close apache#2073
picaqiu · Jul 27, 2020 · a412ac1 · a412ac1
1 parent 8a459d9
commit a412ac1
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/core/src/test/java/org/apache/calcite/test/CalciteAssert.java b/core/src/test/java/org/apache/calcite/test/CalciteAssert.java
@@ -1830,21 +1830,16 @@ public AssertQuery withRel(final Function<RelBuilder, RelNode> relFn) {
       return withHook(Hook.STRING_TO_QUERY,
           (Consumer<Pair<FrameworkConfig, Holder<CalcitePrepare.Query>>>)
           pair -> {
-            final FrameworkConfig config = forceDecorrelate(pair.left);
+            final FrameworkConfig config = Frameworks.newConfigBuilder(pair.left)
+                .context(
+                    Contexts.of(CalciteConnectionConfig.DEFAULT
+                        .set(CalciteConnectionProperty.FORCE_DECORRELATE,
+                            Boolean.toString(false))))
+                .build();
             final RelBuilder b = RelBuilder.create(config);
             pair.right.set(CalcitePrepare.Query.of(relFn.apply(b)));
           });
     }
-
-    /** Creates a {@link FrameworkConfig} that does not decorrelate. */
-    private FrameworkConfig forceDecorrelate(FrameworkConfig config) {
-      return Frameworks.newConfigBuilder(config)
-          .context(
-              Contexts.of(CalciteConnectionConfig.DEFAULT
-                  .set(CalciteConnectionProperty.FORCE_DECORRELATE,
-                      Boolean.toString(false))))
-          .build();
-    }
   }
 
   /** Fluent interface for building a metadata query to be tested. */