Set Default block type to only be the splitrow store.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/1b27888c Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/1b27888c Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/1b27888c Branch: refs/heads/multi-shiftboss-test Commit: 1b27888c3ced7ff6b104893cc6fe1a02d5cb33b2 Parents: 2d11ec5 Author: cramja <marc.spehlm...@gmail.com> Authored: Thu Nov 17 16:12:55 2016 -0600 Committer: cramja <marc.spehlm...@gmail.com> Committed: Mon Nov 21 14:28:02 2016 -0600 ---------------------------------------------------------------------- storage/StorageBlockLayout.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/1b27888c/storage/StorageBlockLayout.cpp ---------------------------------------------------------------------- diff --git a/storage/StorageBlockLayout.cpp b/storage/StorageBlockLayout.cpp index bdeb9cb..3b1bcc0 100644 --- a/storage/StorageBlockLayout.cpp +++ b/storage/StorageBlockLayout.cpp @@ -148,17 +148,17 @@ void StorageBlockLayout::copyHeaderTo(void *dest) const { StorageBlockLayout* StorageBlockLayout::GenerateDefaultLayout(const CatalogRelationSchema &relation, const bool relation_variable_length) { + // TODO(marc): In the future we may use relation_variable_length (columnstores as intermediate + // blocks), but for now, all we do is add (void) so that the compiler will not complain + // about an unused variable. + (void) relation_variable_length; StorageBlockLayout *layout = new StorageBlockLayout(relation); StorageBlockLayoutDescription *description = layout->getDescriptionMutable(); description->set_num_slots(1); TupleStorageSubBlockDescription *tuple_store_description = description->mutable_tuple_store_description(); - if (relation_variable_length) { - tuple_store_description->set_sub_block_type(TupleStorageSubBlockDescription::SPLIT_ROW_STORE); - } else { - tuple_store_description->set_sub_block_type(TupleStorageSubBlockDescription::PACKED_ROW_STORE); - } + tuple_store_description->set_sub_block_type(TupleStorageSubBlockDescription::SPLIT_ROW_STORE); layout->finalize(); return layout;
