11496

Build # 11496

Build Type

push

jenkins

Committed by GitHub

Commit Message

<a href="https://github.com/apache/carbondata/commit/<a class=hub.com/apache/carbondata/commit/9765e7fbec56fe7ad3abe07f4d01c2b714f1e8fe">9765e7fbe<a href="https://github.com/apache/carbondata/commit/9765e7fbec56fe7ad3abe07f4d01c2b714f1e8fe">">Merge </a><a class="double-link" href="https://github.com/apache/carbondata/commit/<a class="double-link" href="https://github.com/apache/carbondata/commit/4e4b07508be8b3f22fa6af8d30cde47e5874c1c3">4e4b07508</a>">4e4b07508</a><a href="https://github.com/apache/carbondata/commit/9765e7fbec56fe7ad3abe07f4d01c2b714f1e8fe"> into 5a4684f7f">5a4684f7f</a>

Run Details

61 of 61 new or added lines in 3 files covered. (100.0%)

63587 of 80489 relevant lines covered (79.0%)

1.04 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

56.67

/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/Util.java

/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *    http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.carbondata.spark.util;

import java.util.ArrayList;
import java.util.List;

import org.apache.carbondata.core.metadata.datatype.DataType;
import org.apache.carbondata.core.metadata.schema.table.CarbonTable;
import org.apache.carbondata.core.metadata.schema.table.column.CarbonColumn;
import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema;
import org.apache.carbondata.hadoop.CarbonInputSplit;

import org.apache.spark.SparkConf;
import org.apache.spark.sql.types.DataTypes;
import org.apache.spark.sql.types.DecimalType;
import org.apache.spark.sql.types.Metadata;
import org.apache.spark.sql.types.StructField;
import org.apache.spark.sql.types.StructType;
import org.apache.spark.sql.util.CarbonMetastoreTypes;
import org.apache.spark.sql.util.SparkTypeConverter;
import org.apache.spark.util.Utils;

public class Util {
  /**
   * return the Array of available local-dirs
   */
  public static String[] getConfiguredLocalDirs(SparkConf conf) {
    return Utils.getConfiguredLocalDirs(conf);
  }

  /**
   * Method to check whether there exists any block which does not contain the blocklet info
   *
   * @param splitList
   * @return
   */
  public static boolean isBlockWithoutBlockletInfoExists(List<CarbonInputSplit> splitList) {
    for (CarbonInputSplit inputSplit : splitList) {
      if (null == inputSplit.getDetailInfo() || null == inputSplit.getDetailInfo()
          .getBlockletInfo()) {
        return true;
      }
    }
    return false;
  }

  public static org.apache.spark.sql.types.DataType convertCarbonToSparkDataType(
      DataType carbonDataType) {
    if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.STRING) {
      return DataTypes.StringType;
    } else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.SHORT) {
      return DataTypes.ShortType;
    } else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.INT) {
      return DataTypes.IntegerType;
    } else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.LONG) {
      return DataTypes.LongType;
    } else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.DOUBLE) {
      return DataTypes.DoubleType;
    } else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.BOOLEAN) {
      return DataTypes.BooleanType;
    } else if (org.apache.carbondata.core.metadata.datatype.DataTypes.isDecimal(carbonDataType)) {
      return DataTypes.createDecimalType();
    } else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.TIMESTAMP) {
      return DataTypes.TimestampType;
    } else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.DATE) {
      return DataTypes.DateType;
    } else {
      return null;
    }
  }

  public static StructType convertToSparkSchema(CarbonTable table) {
    List<CarbonColumn> columns = table.getCreateOrderColumn(table.getTableName());
    ColumnSchema[] schema = new ColumnSchema[columns.size()];
    int i = 0;
    for (CarbonColumn column : columns) {
      schema[i++] = column.getColumnSchema();
    }
    return convertToSparkSchema(table, schema);
  }

  public static StructType convertToSparkSchema(CarbonTable table, ColumnSchema[] carbonColumns) {
    List<StructField> fields = new ArrayList<>(carbonColumns.length);
    for (int i = 0; i < carbonColumns.length; i++) {
      ColumnSchema carbonColumn = carbonColumns[i];
      DataType dataType = carbonColumn.getDataType();
      if (org.apache.carbondata.core.metadata.datatype.DataTypes.isDecimal(dataType)) {
        fields.add(new StructField(carbonColumn.getColumnName(),
            new DecimalType(carbonColumn.getPrecision(), carbonColumn.getScale()),
            true, Metadata.empty()));
      } else if (org.apache.carbondata.core.metadata.datatype.DataTypes.isStructType(dataType)) {
        fields.add(
            new StructField(
                carbonColumn.getColumnName(),
                CarbonMetastoreTypes.toDataType(
                    String.format("struct<%s>",
                        SparkTypeConverter.getStructChildren(table, carbonColumn.getColumnName()))),
                true,
                Metadata.empty()));
      } else if (org.apache.carbondata.core.metadata.datatype.DataTypes.isArrayType(dataType)) {
        fields.add(
            new StructField(
                carbonColumn.getColumnName(),
                CarbonMetastoreTypes.toDataType(
                    String.format("array<%s>",
                        SparkTypeConverter.getArrayChildren(
                            table,
                            carbonColumn.getColumnName()))),
                true,
                Metadata.empty()));
      } else {
        fields.add(new StructField(carbonColumn.getColumnName(),
            convertCarbonToSparkDataType(carbonColumn.getDataType()), true, Metadata.empty()));
      }
    }
    return new StructType(fields.toArray(new StructField[0]));
  }
}

1	/*
2	* Licensed to the Apache Software Foundation (ASF) under one or more
3	* contributor license agreements. See the NOTICE file distributed with
4	* this work for additional information regarding copyright ownership.
5	* The ASF licenses this file to You under the Apache License, Version 2.0
6	* (the "License"); you may not use this file except in compliance with
7	* the License. You may obtain a copy of the License at
8	*
9	* http://www.apache.org/licenses/LICENSE-2.0
10	*
11	* Unless required by applicable law or agreed to in writing, software
12	* distributed under the License is distributed on an "AS IS" BASIS,
13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14	* See the License for the specific language governing permissions and
15	* limitations under the License.
16	*/
17
18	package org.apache.carbondata.spark.util;
19
20	import java.util.ArrayList;
21	import java.util.List;
22
23	import org.apache.carbondata.core.metadata.datatype.DataType;
24	import org.apache.carbondata.core.metadata.schema.table.CarbonTable;
25	import org.apache.carbondata.core.metadata.schema.table.column.CarbonColumn;
26	import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema;
27	import org.apache.carbondata.hadoop.CarbonInputSplit;
28
29	import org.apache.spark.SparkConf;
30	import org.apache.spark.sql.types.DataTypes;
31	import org.apache.spark.sql.types.DecimalType;
32	import org.apache.spark.sql.types.Metadata;
33	import org.apache.spark.sql.types.StructField;
34	import org.apache.spark.sql.types.StructType;
35	import org.apache.spark.sql.util.CarbonMetastoreTypes;
36	import org.apache.spark.sql.util.SparkTypeConverter;
37	import org.apache.spark.util.Utils;
38
39	public class Util {	×
40	/**
41	* return the Array of available local-dirs
42	*/
43	public static String[] getConfiguredLocalDirs(SparkConf conf) {
44	return Utils.getConfiguredLocalDirs(conf);	1✔
45	}
46
47	/**
48	* Method to check whether there exists any block which does not contain the blocklet info
49	*
50	* @param splitList
51	* @return
52	*/
53	public static boolean isBlockWithoutBlockletInfoExists(List<CarbonInputSplit> splitList) {
54	for (CarbonInputSplit inputSplit : splitList) {	1✔
55	if (null == inputSplit.getDetailInfo() \|\| null == inputSplit.getDetailInfo()	1✔
56	.getBlockletInfo()) {	1✔
57	return true;	1✔
58	}
59	}	1✔
60	return false;	1✔
61	}
62
63	public static org.apache.spark.sql.types.DataType convertCarbonToSparkDataType(
64	DataType carbonDataType) {
65	if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.STRING) {	1✔
66	return DataTypes.StringType;	1✔
67	} else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.SHORT) {	1✔
68	return DataTypes.ShortType;	×
69	} else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.INT) {	1✔
70	return DataTypes.IntegerType;	1✔
71	} else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.LONG) {	1✔
72	return DataTypes.LongType;	×
73	} else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.DOUBLE) {	1✔
74	return DataTypes.DoubleType;	1✔
75	} else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.BOOLEAN) {	1✔
76	return DataTypes.BooleanType;	×
77	} else if (org.apache.carbondata.core.metadata.datatype.DataTypes.isDecimal(carbonDataType)) {	1✔
78	return DataTypes.createDecimalType();	×
79	} else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.TIMESTAMP) {	1✔
80	return DataTypes.TimestampType;	1✔
81	} else if (carbonDataType == org.apache.carbondata.core.metadata.datatype.DataTypes.DATE) {	1✔
82	return DataTypes.DateType;	1✔
83	} else {
84	return null;	×
85	}
86	}
87
88	public static StructType convertToSparkSchema(CarbonTable table) {
89	List<CarbonColumn> columns = table.getCreateOrderColumn(table.getTableName());	×
90	ColumnSchema[] schema = new ColumnSchema[columns.size()];	×
91	int i = 0;	×
92	for (CarbonColumn column : columns) {	×
93	schema[i++] = column.getColumnSchema();	×
94	}	×
95	return convertToSparkSchema(table, schema);	×
96	}
97
98	public static StructType convertToSparkSchema(CarbonTable table, ColumnSchema[] carbonColumns) {
99	List<StructField> fields = new ArrayList<>(carbonColumns.length);	1✔
100	for (int i = 0; i < carbonColumns.length; i++) {	1✔
101	ColumnSchema carbonColumn = carbonColumns[i];	1✔
102	DataType dataType = carbonColumn.getDataType();	1✔
103	if (org.apache.carbondata.core.metadata.datatype.DataTypes.isDecimal(dataType)) {	1✔
104	fields.add(new StructField(carbonColumn.getColumnName(),	1✔
105	new DecimalType(carbonColumn.getPrecision(), carbonColumn.getScale()),	1✔
106	true, Metadata.empty()));	1✔
107	} else if (org.apache.carbondata.core.metadata.datatype.DataTypes.isStructType(dataType)) {	1✔
108	fields.add(	×
109	new StructField(
110	carbonColumn.getColumnName(),	×
111	CarbonMetastoreTypes.toDataType(	×
112	String.format("struct<%s>",	×
113	SparkTypeConverter.getStructChildren(table, carbonColumn.getColumnName()))),	×
114	true,
115	Metadata.empty()));	×
116	} else if (org.apache.carbondata.core.metadata.datatype.DataTypes.isArrayType(dataType)) {	1✔
117	fields.add(	×
118	new StructField(
119	carbonColumn.getColumnName(),	×
120	CarbonMetastoreTypes.toDataType(	×
121	String.format("array<%s>",	×
122	SparkTypeConverter.getArrayChildren(	×
123	table,
124	carbonColumn.getColumnName()))),	×
125	true,
126	Metadata.empty()));	×
127	} else {
128	fields.add(new StructField(carbonColumn.getColumnName(),	1✔
129	convertCarbonToSparkDataType(carbonColumn.getDataType()), true, Metadata.empty()));	1✔
130	}
131	}
132	return new StructType(fields.toArray(new StructField[0]));	1✔
133	}
134	}

apache / carbondata / 11496

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous