From 9de946673b9fbbbf5d0f2de1296af551f94b0ae6 Mon Sep 17 00:00:00 2001
From: xuchuanyin <xuchuanyin@hust.edu.cn>
Date: Fri, 26 Oct 2018 16:51:59 +0800
Subject: [PATCH] [CARBONDATA-3046][Doc] Remove useless configurations in
 template properties

some of the configurations is outdated, this PR removes them from the
template properties file.

This closes #2860
---
 conf/carbon.properties.template | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/conf/carbon.properties.template b/conf/carbon.properties.template
index 9dd037f6564..c6ece7455c8 100644
--- a/conf/carbon.properties.template
+++ b/conf/carbon.properties.template
@@ -37,9 +37,11 @@ carbon.sort.size=100000
 carbon.enableXXHash=true
 #enable prefetch of data during merge sort while reading data from sort temp files in data loading
 #carbon.merge.sort.prefetch=true
+
 ######## Alter Partition Configuration ########
 #Number of cores to be used while alter partition
 carbon.number.of.cores.while.alterPartition=2
+
 ######## Compaction Configuration ########
 #Number of cores to be used while compacting
 carbon.number.of.cores.while.compacting=2
@@ -47,15 +49,12 @@ carbon.number.of.cores.while.compacting=2
 carbon.compaction.level.threshold=4,3
 #default size (in MB) for major compaction to be triggered
 carbon.major.compaction.size=1024
-######## Query Configuration ########
-#Number of records to be in memory while querying :MIN=100000:MAX=240000
-carbon.inmemory.record.size=120000
-##number of core to load the blocks in driver
-#no.of.cores.to.load.blocks.in.driver=10
+
 
 #################### Extra Configuration ##################
 ##Timestamp format of input data used for timestamp data type.
 #carbon.timestamp.format=yyyy-MM-dd HH:mm:ss
+
 ######## Dataload Configuration ########
 ##File write buffer size used during sorting.
 #carbon.sort.file.write.buffer.size=16384
@@ -67,17 +66,13 @@ carbon.inmemory.record.size=120000
 #carbon.block.meta.size.reserved.percentage=10
 ##csv reading buffer size.
 #carbon.csv.read.buffersize.byte=1048576
-##maximum no of threads used for reading intermediate files for final merging.
+##no of threads used for reading intermediate files for final merging.
 #carbon.merge.sort.reader.thread=3
 ##Carbon blocklet size. Note: this configuration cannot be change once store is generated
 #carbon.blocklet.size=120000
-##Minimum blocklets needed for distribution.
-#carbon.blockletdistribution.min.blocklet.size=10
-##Interval between the retries to get the lock
-#carbon.load.metadata.lock.retry.timeout.sec=5
-
-##To dissable/enable carbon block distribution
+##To disable/enable carbon block distribution
 #carbon.custom.block.distribution=false
+
 ######## Compaction Configuration ########
 ##to specify number of segments to be preserved from compaction
 #carbon.numberof.preserve.segments=0
@@ -85,11 +80,13 @@ carbon.inmemory.record.size=120000
 #carbon.allowed.compaction.days=0
 ##To enable compaction while data loading
 #carbon.enable.auto.load.merge=false
+
 ######## Query Configuration ########
 ##Maximum time allowed for one query to be executed.
 #max.query.execution.time=60
-##Min max is feature added to enhance query performance. To disable this feature, make it false.
+##Min max feature is added to enhance query performance. To disable this feature, make it false.
 #carbon.enableMinMax=true
+
 ######## Global Dictionary Configurations ########
 ##The property to set the date to be considered as start date for calculating the timestamp.
 #carbon.cutOffTimestamp