From efe8a6f7da389ebc29111a0dc59db315aaa00a29 Mon Sep 17 00:00:00 2001 From: Alexey Arno Date: Fri, 5 Aug 2016 17:59:26 +0300 Subject: [PATCH] dbms: Cleanup [#METR-19266] --- dbms/src/DataStreams/NativeBlockInputStream.cpp | 2 +- dbms/src/DataStreams/NativeBlockOutputStream.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/DataStreams/NativeBlockInputStream.cpp b/dbms/src/DataStreams/NativeBlockInputStream.cpp index b767e3022c1..7451178ecfb 100644 --- a/dbms/src/DataStreams/NativeBlockInputStream.cpp +++ b/dbms/src/DataStreams/NativeBlockInputStream.cpp @@ -54,7 +54,7 @@ void NativeBlockInputStream::readData(const IDataType & type, IColumn & column, ColumnNullable & nullable_col = static_cast(column); IColumn & nested_col = *(nullable_col.getNestedColumn().get()); - ColumnUInt8 & null_map = static_cast(*(nullable_col.getNullValuesByteMap().get())); + IColumn & null_map = *(nullable_col.getNullValuesByteMap().get()); DataTypeUInt8{}.deserializeBinary(null_map, istr, rows, 0); readData(nested_type, nested_col, istr, rows); diff --git a/dbms/src/DataStreams/NativeBlockOutputStream.cpp b/dbms/src/DataStreams/NativeBlockOutputStream.cpp index a4524901cfc..5200cded95a 100644 --- a/dbms/src/DataStreams/NativeBlockOutputStream.cpp +++ b/dbms/src/DataStreams/NativeBlockOutputStream.cpp @@ -55,8 +55,8 @@ void NativeBlockOutputStream::writeData(const IDataType & type, const ColumnPtr const ColumnNullable & nullable_col = static_cast(*full_column.get()); const ColumnPtr & nested_col = nullable_col.getNestedColumn(); - const ColumnUInt8 & content = static_cast(*(nullable_col.getNullValuesByteMap().get())); - DataTypeUInt8{}.serializeBinary(content, ostr, offset, limit); + const IColumn & null_map = *(nullable_col.getNullValuesByteMap().get()); + DataTypeUInt8{}.serializeBinary(null_map, ostr, offset, limit); writeData(nested_type, nested_col, ostr, offset, limit); }