You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ja...@apache.org on 2023/07/27 19:48:34 UTC
[pinot] branch master updated: Remove Java 8 incompatible code (#11197)
This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 44baeb3a24 Remove Java 8 incompatible code (#11197)
44baeb3a24 is described below
commit 44baeb3a24ba46c8b789872715c3fc17fb6727b2
Author: Prachi Khobragade <pk...@linkedin.com>
AuthorDate: Thu Jul 27 12:48:27 2023 -0700
Remove Java 8 incompatible code (#11197)
---
.../pinot/controller/api/resources/PinotTableRestletResource.java | 3 ++-
.../apache/pinot/core/operator/filter/AndFilterOperatorTest.java | 8 +++++---
.../apache/pinot/core/operator/filter/NotFilterOperatorTest.java | 8 ++++----
.../apache/pinot/core/operator/filter/OrFilterOperatorTest.java | 5 +++--
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java
index 7e38b1bde6..25bbb06285 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotTableRestletResource.java
@@ -84,6 +84,7 @@ import org.apache.pinot.common.metrics.ControllerMetrics;
import org.apache.pinot.common.restlet.resources.TableSegmentValidationInfo;
import org.apache.pinot.common.utils.helix.HelixHelper;
import org.apache.pinot.controller.ControllerConf;
+import org.apache.pinot.controller.api.access.AccessControl;
import org.apache.pinot.controller.api.access.AccessControlFactory;
import org.apache.pinot.controller.api.access.AccessControlUtils;
import org.apache.pinot.controller.api.access.AccessType;
@@ -402,7 +403,7 @@ public class PinotTableRestletResource {
_accessControlFactory.create());
// Check access for different state types
- var accessControl = _accessControlFactory.create();
+ AccessControl accessControl = _accessControlFactory.create();
switch (stateType) {
case ENABLE:
if (!accessControl.hasAccess(httpHeaders, TargetType.TABLE, tableName, Actions.Table.ENABLE_TABLE)) {
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/AndFilterOperatorTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/AndFilterOperatorTest.java
index 69a6384ae1..fa7320969a 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/AndFilterOperatorTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/AndFilterOperatorTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.pinot.core.operator.filter;
+import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -173,8 +174,8 @@ public class AndFilterOperatorTest {
Arrays.asList(new TestFilterOperator(docIds1, nullDocIds1, numDocs),
new TestFilterOperator(docIds2, nullDocIds2, numDocs)), null, numDocs, true);
- Assert.assertEquals(TestUtils.getDocIds(andFilterOperator.getTrues()), List.of(1, 2));
- Assert.assertEquals(TestUtils.getDocIds(andFilterOperator.getFalses()), List.of(0, 7, 8, 9));
+ Assert.assertEquals(TestUtils.getDocIds(andFilterOperator.getTrues()), ImmutableList.of(1, 2));
+ Assert.assertEquals(TestUtils.getDocIds(andFilterOperator.getFalses()), ImmutableList.of(0, 7, 8, 9));
}
@Test
@@ -188,6 +189,7 @@ public class AndFilterOperatorTest {
numDocs, true);
Assert.assertEquals(TestUtils.getDocIds(andFilterOperator.getTrues()), Collections.emptyList());
- Assert.assertEquals(TestUtils.getDocIds(andFilterOperator.getFalses()), List.of(0, 1, 2, 3, 4, 5, 6, 7, 8, 9));
+ Assert.assertEquals(TestUtils.getDocIds(andFilterOperator.getFalses()),
+ ImmutableList.of(0, 1, 2, 3, 4, 5, 6, 7, 8, 9));
}
}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/NotFilterOperatorTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/NotFilterOperatorTest.java
index b0f8999066..cd0ea76115 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/NotFilterOperatorTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/NotFilterOperatorTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.pinot.core.operator.filter;
+import com.google.common.collect.ImmutableList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import org.apache.pinot.core.common.BlockDocIdIterator;
import org.apache.pinot.segment.spi.Constants;
@@ -55,8 +55,8 @@ public class NotFilterOperatorTest {
NotFilterOperator notFilterOperator =
new NotFilterOperator(new TestFilterOperator(docIds, nullDocIds, numDocs), numDocs, true);
- Assert.assertEquals(TestUtils.getDocIds(notFilterOperator.getTrues()), List.of(7, 8, 9));
- Assert.assertEquals(TestUtils.getDocIds(notFilterOperator.getFalses()), List.of(0, 1, 2, 3));
+ Assert.assertEquals(TestUtils.getDocIds(notFilterOperator.getTrues()), ImmutableList.of(7, 8, 9));
+ Assert.assertEquals(TestUtils.getDocIds(notFilterOperator.getFalses()), ImmutableList.of(0, 1, 2, 3));
}
@Test
@@ -65,7 +65,7 @@ public class NotFilterOperatorTest {
NotFilterOperator notFilterOperator = new NotFilterOperator(EmptyFilterOperator.getInstance(), numDocs, true);
- Assert.assertEquals(TestUtils.getDocIds(notFilterOperator.getTrues()), List.of(0, 1, 2, 3, 4));
+ Assert.assertEquals(TestUtils.getDocIds(notFilterOperator.getTrues()), ImmutableList.of(0, 1, 2, 3, 4));
Assert.assertEquals(TestUtils.getDocIds(notFilterOperator.getFalses()), Collections.emptyList());
}
}
diff --git a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/OrFilterOperatorTest.java b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/OrFilterOperatorTest.java
index 400d75a47d..6e634351e9 100644
--- a/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/OrFilterOperatorTest.java
+++ b/pinot-core/src/test/java/org/apache/pinot/core/operator/filter/OrFilterOperatorTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.pinot.core.operator.filter;
+import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -120,8 +121,8 @@ public class OrFilterOperatorTest {
Arrays.asList(new TestFilterOperator(docIds1, nullDocIds1, numDocs),
new TestFilterOperator(docIds2, nullDocIds2, numDocs)), null, numDocs, true);
- Assert.assertEquals(TestUtils.getDocIds(orFilterOperator.getTrues()), List.of(0, 1, 2, 3));
- Assert.assertEquals(TestUtils.getDocIds(orFilterOperator.getFalses()), List.of(8, 9));
+ Assert.assertEquals(TestUtils.getDocIds(orFilterOperator.getTrues()), ImmutableList.of(0, 1, 2, 3));
+ Assert.assertEquals(TestUtils.getDocIds(orFilterOperator.getFalses()), ImmutableList.of(8, 9));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org