Improve simple tag query performance by enabling the A-cost query pos…

…sibilities

Add better regexp detection and test for most common cases

Add ^!.* as regexp check since we allow that syntax

Optimize OR-queries also in the query optimizer

Change tagNameAndValues to use IN

core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/DataAccess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 Red Hat, Inc. and/or its affiliates
+ * Copyright 2014-2018 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -130,7 +130,7 @@ <T> Observable<ResultSet> updateRetentionsIndex(String tenantId, MetricType<T> t
 
     Observable<Row> findMetricsByTagName(String tenantId, String tag);
 
-    Observable<Row> findMetricsByTagNameValue(String tenantId, String tag, String tvalue);
+    Observable<Row> findMetricsByTagNameValue(String tenantId, String tag, String ... tvalues);
 
     Observable<Row> findAllMetricsFromTagsIndex();
 

core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/DataAccessImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 Red Hat, Inc. and/or its affiliates
+ * Copyright 2014-2018 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,6 +25,7 @@
 import static org.hawkular.metrics.model.MetricType.STRING;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
 import java.util.Set;
@@ -565,7 +566,7 @@ protected void initPreparedStatements() {
         findMetricsByTagNameValue = session.prepare(
                 "SELECT tenant_id, type, metric, tvalue " +
                 "FROM metrics_tags_idx " +
-                "WHERE tenant_id = ? AND tname = ? AND tvalue = ?");
+                "WHERE tenant_id = ? AND tname = ? AND tvalue IN ?");
 
         updateMetricExpirationIndex = session.prepare(
                 "INSERT INTO metrics_expiration_idx (tenant_id, type, metric, time) VALUES (?, ?, ?, ?)");
@@ -1164,8 +1165,8 @@ public Observable<Row> findMetricsByTagName(String tenantId, String tag) {
     }
 
     @Override
-    public Observable<Row> findMetricsByTagNameValue(String tenantId, String tag, String tvalue) {
-        return rxSession.executeAndFetch(findMetricsByTagNameValue.bind(tenantId, tag, tvalue));
+    public Observable<Row> findMetricsByTagNameValue(String tenantId, String tag, String ... tvalues) {
+        return rxSession.executeAndFetch(findMetricsByTagNameValue.bind(tenantId, tag, Arrays.asList(tvalues)));
     }
 
     @Override

core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 Red Hat, Inc. and/or its affiliates
+ * Copyright 2014-2018 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -182,6 +182,7 @@ public int hashCode() {
     /**
      * Tools that do tag query parsing and execution
      */
+    private boolean disableACostOptimization;
     private SimpleTagQueryParser tagQueryParser;
     private ExpressionTagQueryParser expresssionTagQueryParser;
 
@@ -269,7 +270,7 @@ public void startUp(Session session, String keyspace, boolean resetDb, boolean c
         setDefaultTTL(session, keyspace);
         initMetrics();
 
-        tagQueryParser = new SimpleTagQueryParser(this.dataAccess, this);
+        tagQueryParser = new SimpleTagQueryParser(this.dataAccess, this, disableACostOptimization);
         expresssionTagQueryParser = new ExpressionTagQueryParser(this.dataAccess, this);
     }
 
@@ -344,6 +345,7 @@ private void initConfiguration(Session session) {
         log.infoInsertRetryConfig(insertMaxRetries, insertRetryMaxDelay);
 
         defaultPageSize = Integer.parseInt(configuration.get("page-size", "5000"));
+        disableACostOptimization = Boolean.parseBoolean(configuration.get("disable.parser.optimization", "false"));
     }
 
     private void setDefaultTTL(Session session, String keyspace) {