You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by sn...@apache.org on 2020/09/18 01:36:19 UTC
[incubator-pinot] branch master updated: Improve the realtime time
creation unit test (#6032)
This is an automated email from the ASF dual-hosted git repository.
snlee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new d9aec17 Improve the realtime time creation unit test (#6032)
d9aec17 is described below
commit d9aec1735ea3a7f6962c3fb4c069aaac912439f8
Author: Seunghyun Lee <sn...@linkedin.com>
AuthorDate: Thu Sep 17 18:36:07 2020 -0700
Improve the realtime time creation unit test (#6032)
1. Added the precondition check for time interval from segment metadata
2. Added the unit test to check the case when the invalid time column name
is configured in the table config
---
.../controller/helix/core/PinotHelixResourceManager.java | 1 -
.../helix/core/realtime/PinotLLCRealtimeSegmentManager.java | 2 ++
.../pinot/controller/api/PinotTableRestletResourceTest.java | 13 ++++++++++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
index 11d2135..5a304ec 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
@@ -25,7 +25,6 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
-import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java
index d672155..a06e0fb 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/realtime/PinotLLCRealtimeSegmentManager.java
@@ -504,6 +504,8 @@ public class PinotLLCRealtimeSegmentManager {
committingSegmentZKMetadata.setDownloadUrl(isPeerURL(committingSegmentDescriptor.getSegmentLocation())
? CommonConstants.Segment.METADATA_URI_FOR_PEER_DOWNLOAD : committingSegmentDescriptor.getSegmentLocation());
committingSegmentZKMetadata.setCrc(Long.valueOf(segmentMetadata.getCrc()));
+ Preconditions.checkNotNull(segmentMetadata.getTimeInterval(),
+ "start/end time information is not correctly written to the segment for table: " + realtimeTableName);
committingSegmentZKMetadata.setStartTime(segmentMetadata.getTimeInterval().getStartMillis());
committingSegmentZKMetadata.setEndTime(segmentMetadata.getTimeInterval().getEndMillis());
committingSegmentZKMetadata.setTimeUnit(TimeUnit.MILLISECONDS);
diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java
index d1cd559..5ed35f8 100644
--- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java
+++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/PinotTableRestletResourceTest.java
@@ -158,8 +158,19 @@ public class PinotTableRestletResourceTest extends ControllerTest {
realtimeTableConfig = _realtimeBuilder.setSchemaName(REALTIME_TABLE_NAME).build();
sendPostRequest(_createTableUrl, realtimeTableConfig.toJsonString());
+ // Create a REALTIME table with the invalid time column name should fail
+ realtimeTableConfig =
+ _realtimeBuilder.setTableName(REALTIME_TABLE_NAME).setTimeColumnName("invalidTimeColumn").build();
+ try {
+ sendPostRequest(_createTableUrl, realtimeTableConfig.toJsonString());
+ Assert.fail("Creation of a REALTIME table with a invalid time column name does not fail");
+ } catch (IOException e) {
+ // Expected 400 Bad Request
+ Assert.assertTrue(e.getMessage().startsWith("Server returned HTTP response code: 400"));
+ }
+
// Create a REALTIME table with a valid name and schema which should succeed
- realtimeTableConfig = _realtimeBuilder.setTableName(REALTIME_TABLE_NAME).build();
+ realtimeTableConfig = _realtimeBuilder.setTableName(REALTIME_TABLE_NAME).setTimeColumnName("timeColumn").build();
String realtimeTableConfigString = realtimeTableConfig.toJsonString();
sendPostRequest(_createTableUrl, realtimeTableConfigString);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org