[spi] move intermediary resultset from spi to pinot (#1270)

startreedata · Dec 14, 2023 · 8517990 · 8517990
1 parent 9b15711
commit 8517990
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 21 deletions.
diff --git a/...pinot/src/main/java/ai/startree/thirdeye/plugins/datasource/pinot/PinotQueryExecutor.java b/...pinot/src/main/java/ai/startree/thirdeye/plugins/datasource/pinot/PinotQueryExecutor.java
@@ -13,11 +13,11 @@
  */
 package ai.startree.thirdeye.plugins.datasource.pinot;
 
+import ai.startree.thirdeye.plugins.datasource.pinot.resultset.ThirdEyeDataFrameResultSet;
+import ai.startree.thirdeye.plugins.datasource.pinot.resultset.ThirdEyeResultSet;
+import ai.startree.thirdeye.plugins.datasource.pinot.resultset.ThirdEyeResultSetGroup;
+import ai.startree.thirdeye.plugins.datasource.pinot.resultset.ThirdEyeResultSetMetaData;
 import ai.startree.thirdeye.spi.dataframe.DataFrame;
-import ai.startree.thirdeye.spi.datasource.resultset.ThirdEyeDataFrameResultSet;
-import ai.startree.thirdeye.spi.datasource.resultset.ThirdEyeResultSet;
-import ai.startree.thirdeye.spi.datasource.resultset.ThirdEyeResultSetGroup;
-import ai.startree.thirdeye.spi.datasource.resultset.ThirdEyeResultSetMetaData;
 import ai.startree.thirdeye.spi.detection.v2.ColumnType;
 import ai.startree.thirdeye.spi.detection.v2.ColumnType.ColumnDataType;
 import ai.startree.thirdeye.spi.util.Pair;

diff --git a/.../src/main/java/ai/startree/thirdeye/plugins/datasource/pinot/PinotThirdEyeDataSource.java b/.../src/main/java/ai/startree/thirdeye/plugins/datasource/pinot/PinotThirdEyeDataSource.java
@@ -16,6 +16,8 @@
 import static ai.startree.thirdeye.spi.util.SpiUtils.optional;
 import static java.util.Objects.requireNonNull;
 
+import ai.startree.thirdeye.plugins.datasource.pinot.resultset.ThirdEyeResultSet;
+import ai.startree.thirdeye.plugins.datasource.pinot.resultset.ThirdEyeResultSetGroup;
 import ai.startree.thirdeye.spi.Constants;
 import ai.startree.thirdeye.spi.datalayer.dto.DataSourceDTO;
 import ai.startree.thirdeye.spi.datalayer.dto.DatasetConfigDTO;
@@ -25,8 +27,6 @@
 import ai.startree.thirdeye.spi.datasource.ThirdEyeDataSourceContext;
 import ai.startree.thirdeye.spi.datasource.macro.SqlExpressionBuilder;
 import ai.startree.thirdeye.spi.datasource.macro.SqlLanguage;
-import ai.startree.thirdeye.spi.datasource.resultset.ThirdEyeResultSet;
-import ai.startree.thirdeye.spi.datasource.resultset.ThirdEyeResultSetGroup;
 import ai.startree.thirdeye.spi.detection.v2.DataTable;
 import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;

diff --git a/...c/main/java/ai/startree/thirdeye/plugins/datasource/pinot/ThirdEyeResultSetDataTable.java b/...c/main/java/ai/startree/thirdeye/plugins/datasource/pinot/ThirdEyeResultSetDataTable.java
@@ -13,12 +13,12 @@
  */
 package ai.startree.thirdeye.plugins.datasource.pinot;
 
+import ai.startree.thirdeye.plugins.datasource.pinot.resultset.ThirdEyeResultSet;
 import ai.startree.thirdeye.spi.dataframe.BooleanSeries;
 import ai.startree.thirdeye.spi.dataframe.DataFrame;
 import ai.startree.thirdeye.spi.dataframe.DoubleSeries;
 import ai.startree.thirdeye.spi.dataframe.LongSeries;
 import ai.startree.thirdeye.spi.dataframe.StringSeries;
-import ai.startree.thirdeye.spi.datasource.resultset.ThirdEyeResultSet;
 import ai.startree.thirdeye.spi.detection.v2.AbstractDataTableImpl;
 import ai.startree.thirdeye.spi.detection.v2.ColumnType.ColumnDataType;
 import io.micrometer.core.instrument.Counter;

diff --git a/.../resultset/AbstractThirdEyeResultSet.java → .../resultset/AbstractThirdEyeResultSet.java b/.../resultset/AbstractThirdEyeResultSet.java → .../resultset/AbstractThirdEyeResultSet.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package ai.startree.thirdeye.spi.datasource.resultset;
+package ai.startree.thirdeye.plugins.datasource.pinot.resultset;
 
 public abstract class AbstractThirdEyeResultSet implements ThirdEyeResultSet {
 

diff --git a/...resultset/ThirdEyeDataFrameResultSet.java → ...resultset/ThirdEyeDataFrameResultSet.java b/...resultset/ThirdEyeDataFrameResultSet.java → ...resultset/ThirdEyeDataFrameResultSet.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package ai.startree.thirdeye.spi.datasource.resultset;
+package ai.startree.thirdeye.plugins.datasource.pinot.resultset;
 
 import ai.startree.thirdeye.spi.dataframe.DataFrame;
 import ai.startree.thirdeye.spi.detection.v2.ColumnType;
@@ -30,7 +30,8 @@ public class ThirdEyeDataFrameResultSet extends AbstractThirdEyeResultSet {
   private final ThirdEyeResultSetMetaData thirdEyeResultSetMetaData;
   private final DataFrame dataFrame;
 
-  public ThirdEyeDataFrameResultSet(ThirdEyeResultSetMetaData thirdEyeResultSetMetaData,
+  public ThirdEyeDataFrameResultSet(
+      ThirdEyeResultSetMetaData thirdEyeResultSetMetaData,
       final DataFrame dataFrame) {
     Preconditions.checkState(isMetaDataAndDataHaveSameColumns(thirdEyeResultSetMetaData, dataFrame),
         "Meta data and data's columns do not match.");

diff --git a/...tasource/resultset/ThirdEyeResultSet.java → ...ce/pinot/resultset/ThirdEyeResultSet.java b/...tasource/resultset/ThirdEyeResultSet.java → ...ce/pinot/resultset/ThirdEyeResultSet.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package ai.startree.thirdeye.spi.datasource.resultset;
+package ai.startree.thirdeye.plugins.datasource.pinot.resultset;
 
 import ai.startree.thirdeye.spi.detection.v2.ColumnType;
 

diff --git a/...rce/resultset/ThirdEyeResultSetGroup.java → ...not/resultset/ThirdEyeResultSetGroup.java b/...rce/resultset/ThirdEyeResultSetGroup.java → ...not/resultset/ThirdEyeResultSetGroup.java
@@ -11,12 +11,11 @@
  * See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package ai.startree.thirdeye.spi.datasource.resultset;
+package ai.startree.thirdeye.plugins.datasource.pinot.resultset;
 
-import com.google.common.collect.ImmutableList;
 import java.util.List;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.pinot.client.ResultSetGroup;
 
 /**
  * The ThirdEye's own {@link ResultSetGroup} for storing multiple {@link ThirdEyeResultSet} (i.e.,
@@ -25,7 +24,8 @@
  */
 public class ThirdEyeResultSetGroup {
 
-  private ImmutableList<ThirdEyeResultSet> resultSets = ImmutableList.of();
+  // the list implementation should be immutable
+  private List<ThirdEyeResultSet> resultSets = List.of();
 
   public ThirdEyeResultSetGroup(List<ThirdEyeResultSet> resultSets) {
     this.setResultSets(resultSets);
@@ -40,11 +40,7 @@ public ThirdEyeResultSet get(int idx) {
   }
 
   public void setResultSets(List<ThirdEyeResultSet> resultSets) {
-    if (CollectionUtils.isNotEmpty(resultSets)) {
-      this.resultSets = ImmutableList.copyOf(resultSets);
-    } else {
-      this.resultSets = ImmutableList.of();
-    }
+    this.resultSets = List.copyOf(resultSets);
   }
 
   public List<ThirdEyeResultSet> getResultSets() {

diff --git a/.../resultset/ThirdEyeResultSetMetaData.java → .../resultset/ThirdEyeResultSetMetaData.java b/.../resultset/ThirdEyeResultSetMetaData.java → .../resultset/ThirdEyeResultSetMetaData.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package ai.startree.thirdeye.spi.datasource.resultset;
+package ai.startree.thirdeye.plugins.datasource.pinot.resultset;
 
 import ai.startree.thirdeye.spi.detection.v2.ColumnType;
 import com.google.common.base.Preconditions;