remove preaggregate and timeseries datamap

README.md

@@ -57,9 +57,7 @@ CarbonData is built using Apache Maven, to [build CarbonData](https://github.com
  * [Data Types](https://github.com/apache/carbondata/blob/master/docs/supported-data-types-in-carbondata.md) 
 * [CarbonData DataMap Management](https://github.com/apache/carbondata/blob/master/docs/datamap/datamap-management.md) 
  * [CarbonData BloomFilter DataMap](https://github.com/apache/carbondata/blob/master/docs/datamap/bloomfilter-datamap-guide.md) 
- * [CarbonData Lucene DataMap](https://github.com/apache/carbondata/blob/master/docs/datamap/lucene-datamap-guide.md) 
- * [CarbonData Pre-aggregate DataMap](https://github.com/apache/carbondata/blob/master/docs/datamap/preaggregate-datamap-guide.md) 
- * [CarbonData Timeseries DataMap](https://github.com/apache/carbondata/blob/master/docs/datamap/timeseries-datamap-guide.md) 
+ * [CarbonData Lucene DataMap](https://github.com/apache/carbondata/blob/master/docs/datamap/lucene-datamap-guide.md)   
  * [CarbonData MV DataMap](https://github.com/apache/carbondata/blob/master/docs/datamap/mv-datamap-guide.md)
 * [SDK Guide](https://github.com/apache/carbondata/blob/master/docs/sdk-guide.md) 
 * [C++ SDK Guide](https://github.com/apache/carbondata/blob/master/docs/csdk-guide.md)

core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java

@@ -1501,13 +1501,6 @@ private CarbonCommonConstants() {
   @CarbonProperty(dynamicConfigurable = true)
   public static final String CARBON_DATAMAP_VISIBLE = "carbon.datamap.visible.";
 
-  /**
-   * Fetch and validate the segments.
-   * Used for aggregate table load as segment validation is not required.
-   */
-  @CarbonProperty(dynamicConfigurable = true)
-  public static final String VALIDATE_CARBON_INPUT_SEGMENTS = "validate.carbon.input.segments.";
-
   /**
    * Whether load/insert command is fired internally or by the user.
    * Used to block load/insert on pre-aggregate if fired by user

core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstantsInternal.java

@@ -23,8 +23,6 @@
  */
 public interface CarbonCommonConstantsInternal {
 
-  String QUERY_ON_PRE_AGG_STREAMING = "carbon.query.on.preagg.streaming.";
-
   String ROW_COUNT = "rowCount";
 
 }

core/src/main/java/org/apache/carbondata/core/datamap/DataMapStoreManager.java

@@ -52,7 +52,6 @@
 import org.apache.carbondata.core.util.ThreadLocalSessionInfo;
 
 import static org.apache.carbondata.core.metadata.schema.datamap.DataMapClassProvider.MV;
-import static org.apache.carbondata.core.metadata.schema.datamap.DataMapClassProvider.PREAGGREGATE;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -200,10 +199,6 @@ public void updateDataMapSchema(List<DataMapSchema> dataMapSchemaList,
       String dataBaseName =  relationIdentifier.getDatabaseName();
       String tableId = relationIdentifier.getTableId();
       String providerName = dataMapSchema.getProviderName();
-      // if the preaggregate datamap,not be modified the schema
-      if (providerName.equalsIgnoreCase(PREAGGREGATE.toString())) {
-        continue;
-      }
       // if the mv datamap,not be modified the relationIdentifier
       if (!providerName.equalsIgnoreCase(MV.toString())) {
         RelationIdentifier newRelationIdentifier = new RelationIdentifier(dataBaseName,

core/src/main/java/org/apache/carbondata/core/datamap/DataMapUtil.java

@@ -261,7 +261,7 @@ public static SegmentStatusManager.ValidAndInvalidSegmentsInfo getValidAndInvali
       CarbonTable carbonTable, Configuration configuration) throws IOException {
     SegmentStatusManager ssm =
         new SegmentStatusManager(carbonTable.getAbsoluteTableIdentifier(), configuration);
-    return ssm.getValidAndInvalidSegments(carbonTable.isChildTable());
+    return ssm.getValidAndInvalidSegments(carbonTable.isChildTableForMV());
   }
 
   /**

core/src/main/java/org/apache/carbondata/core/metadata/SegmentFileStore.java

@@ -915,7 +915,7 @@ public static void commitDropPartitions(CarbonTable carbonTable, String uniqueId
     if (toBeDeleteSegments.size() > 0 || toBeUpdatedSegments.size() > 0) {
       Set<Segment> segmentSet = new HashSet<>(
           new SegmentStatusManager(carbonTable.getAbsoluteTableIdentifier())
-              .getValidAndInvalidSegments(carbonTable.isChildTable()).getValidSegments());
+              .getValidAndInvalidSegments(carbonTable.isChildTableForMV()).getValidSegments());
       CarbonUpdateUtil.updateTableMetadataStatus(segmentSet, carbonTable, uniqueId, true,
           Segment.toSegmentList(toBeDeleteSegments, null),
           Segment.toSegmentList(toBeUpdatedSegments, null), uuid);

core/src/main/java/org/apache/carbondata/core/metadata/schema/datamap/DataMapClassProvider.java

@@ -27,8 +27,6 @@
  */
 
 public enum DataMapClassProvider {
-  PREAGGREGATE("org.apache.carbondata.core.datamap.AggregateDataMap", "preaggregate"),
-  TIMESERIES("org.apache.carbondata.core.datamap.TimeSeriesDataMap", "timeseries"),
   LUCENE("org.apache.carbondata.datamap.lucene.LuceneFineGrainDataMapFactory", "lucene"),
   BLOOMFILTER("org.apache.carbondata.datamap.bloom.BloomCoarseGrainDataMapFactory", "bloomfilter"),
   MV("org.apache.carbondata.core.datamap.MVDataMap", "mv");
@@ -63,11 +61,7 @@ private boolean isEqual(String dataMapClass) {
   }
 
   public static DataMapClassProvider getDataMapProviderOnName(String dataMapShortname) {
-    if (TIMESERIES.isEqual(dataMapShortname)) {
-      return TIMESERIES;
-    } else if (PREAGGREGATE.isEqual(dataMapShortname)) {
-      return PREAGGREGATE;
-    } else if (LUCENE.isEqual(dataMapShortname)) {
+    if (LUCENE.isEqual(dataMapShortname)) {
       return LUCENE;
     } else if (BLOOMFILTER.isEqual(dataMapShortname)) {
       return BLOOMFILTER;