Fix Optimizer suport for general cases of database types

speedment · Apr 19, 2017 · e06ab61 · e06ab61
1 parent 4fca29a
commit e06ab61
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 48 deletions.
diff --git a/...e-parent/runtime-core/src/main/java/com/speedment/runtime/core/component/sql/Metrics.java b/...e-parent/runtime-core/src/main/java/com/speedment/runtime/core/component/sql/Metrics.java
@@ -39,6 +39,9 @@ public interface Metrics {
      * @return a new Metrics
      */
     static Metrics of(int pipelineReductions) {
+        if (pipelineReductions == 0) {
+            return empty();
+        }
         return new MetricsImpl(pipelineReductions);
     }
 

diff --git a/runtime-parent/runtime-core/src/main/java/com/speedment/runtime/core/db/DbmsType.java b/runtime-parent/runtime-core/src/main/java/com/speedment/runtime/core/db/DbmsType.java
@@ -178,10 +178,23 @@ public interface DbmsType {
      */
     String getInitialQuery();
 
+    enum SkipLimitSupport {
+        STANDARD, ONLY_AFTER_SORTED, NONE;
+    }
+
+    /**
+     * Returns the support for skip and limit (or skip and offset) for this
+     * database type.
+     *
+     * @return the support for skip and limit (or skip and offset) for this
+     * database type
+     */
+    SkipLimitSupport getSkipLimitSupport();
+
     /**
-     * Returns a new String and modifies the provided parameter list so that the
-     * original SQL query will reflect a query that has an offset (skip) and a
-     * limit.
+     * Returns a new String and modifies the provided parameter list (side
+     * effect) so that the original SQL query will reflect a query that has an
+     * offset (skip) and a limit.
      *
      * @param originalSql original SQL query
      * @param params parameter list

diff --git a/...va/com/speedment/runtime/core/internal/component/sql/SqlStreamOptimizerComponentImpl.java b/...va/com/speedment/runtime/core/internal/component/sql/SqlStreamOptimizerComponentImpl.java
@@ -23,8 +23,8 @@
 import com.speedment.runtime.core.component.sql.*;
 import com.speedment.runtime.core.db.AsynchronousQueryResult;
 import com.speedment.runtime.core.db.DbmsType;
-import com.speedment.runtime.core.internal.component.sql.optimiser.FilterSortedSkipOptimizer;
-import com.speedment.runtime.core.internal.component.sql.optimiser.InitialFilterOptimizer;
+import com.speedment.runtime.core.internal.component.sql.optimizer.FilterSortedSkipOptimizer;
+import com.speedment.runtime.core.internal.component.sql.optimizer.InitialFilterOptimizer;
 import com.speedment.runtime.core.stream.Pipeline;
 import java.util.List;
 import static java.util.Objects.requireNonNull;

diff --git a/.../optimiser/FilterSortedSkipOptimizer.java → .../optimizer/FilterSortedSkipOptimizer.java b/.../optimiser/FilterSortedSkipOptimizer.java → .../optimizer/FilterSortedSkipOptimizer.java
@@ -14,14 +14,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.core.internal.component.sql.optimiser;
+package com.speedment.runtime.core.internal.component.sql.optimizer;
 
 import com.speedment.runtime.config.identifier.ColumnIdentifier;
 import com.speedment.runtime.core.component.sql.Metrics;
 import com.speedment.runtime.core.component.sql.SqlStreamOptimizer;
 import com.speedment.runtime.core.component.sql.SqlStreamOptimizerInfo;
 import com.speedment.runtime.core.db.AsynchronousQueryResult;
 import com.speedment.runtime.core.db.DbmsType;
+import static com.speedment.runtime.core.db.DbmsType.SkipLimitSupport.NONE;
+import static com.speedment.runtime.core.db.DbmsType.SkipLimitSupport.ONLY_AFTER_SORTED;
 import com.speedment.runtime.core.db.FieldPredicateView;
 import com.speedment.runtime.core.db.SqlPredicateFragment;
 import com.speedment.runtime.core.internal.stream.builder.action.reference.FilterAction;
@@ -90,10 +92,22 @@ public final class FilterSortedSkipOptimizer<ENTITY> implements SqlStreamOptimiz
     public Metrics metrics(Pipeline initialPipeline, DbmsType dbmsType) {
         requireNonNull(initialPipeline);
         requireNonNull(dbmsType);
+        final DbmsType.SkipLimitSupport skipLimitSupport = dbmsType.getSkipLimitSupport();
+        final AtomicInteger filterCounter = new AtomicInteger();
+        final AtomicInteger orderCounter = new AtomicInteger();
+        final AtomicInteger skipCounter = new AtomicInteger();
 
-        final AtomicInteger cnt = new AtomicInteger();
-        traverse(initialPipeline, fc -> cnt.incrementAndGet(), fc -> cnt.incrementAndGet(), fc -> cnt.incrementAndGet());
-        return Metrics.of(cnt.get());
+        traverse(initialPipeline, fc -> filterCounter.incrementAndGet(), fc -> orderCounter.incrementAndGet(), fc -> skipCounter.incrementAndGet());
+
+        if (skipLimitSupport == ONLY_AFTER_SORTED && orderCounter.get() == 0) {
+            // Just decline. There are other optimizer that handles just filtering better
+            return Metrics.empty();
+        }
+        if (skipLimitSupport == NONE) {
+            return Metrics.of(filterCounter.get() + orderCounter.get());
+        }
+
+        return Metrics.of(filterCounter.get() + orderCounter.get() + skipCounter.get());
     }
 
     @Override
@@ -105,7 +119,7 @@ public <P extends Pipeline> P optimize(
         requireNonNull(initialPipeline);
         requireNonNull(info);
         requireNonNull(query);
-
+        final DbmsType.SkipLimitSupport skipLimitSupport = info.getDbmsType().getSkipLimitSupport();
         final List<FilterAction<ENTITY>> filters = new ArrayList<>();
         final List<SortedComparatorAction<ENTITY>> sorteds = new ArrayList<>();
         final List<SkipAction<ENTITY>> skips = new ArrayList<>();
@@ -120,16 +134,6 @@ public <P extends Pipeline> P optimize(
         if (!filters.isEmpty()) {
             final FieldPredicateView spv = info.getDbmsType().getFieldPredicateView();
 
-//            for (FilterAction<ENTITY> filter: filters) {
-//                Predicate<? super ENTITY> predicate = filter.getPredicate();
-//                @SuppressWarnings("unchecked")
-//                FieldPredicate<ENTITY> fPredicate = (FieldPredicate<ENTITY>)filter.getPredicate();
-//                SqlPredicateFragment fragment = spv.transform(
-//                    info.getSqlColumnNamer(), 
-//                    info.getSqlDatabaseTypeFunction(), 
-//                    fPredicate
-//                );
-//            }
             @SuppressWarnings("unchecked")
             final List<SqlPredicateFragment> fragments = filters.stream()
                 .map(f -> f.getPredicate())
@@ -189,37 +193,21 @@ public <P extends Pipeline> P optimize(
             }
         }
 
-        final long sumSkip = skips.stream().mapToLong(SkipAction::getSkip).sum();
+        final String finalSql;
+        if (skipLimitSupport == NONE) {
+            finalSql = sql.toString();
+            initialPipeline.removeIf(a -> filters.contains(a) || sorteds.contains(a));
+        } else {
+            final long sumSkip = skips.stream().mapToLong(SkipAction::getSkip).sum();
 
-//        final long sumSkip;
-//        if (!skips.isEmpty()) {
-//            values.add(sumSkip);
-//            // Only works for MySQL. Make DB independent using DbmsType
-////            sql.append(" LIMIT 9223372036854775807 OFFSET ?");
-//            sql.append(" LIMIT 223372036854775807 OFFSET ?");
-//        } else {
-//            sumSkip = 0;
-//        }
-        final String finalSql = info.getDbmsType()
-            .applySkipLimit(sql.toString(), values, sumSkip, Long.MAX_VALUE);
+            finalSql = info.getDbmsType()
+                .applySkipLimit(sql.toString(), values, sumSkip, Long.MAX_VALUE);
+            initialPipeline.removeIf(a -> filters.contains(a) || sorteds.contains(a) || skips.contains(a));
+        }
 
         query.setSql(finalSql);
         query.setValues(values);
 
-        initialPipeline.removeIf(a -> filters.contains(a) || sorteds.contains(a) || skips.contains(a));
-
-//        // Todo: Optimize this
-//        Iterator<Action<?, ?>> iterator = initialPipeline.iterator();
-//        while (iterator.hasNext()) {
-//            final Action<?, ?> action = iterator.next();
-//            if (filters.contains(action)) {
-//                iterator.remove();
-//            } else if (sorteds.contains(action)) {
-//                iterator.remove();
-//            } else if (skips.contains(action)) {
-//                iterator.remove();
-//            }
-//        }
         return initialPipeline;
     }
 

diff --git a/...sql/optimiser/InitialFilterOptimizer.java → ...sql/optimizer/InitialFilterOptimizer.java b/...sql/optimiser/InitialFilterOptimizer.java → ...sql/optimizer/InitialFilterOptimizer.java
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.speedment.runtime.core.internal.component.sql.optimiser;
+package com.speedment.runtime.core.internal.component.sql.optimizer;
 
 import com.speedment.runtime.core.component.sql.Metrics;
 import com.speedment.runtime.core.component.sql.SqlStreamOptimizer;

diff --git a/...t/runtime-core/src/main/java/com/speedment/runtime/core/internal/db/AbstractDbmsType.java b/...t/runtime-core/src/main/java/com/speedment/runtime/core/internal/db/AbstractDbmsType.java
@@ -114,7 +114,11 @@ public DbmsColumnHandler getColumnHandler() {
         return DEFAULT_COLUMN_HANDLER;
     }
 
-
+    @Override
+    public SkipLimitSupport getSkipLimitSupport() {
+        return SkipLimitSupport.STANDARD;
+    }
+
     @Override
     public String applySkipLimit(String originalSql, List<Object> params, long skip, long limit) {
         requireNonNegative(skip);

diff --git a/...t/runtime/core/internal/component/sql/optimiser/FilterOrderSkipOptimizer_MetricsTest.java b/...t/runtime/core/internal/component/sql/optimiser/FilterOrderSkipOptimizer_MetricsTest.java
@@ -16,6 +16,7 @@
  */
 package com.speedment.runtime.core.internal.component.sql.optimiser;
 
+import com.speedment.runtime.core.internal.component.sql.optimizer.FilterSortedSkipOptimizer;
 import com.speedment.runtime.core.component.sql.Metrics;
 import com.speedment.runtime.core.db.DbmsType;
 import com.speedment.runtime.core.internal.stream.builder.action.reference.FilterAction;

diff --git a/.../runtime/core/internal/component/sql/optimiser/FilterOrderSkipOptimizer_OptimizeTest.java b/.../runtime/core/internal/component/sql/optimiser/FilterOrderSkipOptimizer_OptimizeTest.java
@@ -16,6 +16,7 @@
  */
 package com.speedment.runtime.core.internal.component.sql.optimiser;
 
+import com.speedment.runtime.core.internal.component.sql.optimizer.FilterSortedSkipOptimizer;
 import com.speedment.runtime.core.component.sql.SqlStreamOptimizerInfo;
 import com.speedment.runtime.core.db.AsynchronousQueryResult;
 import com.speedment.runtime.core.db.DbmsType;