Merge 95168c6 into ed9f445

apache · Jan 1, 2019 · dab53ea · dab53ea
2 parents ed9f445 + 95168c6
commit dab53ea
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 81 deletions.
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/ArrayQueryType.java b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/ArrayQueryType.java
@@ -33,12 +33,12 @@ public class ArrayQueryType extends ComplexQueryType implements GenericQueryType
 
   private GenericQueryType children;
 
-  public ArrayQueryType(String name, String parentname, int blockIndex) {
-    super(name, parentname, blockIndex);
+  public ArrayQueryType(String name, String parentName, int blockIndex) {
+    super(name, parentName, blockIndex);
   }
 
   @Override public void addChildren(GenericQueryType children) {
-    if (this.getName().equals(children.getParentname())) {
+    if (this.getName().equals(children.getParentName())) {
       this.children = children;
     } else {
       this.children.addChildren(children);
@@ -53,12 +53,12 @@ public ArrayQueryType(String name, String parentname, int blockIndex) {
     this.name = name;
   }
 
-  @Override public String getParentname() {
-    return parentname;
+  @Override public String getParentName() {
+    return parentName;
   }
 
-  @Override public void setParentname(String parentname) {
-    this.parentname = parentname;
+  @Override public void setParentName(String parentName) {
+    this.parentName = parentName;
 
   }
 

diff --git a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/ComplexQueryType.java b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/ComplexQueryType.java
@@ -26,13 +26,13 @@
 public class ComplexQueryType {
   protected String name;
 
-  protected String parentname;
+  protected String parentName;
 
   protected int blockIndex;
 
-  public ComplexQueryType(String name, String parentname, int blockIndex) {
+  public ComplexQueryType(String name, String parentName, int blockIndex) {
     this.name = name;
-    this.parentname = parentname;
+    this.parentName = parentName;
     this.blockIndex = blockIndex;
   }
 

diff --git a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/MapQueryType.java b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/MapQueryType.java
@@ -25,8 +25,8 @@
  */
 public class MapQueryType extends ArrayQueryType {
 
-  public MapQueryType(String name, String parentname, int blockIndex) {
-    super(name, parentname, blockIndex);
+  public MapQueryType(String name, String parentName, int blockIndex) {
+    super(name, parentName, blockIndex);
   }
 
   /**

diff --git a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/PrimitiveQueryType.java b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/PrimitiveQueryType.java
@@ -40,7 +40,7 @@
 public class PrimitiveQueryType extends ComplexQueryType implements GenericQueryType {
 
   private String name;
-  private String parentname;
+  private String parentName;
 
   private int keySize;
 
@@ -54,15 +54,15 @@ public class PrimitiveQueryType extends ComplexQueryType implements GenericQuery
 
   private DirectDictionaryGenerator directDictGenForDate;
 
-  public PrimitiveQueryType(String name, String parentname, int blockIndex,
+  public PrimitiveQueryType(String name, String parentName, int blockIndex,
       DataType dataType, int keySize,
       Dictionary dictionary, boolean isDirectDictionary) {
-    super(name, parentname, blockIndex);
+    super(name, parentName, blockIndex);
     this.dataType = dataType;
     this.keySize = keySize;
     this.dictionary = dictionary;
     this.name = name;
-    this.parentname = parentname;
+    this.parentName = parentName;
     this.isDirectDictionary = isDirectDictionary;
     this.isDictionary = (dictionary != null && !isDirectDictionary);
     this.directDictGenForDate =
@@ -81,12 +81,12 @@ public PrimitiveQueryType(String name, String parentname, int blockIndex,
     this.name = name;
   }
 
-  @Override public String getParentname() {
-    return parentname;
+  @Override public String getParentName() {
+    return parentName;
   }
 
-  @Override public void setParentname(String parentname) {
-    this.parentname = parentname;
+  @Override public void setParentName(String parentName) {
+    this.parentName = parentName;
 
   }
 

diff --git a/core/src/main/java/org/apache/carbondata/core/scan/complextypes/StructQueryType.java b/core/src/main/java/org/apache/carbondata/core/scan/complextypes/StructQueryType.java
@@ -35,16 +35,16 @@ public class StructQueryType extends ComplexQueryType implements GenericQueryTyp
 
   private List<GenericQueryType> children = new ArrayList<GenericQueryType>();
   private String name;
-  private String parentname;
+  private String parentName;
 
-  public StructQueryType(String name, String parentname, int blockIndex) {
-    super(name, parentname, blockIndex);
+  public StructQueryType(String name, String parentName, int blockIndex) {
+    super(name, parentName, blockIndex);
     this.name = name;
-    this.parentname = parentname;
+    this.parentName = parentName;
   }
 
   @Override public void addChildren(GenericQueryType newChild) {
-    if (this.getName().equals(newChild.getParentname())) {
+    if (this.getName().equals(newChild.getParentName())) {
       this.children.add(newChild);
     } else {
       for (GenericQueryType child : this.children) {
@@ -62,12 +62,12 @@ public StructQueryType(String name, String parentname, int blockIndex) {
     this.name = name;
   }
 
-  @Override public String getParentname() {
-    return parentname;
+  @Override public String getParentName() {
+    return parentName;
   }
 
-  @Override public void setParentname(String parentname) {
-    this.parentname = parentname;
+  @Override public void setParentName(String parentName) {
+    this.parentName = parentName;
 
   }
 

diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/GenericQueryType.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/GenericQueryType.java
@@ -33,9 +33,9 @@ public interface GenericQueryType {
 
   void setName(String name);
 
-  String getParentname();
+  String getParentName();
 
-  void setParentname(String parentname);
+  void setParentName(String parentName);
 
   void addChildren(GenericQueryType children);
 

diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java
@@ -597,9 +597,9 @@ private void validateNumberOfColumnPerIORead() {
         .getProperty(NUMBER_OF_COLUMN_TO_READ_IN_IO,
             CarbonV3DataFormatConstants.NUMBER_OF_COLUMN_TO_READ_IN_IO_DEFAULTVALUE);
     try {
-      short numberofColumnPerIO = Short.parseShort(numberOfColumnPerIOString);
-      if (numberofColumnPerIO < CarbonV3DataFormatConstants.NUMBER_OF_COLUMN_TO_READ_IN_IO_MIN
-          || numberofColumnPerIO > CarbonV3DataFormatConstants.NUMBER_OF_COLUMN_TO_READ_IN_IO_MAX) {
+      short numberOfColumnPerIO = Short.parseShort(numberOfColumnPerIOString);
+      if (numberOfColumnPerIO < CarbonV3DataFormatConstants.NUMBER_OF_COLUMN_TO_READ_IN_IO_MIN
+          || numberOfColumnPerIO > CarbonV3DataFormatConstants.NUMBER_OF_COLUMN_TO_READ_IN_IO_MAX) {
         LOGGER.info("The Number Of pages per blocklet column value \"" + numberOfColumnPerIOString
             + "\" is invalid. Using the default value \""
             + CarbonV3DataFormatConstants.NUMBER_OF_COLUMN_TO_READ_IN_IO_DEFAULTVALUE);

diff --git a/core/src/test/java/org/apache/carbondata/core/scan/complextypes/ArrayQueryTypeTest.java b/core/src/test/java/org/apache/carbondata/core/scan/complextypes/ArrayQueryTypeTest.java
@@ -48,7 +48,7 @@ public class ArrayQueryTypeTest {
     ByteBuffer surrogateData = ByteBuffer.allocate(10);
     surrogateData.put(3, (byte) 1);
     arrayQueryType.setName("testName");
-    arrayQueryType.setParentname("testName");
+    arrayQueryType.setParentName("testName");
     arrayQueryType.addChildren(arrayQueryType);
     assertNotNull(arrayQueryType.getDataBasedOnDataType(surrogateData));
   }

diff --git a/core/src/test/java/org/apache/carbondata/core/scan/complextypes/StructQueryTypeTest.java b/core/src/test/java/org/apache/carbondata/core/scan/complextypes/StructQueryTypeTest.java
@@ -52,7 +52,7 @@ public class StructQueryTypeTest {
 
   @Test public void testGetColsCount() {
     structQueryType.setName("testName");
-    structQueryType.setParentname("testName");
+    structQueryType.setParentName("testName");
     structQueryType.addChildren(arrayQueryType);
     new MockUp<ArrayQueryType>() {
       @Mock int getColsCount() {

diff --git a/processing/src/main/java/org/apache/carbondata/processing/datatypes/ArrayDataType.java b/processing/src/main/java/org/apache/carbondata/processing/datatypes/ArrayDataType.java
@@ -55,7 +55,7 @@ public class ArrayDataType implements GenericDataType<ArrayObject> {
   /**
    * parent column name
    */
-  private String parentname;
+  private String parentName;
 
   /**
    * output array index
@@ -84,26 +84,26 @@ private ArrayDataType(int outputArrayIndex, int dataCounter, GenericDataType chi
   /**
    * constructor
    * @param name
-   * @param parentname
+   * @param parentName
    * @param columnId
    */
-  public ArrayDataType(String name, String parentname, String columnId) {
+  public ArrayDataType(String name, String parentName, String columnId) {
     this.name = name;
-    this.parentname = parentname;
+    this.parentName = parentName;
     this.columnId = columnId;
   }
 
   /**
    * constructor
    * @param name
-   * @param parentname
+   * @param parentName
    * @param columnId
    * @param isDictionaryColumn
    */
-  public ArrayDataType(String name, String parentname, String columnId,
+  public ArrayDataType(String name, String parentName, String columnId,
       Boolean isDictionaryColumn) {
     this.name = name;
-    this.parentname = parentname;
+    this.parentName = parentName;
     this.columnId = columnId;
     this.isDictionaryColumn = isDictionaryColumn;
   }
@@ -113,7 +113,7 @@ public ArrayDataType(String name, String parentname, String columnId,
    */
   @Override
   public void addChildren(GenericDataType children) {
-    if (this.getName().equals(children.getParentname())) {
+    if (this.getName().equals(children.getParentName())) {
       this.children = children;
     } else {
       this.children.addChildren(children);
@@ -140,8 +140,8 @@ public String getColumnNames() {
    * set parent name
    */
   @Override
-  public String getParentname() {
-    return parentname;
+  public String getParentName() {
+    return parentName;
   }
 
   /*

diff --git a/processing/src/main/java/org/apache/carbondata/processing/datatypes/GenericDataType.java b/processing/src/main/java/org/apache/carbondata/processing/datatypes/GenericDataType.java
@@ -43,7 +43,7 @@ public interface GenericDataType<T> {
   /**
    * @return - columns parent name
    */
-  String getParentname();
+  String getParentName();
 
   /**
    * @param children - To add children dimension for parent complex type

diff --git a/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java b/processing/src/main/java/org/apache/carbondata/processing/datatypes/PrimitiveDataType.java
@@ -83,7 +83,7 @@ public class PrimitiveDataType implements GenericDataType<Object> {
   /**
    * column parent name
    */
-  private String parentname;
+  private String parentName;
 
   /**
    * column unique id
@@ -111,7 +111,7 @@ public class PrimitiveDataType implements GenericDataType<Object> {
 
   private boolean isDictionary;
 
-  private String nullformat;
+  private String nullFormat;
 
   private boolean isDirectDictionary;
 
@@ -133,10 +133,10 @@ private PrimitiveDataType(int outputArrayIndex, int dataCounter) {
   public PrimitiveDataType(String name, DataType dataType, String parentName, String columnId,
       boolean isDictionary, String nullFormat) {
     this.name = name;
-    this.parentname = parentName;
+    this.parentName = parentName;
     this.columnId = columnId;
     this.isDictionary = isDictionary;
-    this.nullformat = nullFormat;
+    this.nullFormat = nullFormat;
     this.dataType = dataType;
   }
 
@@ -157,11 +157,11 @@ public PrimitiveDataType(CarbonColumn carbonColumn, String parentName, String co
       DictionaryClient client, Boolean useOnePass, Map<Object, Integer> localCache,
       String nullFormat) {
     this.name = carbonColumn.getColName();
-    this.parentname = parentName;
+    this.parentName = parentName;
     this.columnId = columnId;
     this.carbonDimension = carbonDimension;
     this.isDictionary = isDictionaryDimension(carbonDimension);
-    this.nullformat = nullFormat;
+    this.nullFormat = nullFormat;
     this.dataType = carbonColumn.getDataType();
 
     DictionaryColumnUniqueIdentifier identifier =
@@ -250,8 +250,8 @@ public String getName() {
    * get column parent name
    */
   @Override
-  public String getParentname() {
-    return parentname;
+  public String getParentName() {
+    return parentName;
   }
 
   /*
@@ -330,7 +330,7 @@ public int getSurrogateIndex() {
       // TODO have to refactor and place all the cases present in NonDictionaryFieldConverterImpl
       if (null == parsedValue && this.carbonDimension.getDataType() != DataTypes.STRING) {
         updateNullValue(dataOutputStream, logHolder);
-      } else if (null == parsedValue || parsedValue.equals(nullformat)) {
+      } else if (null == parsedValue || parsedValue.equals(nullFormat)) {
         updateNullValue(dataOutputStream, logHolder);
       } else {
         String dateFormat = null;
@@ -558,10 +558,10 @@ public GenericDataType<Object> deepCopy() {
     PrimitiveDataType dataType = new PrimitiveDataType(this.outputArrayIndex, 0);
     dataType.carbonDimension = this.carbonDimension;
     dataType.isDictionary = this.isDictionary;
-    dataType.parentname = this.parentname;
+    dataType.parentName = this.parentName;
     dataType.columnId = this.columnId;
     dataType.dictionaryGenerator = this.dictionaryGenerator;
-    dataType.nullformat = this.nullformat;
+    dataType.nullFormat = this.nullFormat;
     dataType.setKeySize(this.keySize);
     dataType.setSurrogateIndex(this.index);
     dataType.name = this.name;

diff --git a/processing/src/main/java/org/apache/carbondata/processing/datatypes/StructDataType.java b/processing/src/main/java/org/apache/carbondata/processing/datatypes/StructDataType.java
@@ -48,7 +48,7 @@ public class StructDataType implements GenericDataType<StructObject> {
   /**
    * parent column name
    */
-  private String parentname;
+  private String parentName;
   /**
    * column unique id
    */
@@ -79,26 +79,26 @@ private StructDataType(List<GenericDataType> children, int outputArrayIndex, int
   /**
    * constructor
    * @param name
-   * @param parentname
+   * @param parentName
    * @param columnId
    */
-  public StructDataType(String name, String parentname, String columnId) {
+  public StructDataType(String name, String parentName, String columnId) {
     this.name = name;
-    this.parentname = parentname;
+    this.parentName = parentName;
     this.columnId = columnId;
   }
 
   /**
    * constructor
    * @param name
-   * @param parentname
+   * @param parentName
    * @param columnId
    * @param isDictionaryColumn
    */
-  public StructDataType(String name, String parentname, String columnId,
+  public StructDataType(String name, String parentName, String columnId,
       Boolean isDictionaryColumn) {
     this.name = name;
-    this.parentname = parentname;
+    this.parentName = parentName;
     this.columnId = columnId;
     this.isDictionaryColumn = isDictionaryColumn;
   }
@@ -108,7 +108,7 @@ public StructDataType(String name, String parentname, String columnId,
    */
   @Override
   public void addChildren(GenericDataType newChild) {
-    if (this.getName().equals(newChild.getParentname())) {
+    if (this.getName().equals(newChild.getParentName())) {
       this.children.add(newChild);
     } else {
       for (GenericDataType child : this.children) {
@@ -130,8 +130,8 @@ public String getName() {
    * get parent column name
    */
   @Override
-  public String getParentname() {
-    return parentname;
+  public String getParentName() {
+    return parentName;
   }
 
   /*