Extract an AbstractQuery

Extracts an AbstractQuery from the TsdbQuery implementation since we'd like to reuse some parts of it in other Query classes (in this case SplitRollupQuery)
OpenTSDB · johann8384 · Feb 24, 2021 · Oct 16, 2019 · Oct 16, 2019 · Oct 28, 2019
commit 03e05e9b19dd9382cdff6f1154a81e21657d9289
diff --git a/Makefile.am b/Makefile.am
@@ -32,6 +32,7 @@ dist_noinst_DATA = pom.xml.in build-aux/rpm/opentsdb.conf \
   build-aux/rpm/logback.xml build-aux/rpm/init.d/opentsdb \
   build-aux/rpm/systemd/[email protected]
 tsdb_SRC := \
+	src/core/AbstractQuery.java \
 	src/core/AggregationIterator.java	\
 	src/core/Aggregator.java	\
 	src/core/Aggregators.java	\

diff --git a/src/core/AbstractQuery.java b/src/core/AbstractQuery.java
@@ -0,0 +1,66 @@
+// This file is part of OpenTSDB.
+// Copyright (C) 2010-2012  The OpenTSDB Authors.
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 2.1 of the License, or (at your
+// option) any later version.  This program is distributed in the hope that it
+// will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+// General Public License for more details.  You should have received a copy
+// of the GNU Lesser General Public License along with this program.  If not,
+// see <http://www.gnu.org/licenses/>.
+package net.opentsdb.core;
+
+import org.hbase.async.HBaseException;
+
+public abstract class AbstractQuery implements Query {
+    /**
+     * Runs this query.
+     *
+     * @return The data points matched by this query.
+     * <p>
+     * Each element in the non-{@code null} but possibly empty array returned
+     * corresponds to one time series for which some data points have been
+     * matched by the query.
+     * @throws HBaseException if there was a problem communicating with HBase to
+     *                        perform the search.
+     */
+    @Override
+    public DataPoints[] run() throws HBaseException {
+        try {
+            return runAsync().joinUninterruptibly();
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new RuntimeException("Should never be here", e);
+        }
+    }
+
+    /**
+     * Runs this query.
+     *
+     * @return The data points matched by this query and applied with percentile calculation
+     * <p>
+     * Each element in the non-{@code null} but possibly empty array returned
+     * corresponds to one time series for which some data points have been
+     * matched by the query.
+     * @throws HBaseException        if there was a problem communicating with HBase to
+     *                               perform the search.
+     * @throws IllegalStateException if the query is not a histogram query
+     */
+    @Override
+    public DataPoints[] runHistogram() throws HBaseException {
+        if (!isHistogramQuery()) {
+            throw new RuntimeException("Should never be here");
+        }
+
+        try {
+            return runHistogramAsync().joinUninterruptibly();
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new RuntimeException("Should never be here", e);
+        }
+    }
+}
diff --git a/src/core/SplitRollupQuery.java b/src/core/SplitRollupQuery.java
@@ -26,7 +26,7 @@
 import java.util.Map;
 import java.util.TreeSet;
 
-public class SplitRollupQuery implements Query {
+public class SplitRollupQuery extends AbstractQuery {
 
     private TSDB tsdb;
 
@@ -319,57 +319,6 @@ public void downsample(long interval, Aggregator downsampler, FillPolicy fill_po
         rawQuery.downsample(interval, downsampler, fill_policy);
     }
 
-    /**
-     * Runs this query.
-     *
-     * @return The data points matched by this query.
-     * <p>
-     * Each element in the non-{@code null} but possibly empty array returned
-     * corresponds to one time series for which some data points have been
-     * matched by the query.
-     * @throws HBaseException if there was a problem communicating with HBase to
-     *                        perform the search.
-     */
-    @Override
-    public DataPoints[] run() throws HBaseException {
-        // TODO: Avoid duplication
-        try {
-            return runAsync().joinUninterruptibly();
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException("Should never be here", e);
-        }
-    }
-
-    /**
-     * Runs this query.
-     *
-     * @return The data points matched by this query and applied with percentile calculation
-     * <p>
-     * Each element in the non-{@code null} but possibly empty array returned
-     * corresponds to one time series for which some data points have been
-     * matched by the query.
-     * @throws HBaseException        if there was a problem communicating with HBase to
-     *                               perform the search.
-     * @throws IllegalStateException if the query is not a histogram query
-     */
-    @Override
-    public DataPoints[] runHistogram() throws HBaseException {
-        // TODO: Avoid duplication
-        if (!isHistogramQuery()) {
-            throw new RuntimeException("Should never be here");
-        }
-
-        try {
-            return runHistogramAsync().joinUninterruptibly();
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new RuntimeException("Should never be here", e);
-        }
-    }
-
     /**
      * Executes the query asynchronously
      *

diff --git a/src/core/TsdbQuery.java b/src/core/TsdbQuery.java
@@ -61,7 +61,7 @@
 /**
  * Non-synchronized implementation of {@link Query}.
  */
-final class TsdbQuery implements Query {
+final class TsdbQuery extends AbstractQuery {
 
   private static final Logger LOG = LoggerFactory.getLogger(TsdbQuery.class);
 
@@ -739,40 +739,7 @@ private void findGroupBys() {
       }
     }
   }
-  /**
-   * Executes the query.
-   * NOTE: Do not run the same query multiple times. Construct a new query with
-   * the same parameters again if needed
-   * TODO(cl) There are some strange occurrences when unit testing where the end
-   * time, if not set, can change between calls to run()
-   * @return An array of data points with one time series per array value
-   */
-  @Override
-  public DataPoints[] run() throws HBaseException {
-    try {
-      return runAsync().joinUninterruptibly();
-    } catch (RuntimeException e) {
-      throw e;
-    } catch (Exception e) {
-      throw new RuntimeException("Should never be here", e);
-    }
-  }
-
-  @Override
-  public DataPoints[] runHistogram() throws HBaseException {
-    if (!isHistogramQuery()) {
-      throw new RuntimeException("Should never be here");
-    }
-
-    try {
-      return runHistogramAsync().joinUninterruptibly();
-    } catch (RuntimeException e) {
-      throw e;
-    } catch (Exception e) {
-      throw new RuntimeException("Should never be here", e);
-    }
-  }
-
+
   @Override
   public Deferred<DataPoints[]> runAsync() throws HBaseException {
     Deferred<DataPoints[]> result = null;