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/08/14 07:04:12 UTC
[incubator-pinot] branch master updated: Fix the variable names for
off-heap alloc configs (#5852)
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 6dd54f8 Fix the variable names for off-heap alloc configs (#5852)
6dd54f8 is described below
commit 6dd54f8aee0678dca0c9fb6653a7f894158996ca
Author: Seunghyun Lee <sn...@linkedin.com>
AuthorDate: Fri Aug 14 00:00:30 2020 -0700
Fix the variable names for off-heap alloc configs (#5852)
---
.../data/manager/config/InstanceDataManagerConfig.java | 2 +-
.../manager/realtime/HLRealtimeSegmentDataManager.java | 6 +++---
.../manager/realtime/LLRealtimeSegmentDataManager.java | 4 ++--
.../core/segment/index/loader/IndexLoadingConfig.java | 16 ++++++++--------
.../starter/helix/HelixInstanceDataManagerConfig.java | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/config/InstanceDataManagerConfig.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/config/InstanceDataManagerConfig.java
index 6b2bec9..6422140 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/config/InstanceDataManagerConfig.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/config/InstanceDataManagerConfig.java
@@ -47,7 +47,7 @@ public interface InstanceDataManagerConfig {
boolean isRealtimeOffHeapAllocation();
- boolean isDirectRealtimeOffheapAllocation();
+ boolean isDirectRealtimeOffHeapAllocation();
int getMaxParallelSegmentBuilds();
}
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java
index 7fa51d1..74aea94 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/HLRealtimeSegmentDataManager.java
@@ -191,10 +191,10 @@ public class HLRealtimeSegmentDataManager extends RealtimeSegmentDataManager {
.setNoDictionaryColumns(indexLoadingConfig.getNoDictionaryColumns())
.setVarLengthDictionaryColumns(indexLoadingConfig.getVarLengthDictionaryColumns())
.setInvertedIndexColumns(invertedIndexColumns).setRealtimeSegmentZKMetadata(realtimeSegmentZKMetadata)
- .setOffHeap(indexLoadingConfig.isRealtimeOffheapAllocation()).setMemoryManager(
+ .setOffHeap(indexLoadingConfig.isRealtimeOffHeapAllocation()).setMemoryManager(
getMemoryManager(realtimeTableDataManager.getConsumerDir(), _segmentName,
- indexLoadingConfig.isRealtimeOffheapAllocation(),
- indexLoadingConfig.isDirectRealtimeOffheapAllocation(), serverMetrics))
+ indexLoadingConfig.isRealtimeOffHeapAllocation(),
+ indexLoadingConfig.isDirectRealtimeOffHeapAllocation(), serverMetrics))
.setStatsHistory(realtimeTableDataManager.getStatsHistory())
.setNullHandlingEnabled(indexingConfig.isNullHandlingEnabled()).build();
_realtimeSegment = new MutableSegmentImpl(realtimeSegmentConfig);
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java
index 8944e15..fc43ba2 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java
@@ -1111,7 +1111,7 @@ public class LLRealtimeSegmentDataManager extends RealtimeSegmentDataManager {
segmentLogger = LoggerFactory.getLogger(LLRealtimeSegmentDataManager.class.getName() + "_" + _segmentNameStr);
_tableStreamName = _tableNameWithType + "_" + _streamTopic;
_memoryManager = getMemoryManager(realtimeTableDataManager.getConsumerDir(), _segmentNameStr,
- indexLoadingConfig.isRealtimeOffheapAllocation(), indexLoadingConfig.isDirectRealtimeOffheapAllocation(),
+ indexLoadingConfig.isRealtimeOffHeapAllocation(), indexLoadingConfig.isDirectRealtimeOffHeapAllocation(),
serverMetrics);
List<String> sortedColumns = indexLoadingConfig.getSortedColumns();
@@ -1155,7 +1155,7 @@ public class LLRealtimeSegmentDataManager extends RealtimeSegmentDataManager {
}
_segmentMaxRowCount = segmentMaxRowCount;
- _isOffHeap = indexLoadingConfig.isRealtimeOffheapAllocation();
+ _isOffHeap = indexLoadingConfig.isRealtimeOffHeapAllocation();
_nullHandlingEnabled = indexingConfig.isNullHandlingEnabled();
diff --git a/pinot-core/src/main/java/org/apache/pinot/core/segment/index/loader/IndexLoadingConfig.java b/pinot-core/src/main/java/org/apache/pinot/core/segment/index/loader/IndexLoadingConfig.java
index 3c3fb7e..3691a3c 100644
--- a/pinot-core/src/main/java/org/apache/pinot/core/segment/index/loader/IndexLoadingConfig.java
+++ b/pinot-core/src/main/java/org/apache/pinot/core/segment/index/loader/IndexLoadingConfig.java
@@ -60,8 +60,8 @@ public class IndexLoadingConfig {
private ColumnMinMaxValueGeneratorMode _columnMinMaxValueGeneratorMode = ColumnMinMaxValueGeneratorMode.DEFAULT_MODE;
private int _realtimeAvgMultiValueCount = DEFAULT_REALTIME_AVG_MULTI_VALUE_COUNT;
private boolean _enableSplitCommit;
- private boolean _isRealtimeOffheapAllocation;
- private boolean _isDirectRealtimeOffheapAllocation;
+ private boolean _isRealtimeOffHeapAllocation;
+ private boolean _isDirectRealtimeOffHeapAllocation;
private boolean _enableSplitCommitEndWithMetadata;
private String _segmentStoreURI;
@@ -179,8 +179,8 @@ public class IndexLoadingConfig {
_enableSplitCommit = instanceDataManagerConfig.isEnableSplitCommit();
- _isRealtimeOffheapAllocation = instanceDataManagerConfig.isRealtimeOffHeapAllocation();
- _isDirectRealtimeOffheapAllocation = instanceDataManagerConfig.isDirectRealtimeOffheapAllocation();
+ _isRealtimeOffHeapAllocation = instanceDataManagerConfig.isRealtimeOffHeapAllocation();
+ _isDirectRealtimeOffHeapAllocation = instanceDataManagerConfig.isDirectRealtimeOffHeapAllocation();
String avgMultiValueCount = instanceDataManagerConfig.getAvgMultiValueCount();
if (avgMultiValueCount != null) {
@@ -323,12 +323,12 @@ public class IndexLoadingConfig {
return _enableSplitCommitEndWithMetadata;
}
- public boolean isRealtimeOffheapAllocation() {
- return _isRealtimeOffheapAllocation;
+ public boolean isRealtimeOffHeapAllocation() {
+ return _isRealtimeOffHeapAllocation;
}
- public boolean isDirectRealtimeOffheapAllocation() {
- return _isDirectRealtimeOffheapAllocation;
+ public boolean isDirectRealtimeOffHeapAllocation() {
+ return _isDirectRealtimeOffHeapAllocation;
}
public ColumnMinMaxValueGeneratorMode getColumnMinMaxValueGeneratorMode() {
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManagerConfig.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManagerConfig.java
index a5f235e..41c2744 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManagerConfig.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManagerConfig.java
@@ -103,7 +103,7 @@ public class HelixInstanceDataManagerConfig implements InstanceDataManagerConfig
for (String key: serverConfig.getKeys()) {
LOGGER.info("InstanceDataManagerConfig, key: {} , value: {}", key, serverConfig.getProperty(key));
}
-
+
checkRequiredKeys();
}
@@ -172,7 +172,7 @@ public class HelixInstanceDataManagerConfig implements InstanceDataManagerConfig
}
@Override
- public boolean isDirectRealtimeOffheapAllocation() {
+ public boolean isDirectRealtimeOffHeapAllocation() {
return _instanceDataManagerConfiguration.getProperty(DIRECT_REALTIME_OFFHEAP_ALLOCATION, false);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org