Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CARBONDATA-3261] support float and byte data type reading from prest…
…o carbon [CARBONDATA-3261] support float and byte data type reading from presto problem: support float and byte reading from presto cause: currently float and byte cannot be read in presto due to code issue. It was going as double data type. Hence array out of bound issue used to come as float/byte read from double stream reader. solution: Implement a new stream reader for float and byte. This closes #3085
- Loading branch information
1 parent
e485e14
commit 556e220
Showing
5 changed files
with
273 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
integration/presto/src/main/java/org/apache/carbondata/presto/readers/ByteStreamReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * 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 org.apache.carbondata.core.cache.dictionary.Dictionary; | ||
| import org.apache.carbondata.core.metadata.datatype.DataType; | ||
| import org.apache.carbondata.core.metadata.datatype.DataTypes; | ||
| import org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl; | ||
| import org.apache.carbondata.core.util.DataTypeUtil; | ||
|
|
||
| import com.facebook.presto.spi.block.Block; | ||
| import com.facebook.presto.spi.block.BlockBuilder; | ||
| import com.facebook.presto.spi.type.AbstractType; | ||
| import com.facebook.presto.spi.type.TinyintType; | ||
|
|
||
| /** | ||
| * Class for Reading the Byte(tiny int) value and setting it in Block | ||
| */ | ||
| public class ByteStreamReader extends CarbonColumnVectorImpl implements PrestoVectorBlockBuilder { | ||
|
|
||
| protected int batchSize; | ||
|
|
||
| protected AbstractType type = TinyintType.TINYINT; | ||
|
|
||
| protected BlockBuilder builder; | ||
|
|
||
| private Dictionary dictionary; | ||
|
|
||
|
|
||
| public ByteStreamReader(int batchSize, DataType dataType, Dictionary dictionary) { | ||
| super(batchSize, dataType); | ||
| this.batchSize = batchSize; | ||
| this.builder = type.createBlockBuilder(null, batchSize); | ||
| this.dictionary = dictionary; | ||
| } | ||
|
|
||
| @Override public Block buildBlock() { | ||
| return builder.build(); | ||
| } | ||
|
|
||
| @Override public void setBatchSize(int batchSize) { | ||
| this.batchSize = batchSize; | ||
| } | ||
|
|
||
| @Override public void putInt(int rowId, int value) { | ||
| Object data = DataTypeUtil | ||
| .getDataBasedOnDataType(dictionary.getDictionaryValueForKey(value), DataTypes.BYTE); | ||
| if (data != null) { | ||
| type.writeLong(builder, (byte) data); | ||
| } else { | ||
| builder.appendNull(); | ||
| } | ||
| } | ||
|
|
||
| @Override public void putByte(int rowId, byte value) { | ||
| type.writeLong(builder, value); | ||
| } | ||
|
|
||
| @Override public void putBytes(int rowId, int count, byte[] src, int srcIndex) { | ||
| for (int i = srcIndex; i < count; i++) { | ||
| type.writeLong(builder, src[i]); | ||
| } | ||
| } | ||
|
|
||
| @Override public void putNull(int rowId) { | ||
| builder.appendNull(); | ||
| } | ||
|
|
||
| @Override public void putNulls(int rowId, int count) { | ||
| for (int i = 0; i < count; i++) { | ||
| builder.appendNull(); | ||
| } | ||
| } | ||
|
|
||
| @Override public void reset() { | ||
| builder = type.createBlockBuilder(null, batchSize); | ||
| } | ||
|
|
||
| @Override public void putObject(int rowId, Object value) { | ||
| if (value == null) { | ||
| putNull(rowId); | ||
| } else { | ||
| if (dictionary == null) { | ||
| putByte(rowId, (byte) value); | ||
| } else { | ||
| putInt(rowId, (int) value); | ||
| } | ||
| } | ||
| } | ||
| } |
105 changes: 105 additions & 0 deletions
105
integration/presto/src/main/java/org/apache/carbondata/presto/readers/FloatStreamReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * 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 org.apache.carbondata.core.cache.dictionary.Dictionary; | ||
| import org.apache.carbondata.core.metadata.datatype.DataType; | ||
| import org.apache.carbondata.core.metadata.datatype.DataTypes; | ||
| import org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl; | ||
| import org.apache.carbondata.core.util.DataTypeUtil; | ||
|
|
||
| import com.facebook.presto.spi.block.Block; | ||
| import com.facebook.presto.spi.block.BlockBuilder; | ||
| import com.facebook.presto.spi.type.AbstractType; | ||
| import com.facebook.presto.spi.type.RealType; | ||
|
|
||
| /** | ||
| * Class for Reading the Float(real) value and setting it in Block | ||
| */ | ||
| public class FloatStreamReader extends CarbonColumnVectorImpl implements PrestoVectorBlockBuilder { | ||
|
|
||
| protected int batchSize; | ||
|
|
||
| protected AbstractType type = RealType.REAL; | ||
|
|
||
| protected BlockBuilder builder; | ||
|
|
||
| private Dictionary dictionary; | ||
|
|
||
|
|
||
| public FloatStreamReader(int batchSize, DataType dataType, Dictionary dictionary) { | ||
| super(batchSize, dataType); | ||
| this.batchSize = batchSize; | ||
| this.builder = type.createBlockBuilder(null, batchSize); | ||
| this.dictionary = dictionary; | ||
| } | ||
|
|
||
| @Override public Block buildBlock() { | ||
| return builder.build(); | ||
| } | ||
|
|
||
| @Override public void setBatchSize(int batchSize) { | ||
| this.batchSize = batchSize; | ||
| } | ||
|
|
||
| @Override public void putInt(int rowId, int value) { | ||
| Object data = DataTypeUtil | ||
| .getDataBasedOnDataType(dictionary.getDictionaryValueForKey(value), DataTypes.FLOAT); | ||
| if (data != null) { | ||
| type.writeLong(builder, (long)Float.floatToRawIntBits((float)data)); | ||
| } else { | ||
| builder.appendNull(); | ||
| } | ||
| } | ||
|
|
||
| @Override public void putFloat(int rowId, float value) { | ||
| type.writeLong(builder, (long)Float.floatToRawIntBits(value)); | ||
| } | ||
|
|
||
| @Override public void putFloats(int rowId, int count, float[] src, int srcIndex) { | ||
| for (int i = srcIndex; i < count; i++) { | ||
| type.writeLong(builder, (long)Float.floatToRawIntBits(src[i])); | ||
| } | ||
| } | ||
|
|
||
| @Override public void putNull(int rowId) { | ||
| builder.appendNull(); | ||
| } | ||
|
|
||
| @Override public void putNulls(int rowId, int count) { | ||
| for (int i = 0; i < count; i++) { | ||
| builder.appendNull(); | ||
| } | ||
| } | ||
|
|
||
| @Override public void reset() { | ||
| builder = type.createBlockBuilder(null, batchSize); | ||
| } | ||
|
|
||
| @Override public void putObject(int rowId, Object value) { | ||
| if (value == null) { | ||
| putNull(rowId); | ||
| } else { | ||
| if (dictionary == null) { | ||
| putFloat(rowId, (float) value); | ||
| } else { | ||
| putInt(rowId, (int) value); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters