ajantha-bhat commented on a change in pull request #3773:
URL: https://github.com/apache/carbondata/pull/3773#discussion_r462270452
##########
File path:
integration/presto/src/main/java/org/apache/carbondata/presto/PrestoCarbonVectorizedRecordReader.java
##########
@@ -176,8 +191,16 @@ private void initBatch() {
for (int i = 0; i < queryDimension.size(); i++) {
ProjectionDimension dim = queryDimension.get(i);
if (dim.getDimension().isComplex()) {
+ List<CarbonDimension> childDimensions =
+ dim.getDimension().getListOfChildDimensions();
+ ArrayList<StructField> childFields = new ArrayList<StructField>();
+ for (int ind = 0; ind < childDimensions.size(); ind++) {
+ ColumnSchema childSchema =
childDimensions.get(ind).getColumnSchema();
Review comment:
go to each file where new code is added and look for unused
variable/function added (IDE can show in grey) and remove it.
Here childSchema is not used.
##########
File path:
integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/ArrayStreamReader.java
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.presto.readers;
+
+import io.prestosql.spi.type.*;
+
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
+import org.apache.carbondata.core.metadata.datatype.StructField;
+import
org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl;
+
+import io.prestosql.spi.block.Block;
+import io.prestosql.spi.block.BlockBuilder;
+
+import org.apache.carbondata.presto.CarbonVectorBatch;
+
+/**
+ * Class to read the Array Stream
+ */
+
+public class ArrayStreamReader extends CarbonColumnVectorImpl implements
PrestoVectorBlockBuilder {
+
+ protected int batchSize;
+
+ protected Type type;
+ protected BlockBuilder builder;
+ Block childBlock = null;
+ private int index = 0;
+
+ public ArrayStreamReader(int batchSize, DataType dataType, StructField
field) {
+ super(batchSize, dataType);
+ this.batchSize = batchSize;
+ this.type = getArrayOfType(field, dataType);
+ setChildrenVector(
+ CarbonVectorBatch.createDirectStreamReader(this.batchSize,
field.getDataType(), field));
+ this.builder = type.createBlockBuilder(null, batchSize);
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDataTypeName() {
+ return "ARRAY";
+ }
+
+ Type getArrayOfType(StructField field, DataType dataType) {
+ if (dataType == DataTypes.STRING) {
+ return new ArrayType(VarcharType.VARCHAR);
Review comment:
use equals, it is string
##########
File path:
integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/ArrayStreamReader.java
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.presto.readers;
+
+import io.prestosql.spi.type.*;
+
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
+import org.apache.carbondata.core.metadata.datatype.StructField;
+import
org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl;
+
+import io.prestosql.spi.block.Block;
+import io.prestosql.spi.block.BlockBuilder;
+
+import org.apache.carbondata.presto.CarbonVectorBatch;
+
+/**
+ * Class to read the Array Stream
+ */
+
+public class ArrayStreamReader extends CarbonColumnVectorImpl implements
PrestoVectorBlockBuilder {
+
+ protected int batchSize;
+
+ protected Type type;
+ protected BlockBuilder builder;
+ Block childBlock = null;
+ private int index = 0;
+
+ public ArrayStreamReader(int batchSize, DataType dataType, StructField
field) {
+ super(batchSize, dataType);
+ this.batchSize = batchSize;
+ this.type = getArrayOfType(field, dataType);
+ setChildrenVector(
+ CarbonVectorBatch.createDirectStreamReader(this.batchSize,
field.getDataType(), field));
+ this.builder = type.createBlockBuilder(null, batchSize);
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDataTypeName() {
+ return "ARRAY";
+ }
+
+ Type getArrayOfType(StructField field, DataType dataType) {
+ if (dataType == DataTypes.STRING) {
+ return new ArrayType(VarcharType.VARCHAR);
Review comment:
use equals instead of == , it is string
##########
File path:
core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/compress/DirectCompressCodec.java
##########
@@ -246,7 +241,28 @@ public void decodeAndFillVector(byte[] pageData,
ColumnVectorInfo vectorInfo, Bi
vector = ColumnarVectorWrapperDirectFactory
.getDirectVectorWrapperFactory(vector, vectorInfo.invertedIndex,
nullBits, deletedRows,
true, false);
- fillVector(pageData, vector, vectorDataType, pageDataType, pageSize,
vectorInfo, nullBits);
+ Deque<CarbonColumnVectorImpl> vectorStack = vectorInfo.getVectorStack();
+ // initialize vectorStack if null
+ if (vectorStack == null && vectorInfo.vector.getColumnVector() != null) {
+ vectorStack = new ArrayDeque<CarbonColumnVectorImpl>();
+ vectorStack.push((CarbonColumnVectorImpl)
vectorInfo.vector.getColumnVector());
+ vectorInfo.setVectorStack(vectorStack);
+ }
+ /**
Review comment:
can't use this style of comment, please observe IDE warnings while coding
##########
File path:
core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/compress/DirectCompressCodec.java
##########
@@ -246,7 +241,28 @@ public void decodeAndFillVector(byte[] pageData,
ColumnVectorInfo vectorInfo, Bi
vector = ColumnarVectorWrapperDirectFactory
.getDirectVectorWrapperFactory(vector, vectorInfo.invertedIndex,
nullBits, deletedRows,
true, false);
- fillVector(pageData, vector, vectorDataType, pageDataType, pageSize,
vectorInfo, nullBits);
+ Deque<CarbonColumnVectorImpl> vectorStack = vectorInfo.getVectorStack();
+ // initialize vectorStack if null
+ if (vectorStack == null && vectorInfo.vector.getColumnVector() != null) {
+ vectorStack = new ArrayDeque<CarbonColumnVectorImpl>();
+ vectorStack.push((CarbonColumnVectorImpl)
vectorInfo.vector.getColumnVector());
+ vectorInfo.setVectorStack(vectorStack);
+ }
+ /**
+ * if top of vector stack is a complex vector then
+ * add their children into the stack and load them too.
+ * TODO: If there are multiple children push them into stack and load
them iteratively
+ */
+ if (vectorStack != null && vectorStack.peek().isComplex()) {
Review comment:
should add !vectorStack.isEmpty() also !
##########
File path:
core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/compress/DirectCompressCodec.java
##########
@@ -246,7 +241,28 @@ public void decodeAndFillVector(byte[] pageData,
ColumnVectorInfo vectorInfo, Bi
vector = ColumnarVectorWrapperDirectFactory
.getDirectVectorWrapperFactory(vector, vectorInfo.invertedIndex,
nullBits, deletedRows,
true, false);
- fillVector(pageData, vector, vectorDataType, pageDataType, pageSize,
vectorInfo, nullBits);
+ Deque<CarbonColumnVectorImpl> vectorStack = vectorInfo.getVectorStack();
+ // initialize vectorStack if null
+ if (vectorStack == null && vectorInfo.vector.getColumnVector() != null) {
+ vectorStack = new ArrayDeque<CarbonColumnVectorImpl>();
+ vectorStack.push((CarbonColumnVectorImpl)
vectorInfo.vector.getColumnVector());
+ vectorInfo.setVectorStack(vectorStack);
+ }
+ /**
+ * if top of vector stack is a complex vector then
+ * add their children into the stack and load them too.
+ * TODO: If there are multiple children push them into stack and load
them iteratively
+ */
+ if (vectorStack != null && vectorStack.peek().isComplex()) {
Review comment:
should add !vectorStack.isEmpty() or vectorStack.peek() != null is better
##########
File path:
integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/ArrayStreamReader.java
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.presto.readers;
+
+import io.prestosql.spi.type.*;
+
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
+import org.apache.carbondata.core.metadata.datatype.StructField;
+import
org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl;
+
+import io.prestosql.spi.block.Block;
+import io.prestosql.spi.block.BlockBuilder;
+
+import org.apache.carbondata.presto.CarbonVectorBatch;
+
+/**
+ * Class to read the Array Stream
+ */
+
+public class ArrayStreamReader extends CarbonColumnVectorImpl implements
PrestoVectorBlockBuilder {
+
+ protected int batchSize;
+
+ protected Type type;
+ protected BlockBuilder builder;
+ Block childBlock = null;
+ private int index = 0;
+
+ public ArrayStreamReader(int batchSize, DataType dataType, StructField
field) {
+ super(batchSize, dataType);
+ this.batchSize = batchSize;
+ this.type = getArrayOfType(field, dataType);
+ setChildrenVector(
+ CarbonVectorBatch.createDirectStreamReader(this.batchSize,
field.getDataType(), field));
+ this.builder = type.createBlockBuilder(null, batchSize);
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDataTypeName() {
+ return "ARRAY";
+ }
+
+ Type getArrayOfType(StructField field, DataType dataType) {
+ if (dataType == DataTypes.STRING) {
+ return new ArrayType(VarcharType.VARCHAR);
Review comment:
use equals instead of == , it is string
##########
File path:
integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/ArrayStreamReader.java
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.presto.readers;
+
+import io.prestosql.spi.type.*;
+
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
+import org.apache.carbondata.core.metadata.datatype.StructField;
+import
org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl;
+
+import io.prestosql.spi.block.Block;
+import io.prestosql.spi.block.BlockBuilder;
+
+import org.apache.carbondata.presto.CarbonVectorBatch;
+
+/**
+ * Class to read the Array Stream
+ */
+
+public class ArrayStreamReader extends CarbonColumnVectorImpl implements
PrestoVectorBlockBuilder {
+
+ protected int batchSize;
+
+ protected Type type;
+ protected BlockBuilder builder;
+ Block childBlock = null;
+ private int index = 0;
+
+ public ArrayStreamReader(int batchSize, DataType dataType, StructField
field) {
+ super(batchSize, dataType);
+ this.batchSize = batchSize;
+ this.type = getArrayOfType(field, dataType);
+ setChildrenVector(
+ CarbonVectorBatch.createDirectStreamReader(this.batchSize,
field.getDataType(), field));
+ this.builder = type.createBlockBuilder(null, batchSize);
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDataTypeName() {
+ return "ARRAY";
+ }
+
+ Type getArrayOfType(StructField field, DataType dataType) {
+ if (dataType == DataTypes.STRING) {
+ return new ArrayType(VarcharType.VARCHAR);
+ } else if (dataType == DataTypes.INT) {
+ return new ArrayType(IntegerType.INTEGER);
+ } else if (dataType == DataTypes.LONG) {
+ return new ArrayType(BigintType.BIGINT);
+ } else if (dataType == DataTypes.DOUBLE) {
+ return new ArrayType(DoubleType.DOUBLE);
+ } else if (dataType == DataTypes.FLOAT) {
+ return new ArrayType(RealType.REAL);
+ } else if (dataType == DataTypes.BOOLEAN) {
+ return new ArrayType(BooleanType.BOOLEAN);
+ } else {
+ StructField childField = field.getChildren().get(0);
+ return new ArrayType(getArrayOfType(childField,
childField.getDataType()));
+ }
+ }
+
+ @Override
+ public Block buildBlock() {
+ return builder.build();
+ }
+
+ public boolean isComplex() {
+ return true;
+ }
+
+ @Override
+ public void setBatchSize(int batchSize) {
+ this.batchSize = batchSize;
+ }
+
+ @Override
+ public void putObject(int rowId, Object value) {
+ if (value == null) {
+ putNull(rowId);
+ } else {
+ getChildrenVector().putObject(rowId, value);
+ }
+ }
+
+ public void putArrayObject() {
+ if (this.getType().getName() == "ARRAY") {
+ childBlock = ((ArrayStreamReader) getChildrenVector()).buildBlock();
+ } else if (this.getType().getName() == "STRING") {
+ childBlock = ((SliceStreamReader) getChildrenVector()).buildBlock();
+ } else if (this.getType().getName() == "INT") {
Review comment:
use equals instead of == , as name is string vale
##########
File path:
integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/ArrayStreamReader.java
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.presto.readers;
+
+import io.prestosql.spi.type.*;
+
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
+import org.apache.carbondata.core.metadata.datatype.StructField;
+import
org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl;
+
+import io.prestosql.spi.block.Block;
+import io.prestosql.spi.block.BlockBuilder;
+
+import org.apache.carbondata.presto.CarbonVectorBatch;
+
+/**
+ * Class to read the Array Stream
+ */
+
+public class ArrayStreamReader extends CarbonColumnVectorImpl implements
PrestoVectorBlockBuilder {
+
+ protected int batchSize;
+
+ protected Type type;
+ protected BlockBuilder builder;
+ Block childBlock = null;
+ private int index = 0;
+
+ public ArrayStreamReader(int batchSize, DataType dataType, StructField
field) {
+ super(batchSize, dataType);
+ this.batchSize = batchSize;
+ this.type = getArrayOfType(field, dataType);
+ setChildrenVector(
+ CarbonVectorBatch.createDirectStreamReader(this.batchSize,
field.getDataType(), field));
+ this.builder = type.createBlockBuilder(null, batchSize);
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDataTypeName() {
+ return "ARRAY";
+ }
+
+ Type getArrayOfType(StructField field, DataType dataType) {
+ if (dataType == DataTypes.STRING) {
+ return new ArrayType(VarcharType.VARCHAR);
+ } else if (dataType == DataTypes.INT) {
+ return new ArrayType(IntegerType.INTEGER);
+ } else if (dataType == DataTypes.LONG) {
+ return new ArrayType(BigintType.BIGINT);
+ } else if (dataType == DataTypes.DOUBLE) {
+ return new ArrayType(DoubleType.DOUBLE);
+ } else if (dataType == DataTypes.FLOAT) {
+ return new ArrayType(RealType.REAL);
+ } else if (dataType == DataTypes.BOOLEAN) {
+ return new ArrayType(BooleanType.BOOLEAN);
+ } else {
+ StructField childField = field.getChildren().get(0);
+ return new ArrayType(getArrayOfType(childField,
childField.getDataType()));
+ }
+ }
+
+ @Override
+ public Block buildBlock() {
+ return builder.build();
+ }
+
+ public boolean isComplex() {
+ return true;
+ }
+
+ @Override
+ public void setBatchSize(int batchSize) {
+ this.batchSize = batchSize;
+ }
+
+ @Override
+ public void putObject(int rowId, Object value) {
+ if (value == null) {
+ putNull(rowId);
+ } else {
+ getChildrenVector().putObject(rowId, value);
+ }
+ }
+
+ public void putArrayObject() {
+ if (this.getType().getName() == "ARRAY") {
+ childBlock = ((ArrayStreamReader) getChildrenVector()).buildBlock();
+ } else if (this.getType().getName() == "STRING") {
+ childBlock = ((SliceStreamReader) getChildrenVector()).buildBlock();
+ } else if (this.getType().getName() == "INT") {
Review comment:
use equals instead of == , as name is string vale
Also check how current testcases are passing. Because of this childblock may
be null always
##########
File path:
integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/ArrayStreamReader.java
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.presto.readers;
+
+import io.prestosql.spi.type.*;
+
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
+import org.apache.carbondata.core.metadata.datatype.StructField;
+import
org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl;
+
+import io.prestosql.spi.block.Block;
+import io.prestosql.spi.block.BlockBuilder;
+
+import org.apache.carbondata.presto.CarbonVectorBatch;
+
+/**
+ * Class to read the Array Stream
+ */
+
+public class ArrayStreamReader extends CarbonColumnVectorImpl implements
PrestoVectorBlockBuilder {
+
+ protected int batchSize;
+
+ protected Type type;
+ protected BlockBuilder builder;
+ Block childBlock = null;
+ private int index = 0;
+
+ public ArrayStreamReader(int batchSize, DataType dataType, StructField
field) {
+ super(batchSize, dataType);
+ this.batchSize = batchSize;
+ this.type = getArrayOfType(field, dataType);
+ setChildrenVector(
+ CarbonVectorBatch.createDirectStreamReader(this.batchSize,
field.getDataType(), field));
+ this.builder = type.createBlockBuilder(null, batchSize);
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDataTypeName() {
+ return "ARRAY";
+ }
+
+ Type getArrayOfType(StructField field, DataType dataType) {
+ if (dataType == DataTypes.STRING) {
+ return new ArrayType(VarcharType.VARCHAR);
+ } else if (dataType == DataTypes.INT) {
+ return new ArrayType(IntegerType.INTEGER);
+ } else if (dataType == DataTypes.LONG) {
+ return new ArrayType(BigintType.BIGINT);
+ } else if (dataType == DataTypes.DOUBLE) {
+ return new ArrayType(DoubleType.DOUBLE);
+ } else if (dataType == DataTypes.FLOAT) {
+ return new ArrayType(RealType.REAL);
+ } else if (dataType == DataTypes.BOOLEAN) {
+ return new ArrayType(BooleanType.BOOLEAN);
+ } else {
Review comment:
Seems short, byte, date , time is missing. Please refer some existing
data type function to make sure you cover all the data type
##########
File path:
integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/ArrayStreamReader.java
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.presto.readers;
+
+import io.prestosql.spi.type.*;
+
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
+import org.apache.carbondata.core.metadata.datatype.StructField;
+import
org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl;
+
+import io.prestosql.spi.block.Block;
+import io.prestosql.spi.block.BlockBuilder;
+
+import org.apache.carbondata.presto.CarbonVectorBatch;
+
+/**
+ * Class to read the Array Stream
+ */
+
+public class ArrayStreamReader extends CarbonColumnVectorImpl implements
PrestoVectorBlockBuilder {
+
+ protected int batchSize;
+
+ protected Type type;
+ protected BlockBuilder builder;
+ Block childBlock = null;
+ private int index = 0;
+
+ public ArrayStreamReader(int batchSize, DataType dataType, StructField
field) {
+ super(batchSize, dataType);
+ this.batchSize = batchSize;
+ this.type = getArrayOfType(field, dataType);
+ setChildrenVector(
+ CarbonVectorBatch.createDirectStreamReader(this.batchSize,
field.getDataType(), field));
+ this.builder = type.createBlockBuilder(null, batchSize);
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDataTypeName() {
+ return "ARRAY";
+ }
+
+ Type getArrayOfType(StructField field, DataType dataType) {
+ if (dataType == DataTypes.STRING) {
+ return new ArrayType(VarcharType.VARCHAR);
+ } else if (dataType == DataTypes.INT) {
+ return new ArrayType(IntegerType.INTEGER);
+ } else if (dataType == DataTypes.LONG) {
+ return new ArrayType(BigintType.BIGINT);
+ } else if (dataType == DataTypes.DOUBLE) {
+ return new ArrayType(DoubleType.DOUBLE);
+ } else if (dataType == DataTypes.FLOAT) {
+ return new ArrayType(RealType.REAL);
+ } else if (dataType == DataTypes.BOOLEAN) {
+ return new ArrayType(BooleanType.BOOLEAN);
+ } else {
+ StructField childField = field.getChildren().get(0);
+ return new ArrayType(getArrayOfType(childField,
childField.getDataType()));
Review comment:
cannot assume else case as array, have else if () for array
and keep an else case for
} else {
throw new UnsupportedOperationException("unsupported type: " +
dataType);
}
##########
File path:
integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/ArrayStreamReader.java
##########
@@ -0,0 +1,145 @@
+/*
+ * 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.presto.readers;
+
+import io.prestosql.spi.type.*;
+
+import org.apache.carbondata.core.metadata.datatype.DataType;
+import org.apache.carbondata.core.metadata.datatype.DataTypes;
+import org.apache.carbondata.core.metadata.datatype.StructField;
+import
org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl;
+
+import io.prestosql.spi.block.Block;
+import io.prestosql.spi.block.BlockBuilder;
+
+import org.apache.carbondata.presto.CarbonVectorBatch;
+
+/**
+ * Class to read the Array Stream
+ */
+
+public class ArrayStreamReader extends CarbonColumnVectorImpl implements
PrestoVectorBlockBuilder {
+
+ protected int batchSize;
+
+ protected Type type;
+ protected BlockBuilder builder;
+ Block childBlock = null;
+ private int index = 0;
+
+ public ArrayStreamReader(int batchSize, DataType dataType, StructField
field) {
+ super(batchSize, dataType);
+ this.batchSize = batchSize;
+ this.type = getArrayOfType(field, dataType);
+ setChildrenVector(
+ CarbonVectorBatch.createDirectStreamReader(this.batchSize,
field.getDataType(), field));
+ this.builder = type.createBlockBuilder(null, batchSize);
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public void setIndex(int index) {
+ this.index = index;
+ }
+
+ public String getDataTypeName() {
+ return "ARRAY";
+ }
+
+ Type getArrayOfType(StructField field, DataType dataType) {
+ if (dataType == DataTypes.STRING) {
+ return new ArrayType(VarcharType.VARCHAR);
+ } else if (dataType == DataTypes.INT) {
+ return new ArrayType(IntegerType.INTEGER);
+ } else if (dataType == DataTypes.LONG) {
+ return new ArrayType(BigintType.BIGINT);
+ } else if (dataType == DataTypes.DOUBLE) {
+ return new ArrayType(DoubleType.DOUBLE);
+ } else if (dataType == DataTypes.FLOAT) {
+ return new ArrayType(RealType.REAL);
+ } else if (dataType == DataTypes.BOOLEAN) {
+ return new ArrayType(BooleanType.BOOLEAN);
+ } else {
+ StructField childField = field.getChildren().get(0);
+ return new ArrayType(getArrayOfType(childField,
childField.getDataType()));
+ }
+ }
+
+ @Override
+ public Block buildBlock() {
+ return builder.build();
+ }
+
+ public boolean isComplex() {
+ return true;
+ }
+
+ @Override
+ public void setBatchSize(int batchSize) {
+ this.batchSize = batchSize;
+ }
+
+ @Override
+ public void putObject(int rowId, Object value) {
+ if (value == null) {
+ putNull(rowId);
+ } else {
+ getChildrenVector().putObject(rowId, value);
+ }
+ }
+
+ public void putArrayObject() {
+ if (this.getType().getName() == "ARRAY") {
+ childBlock = ((ArrayStreamReader) getChildrenVector()).buildBlock();
+ } else if (this.getType().getName() == "STRING") {
+ childBlock = ((SliceStreamReader) getChildrenVector()).buildBlock();
+ } else if (this.getType().getName() == "INT") {
Review comment:
or you can use this.getType() == DataTypes.STRING
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
