merge master

.asf.yaml

@@ -32,11 +32,11 @@ github:
   collaborators:
     - sullis
     - yashmayya
-    - abhioncbr
     - shounakmk219
     - itschrispeck
     - zhtaoxiang
     - soumitra-st
-    - swaminathanmanish
     - suddendust
     - vrajat
+    - deepthi912
+    - timveil

.gitignore

@@ -6,7 +6,8 @@ cscope.*
 .externalToolBuilders/
 maven-eclipse.xml
 target/
-examples/
+/examples/
+/logs/
 bin/
 */bin/
 .idea

helm/index.yaml

@@ -3,7 +3,35 @@ entries:
   pinot:
   - apiVersion: v1
     appVersion: 1.0.0
-    created: "2024-05-30T09:29:30.175007-04:00"
+    created: "2024-10-04T14:07:23.8044492-04:00"
+    dependencies:
+    - condition: pinot.zookeeper.enabled,zookeeper.enabled
+      name: zookeeper
+      repository: https://charts.bitnami.com/bitnami
+      version: 13.x.x
+    description: Apache Pinot is a realtime distributed OLAP datastore, which is used
+      to deliver scalable real time analytics with low latency. It can ingest data
+      from offline data sources (such as Hadoop and flat files) as well as online
+      sources (such as Kafka). Pinot is designed to scale horizontally.
+    digest: e1d403bd3315e3e162b70cb3e481f024afcce2a8ccd3cf4193532d8ae1455d5a
+    home: https://pinot.apache.org/
+    keywords:
+    - olap
+    - analytics
+    - database
+    - pinot
+    maintainers:
+    - email: dev@pinot.apache.org
+      name: pinot-dev
+    name: pinot
+    sources:
+    - https://github.com/apache/pinot/tree/master/helm
+    urls:
+    - pinot-0.3.0.tgz
+    version: 0.3.0
+  - apiVersion: v1
+    appVersion: 1.0.0
+    created: "2024-10-04T14:07:23.7984481-04:00"
     dependencies:
     - condition: pinot.zookeeper.enabled,zookeeper.enabled
       name: zookeeper

helm/pinot/Chart.yaml

@@ -21,7 +21,7 @@ apiVersion: v1
 appVersion: 1.0.0
 name: pinot
 description: Apache Pinot is a realtime distributed OLAP datastore, which is used to deliver scalable real time analytics with low latency. It can ingest data from offline data sources (such as Hadoop and flat files) as well as online sources (such as Kafka). Pinot is designed to scale horizontally.
-version: 0.3.0-SNAPSHOT
+version: 0.3.1-SNAPSHOT
 keywords:
   - olap
   - analytics

pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/QueryValidationTest.java

@@ -117,7 +117,7 @@ public void testRejectGroovyQuery() {
   public void testReplicaGroupToQueryInvalidQuery() {
     PinotQuery pinotQuery =
         CalciteSqlParser.compileToPinotQuery("SET numReplicaGroupsToQuery='illegal'; SELECT COUNT(*) FROM MY_TABLE");
-    Assert.assertThrows(IllegalStateException.class,
+    Assert.assertThrows(IllegalArgumentException.class,
         () -> BaseSingleStageBrokerRequestHandler.validateRequest(pinotQuery, 10));
   }
 

pinot-common/pom.xml

@@ -245,7 +245,7 @@
     </dependency>
     <dependency>
       <groupId>com.google.auto.service</groupId>
-      <artifactId>auto-service</artifactId>
+      <artifactId>auto-service-annotations</artifactId>
     </dependency>
 
     <!-- Test -->

pinot-common/src/main/java/org/apache/pinot/common/function/scalar/ObjectFunctions.java

@@ -53,38 +53,8 @@ public static boolean isNotDistinctFrom(@Nullable Object obj1, @Nullable Object
   }
 
   @Nullable
-  public static Object coalesce(@Nullable Object obj) {
-    return coalesceVar(obj);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true)
-  public static Object coalesce(@Nullable Object obj1, @Nullable Object obj2) {
-    return coalesceVar(obj1, obj2);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true)
-  public static Object coalesce(@Nullable Object obj1, @Nullable Object obj2, @Nullable Object obj3) {
-    return coalesceVar(obj1, obj2, obj3);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true)
-  public static Object coalesce(@Nullable Object obj1, @Nullable Object obj2, @Nullable Object obj3,
-      @Nullable Object obj4) {
-    return coalesceVar(obj1, obj2, obj3, obj4);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true)
-  public static Object coalesce(@Nullable Object obj1, @Nullable Object obj2, @Nullable Object obj3,
-      @Nullable Object obj4, @Nullable Object obj5) {
-    return coalesceVar(obj1, obj2, obj3, obj4, obj5);
-  }
-
-  @Nullable
-  private static Object coalesceVar(Object... objects) {
+  @ScalarFunction(nullableParameters = true, isVarArg = true)
+  public static Object coalesce(Object... objects) {
     for (Object o : objects) {
       if (o != null) {
         return o;
@@ -94,146 +64,8 @@ private static Object coalesceVar(Object... objects) {
   }
 
   @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Boolean c6, @Nullable Object o6, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, c6, o6, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Boolean c6, @Nullable Object o6, @Nullable Boolean c7, @Nullable Object o7,
-      @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, c6, o6, c7, o7, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Boolean c6, @Nullable Object o6, @Nullable Boolean c7, @Nullable Object o7,
-      @Nullable Boolean c8, @Nullable Object o8, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, c6, o6, c7, o7, c8, o8, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Boolean c6, @Nullable Object o6, @Nullable Boolean c7, @Nullable Object o7,
-      @Nullable Boolean c8, @Nullable Object o8, @Nullable Boolean c9, @Nullable Object o9, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, c6, o6, c7, o7, c8, o8, c9, o9, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Boolean c6, @Nullable Object o6, @Nullable Boolean c7, @Nullable Object o7,
-      @Nullable Boolean c8, @Nullable Object o8, @Nullable Boolean c9, @Nullable Object o9, @Nullable Boolean c10,
-      @Nullable Object o10, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, c6, o6, c7, o7, c8, o8, c9, o9, c10, o10, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Boolean c6, @Nullable Object o6, @Nullable Boolean c7, @Nullable Object o7,
-      @Nullable Boolean c8, @Nullable Object o8, @Nullable Boolean c9, @Nullable Object o9, @Nullable Boolean c10,
-      @Nullable Object o10, @Nullable Boolean c11, @Nullable Object o11, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, c6, o6, c7, o7, c8, o8, c9, o9, c10, o10, c11, o11, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Boolean c6, @Nullable Object o6, @Nullable Boolean c7, @Nullable Object o7,
-      @Nullable Boolean c8, @Nullable Object o8, @Nullable Boolean c9, @Nullable Object o9, @Nullable Boolean c10,
-      @Nullable Object o10, @Nullable Boolean c11, @Nullable Object o11, @Nullable Boolean c12, @Nullable Object o12,
-      @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, c6, o6, c7, o7, c8, o8, c9, o9, c10, o10, c11, o11, c12,
-        o12, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Boolean c6, @Nullable Object o6, @Nullable Boolean c7, @Nullable Object o7,
-      @Nullable Boolean c8, @Nullable Object o8, @Nullable Boolean c9, @Nullable Object o9, @Nullable Boolean c10,
-      @Nullable Object o10, @Nullable Boolean c11, @Nullable Object o11, @Nullable Boolean c12, @Nullable Object o12,
-      @Nullable Boolean c13, @Nullable Object o13, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, c6, o6, c7, o7, c8, o8, c9, o9, c10, o10, c11, o11, c12,
-        o12, c13, o13, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Boolean c6, @Nullable Object o6, @Nullable Boolean c7, @Nullable Object o7,
-      @Nullable Boolean c8, @Nullable Object o8, @Nullable Boolean c9, @Nullable Object o9, @Nullable Boolean c10,
-      @Nullable Object o10, @Nullable Boolean c11, @Nullable Object o11, @Nullable Boolean c12, @Nullable Object o12,
-      @Nullable Boolean c13, @Nullable Object o13, @Nullable Boolean c14, @Nullable Object o14, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, c6, o6, c7, o7, c8, o8, c9, o9, c10, o10, c11, o11, c12,
-        o12, c13, o13, c14, o14, oe);
-  }
-
-  @Nullable
-  @ScalarFunction(nullableParameters = true, names = {"case", "caseWhen"})
-  public static Object caseWhen(@Nullable Boolean c1, @Nullable Object o1, @Nullable Boolean c2, @Nullable Object o2,
-      @Nullable Boolean c3, @Nullable Object o3, @Nullable Boolean c4, @Nullable Object o4, @Nullable Boolean c5,
-      @Nullable Object o5, @Nullable Boolean c6, @Nullable Object o6, @Nullable Boolean c7, @Nullable Object o7,
-      @Nullable Boolean c8, @Nullable Object o8, @Nullable Boolean c9, @Nullable Object o9, @Nullable Boolean c10,
-      @Nullable Object o10, @Nullable Boolean c11, @Nullable Object o11, @Nullable Boolean c12, @Nullable Object o12,
-      @Nullable Boolean c13, @Nullable Object o13, @Nullable Boolean c14, @Nullable Object o14, @Nullable Boolean c15,
-      @Nullable Object o15, @Nullable Object oe) {
-    return caseWhenVar(c1, o1, c2, o2, c3, o3, c4, o4, c5, o5, c6, o6, c7, o7, c8, o8, c9, o9, c10, o10, c11, o11, c12,
-        o12, c13, o13, c14, o14, c15, o15, oe);
-  }
-
-  @Nullable
-  private static Object caseWhenVar(Object... objs) {
+  @ScalarFunction(names = {"case", "caseWhen"}, nullableParameters = true, isVarArg = true)
+  public static Object caseWhen(Object... objs) {
     for (int i = 0; i < objs.length - 1; i += 2) {
       if (Boolean.TRUE.equals(objs[i])) {
         return objs[i + 1];
@@ -242,4 +74,14 @@ private static Object caseWhenVar(Object... objs) {
     // with or without else statement.
     return objs.length % 2 == 0 ? null : objs[objs.length - 1];
   }
+
+  @Nullable
+  @ScalarFunction(nullableParameters = true)
+  public static Object nullIf(@Nullable Object obj1, @Nullable Object obj2) {
+    if (obj1 == null) {
+      return null;
+    } else {
+      return obj1.equals(obj2) ? null : obj1;
+    }
+  }
 }