Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7C93A200B84 for ; Tue, 20 Sep 2016 19:57:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7AFE0160AC0; Tue, 20 Sep 2016 17:57:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 96069160AE1 for ; Tue, 20 Sep 2016 19:57:50 +0200 (CEST) Received: (qmail 46900 invoked by uid 500); 20 Sep 2016 17:57:49 -0000 Mailing-List: contact commits-help@quickstep.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@quickstep.incubator.apache.org Delivered-To: mailing list commits@quickstep.incubator.apache.org Received: (qmail 46884 invoked by uid 99); 20 Sep 2016 17:57:49 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Sep 2016 17:57:49 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 4DCBD1A6102 for ; Tue, 20 Sep 2016 17:57:49 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id hYrMCEOoUYBf for ; Tue, 20 Sep 2016 17:57:47 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id D8D2D60D31 for ; Tue, 20 Sep 2016 17:57:45 +0000 (UTC) Received: (qmail 46122 invoked by uid 99); 20 Sep 2016 17:57:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Sep 2016 17:57:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E328CE17A9; Tue, 20 Sep 2016 17:57:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hbdeshmukh@apache.org To: commits@quickstep.incubator.apache.org Date: Tue, 20 Sep 2016 17:57:51 -0000 Message-Id: In-Reply-To: <041772de50174d6587e27d16f35a09a2@git.apache.org> References: <041772de50174d6587e27d16f35a09a2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/28] incubator-quickstep git commit: Fixed cyclic dependencies. Removed Aggregation unit test. Other minor changes. archived-at: Tue, 20 Sep 2016 17:57:51 -0000 Fixed cyclic dependencies. Removed Aggregation unit test. Other minor changes. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/c510d24b Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/c510d24b Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/c510d24b Branch: refs/heads/partitioned-aggregation Commit: c510d24b089ce790f51988ed62350cf68751c6d9 Parents: 1665593 Author: rathijit Authored: Sun Aug 14 02:59:40 2016 -0500 Committer: Harshad Deshmukh Committed: Tue Sep 20 12:56:07 2016 -0500 ---------------------------------------------------------------------- expressions/aggregation/CMakeLists.txt | 2 +- storage/CMakeLists.txt | 2 -- storage/FastHashTable.hpp | 4 +--- storage/FastSeparateChainingHashTable.hpp | 3 --- storage/HashTable.hpp | 10 ---------- storage/HashTableBase.hpp | 18 +++++++++++++++++- storage/StorageBlock.cpp | 10 ++++------ 7 files changed, 23 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c510d24b/expressions/aggregation/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/expressions/aggregation/CMakeLists.txt b/expressions/aggregation/CMakeLists.txt index 98222df..9de6833 100644 --- a/expressions/aggregation/CMakeLists.txt +++ b/expressions/aggregation/CMakeLists.txt @@ -321,4 +321,4 @@ target_link_libraries(AggregationHandle_tests quickstep_types_operations_comparisons_Comparison quickstep_types_operations_comparisons_ComparisonFactory quickstep_types_operations_comparisons_ComparisonID) -add_test(AggregationHandle_tests AggregationHandle_tests) +#add_test(AggregationHandle_tests AggregationHandle_tests) http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c510d24b/storage/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index 79a5b87..f05cc46 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -631,7 +631,6 @@ target_link_libraries(quickstep_storage_EvictionPolicy quickstep_utility_Macros) target_link_libraries(quickstep_storage_FastHashTable quickstep_catalog_CatalogTypedefs - quickstep_storage_HashTable quickstep_storage_HashTableBase quickstep_storage_StorageBlob quickstep_storage_StorageBlockInfo @@ -968,7 +967,6 @@ target_link_libraries(quickstep_storage_StorageBlock quickstep_storage_CompressedColumnStoreTupleStorageSubBlock quickstep_storage_CompressedPackedRowStoreTupleStorageSubBlock quickstep_storage_CountedReference - quickstep_storage_FastHashTable quickstep_storage_HashTableBase quickstep_storage_IndexSubBlock quickstep_storage_InsertDestinationInterface http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c510d24b/storage/FastHashTable.hpp ---------------------------------------------------------------------- diff --git a/storage/FastHashTable.hpp b/storage/FastHashTable.hpp index cba039a..e7887ab 100644 --- a/storage/FastHashTable.hpp +++ b/storage/FastHashTable.hpp @@ -42,7 +42,6 @@ #include "utility/BloomFilter.hpp" #include "utility/HashPair.hpp" #include "utility/Macros.hpp" -#include "storage/HashTable.hpp" namespace quickstep { @@ -561,7 +560,7 @@ class FastHashTable : public HashTableBase> &argument, ValueAccessor *accessor, const std::vector &key_attr_ids, - const bool check_for_null_keys); + const bool check_for_null_keys) override; /** * @brief Determine the number of entries (key-value pairs) contained in this @@ -1322,7 +1321,6 @@ class FastHashTable : public HashTableBasebuckets_allocated;} - private: struct Header { std::size_t num_slots; http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c510d24b/storage/HashTable.hpp ---------------------------------------------------------------------- diff --git a/storage/HashTable.hpp b/storage/HashTable.hpp index 9fa41a2..f2dcb03 100644 --- a/storage/HashTable.hpp +++ b/storage/HashTable.hpp @@ -49,16 +49,6 @@ namespace quickstep { */ /** - * @brief Codes which indicate the result of a call to put() or - * putCompositeKey(). - **/ -enum class HashTablePutResult { - kOK = 0, - kDuplicateKey, - kOutOfSpace -}; - -/** * @brief Base class for hash table. * * This class is templated so that the core hash-table logic can be reused in http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c510d24b/storage/HashTableBase.hpp ---------------------------------------------------------------------- diff --git a/storage/HashTableBase.hpp b/storage/HashTableBase.hpp index 7eadae9..5526164 100644 --- a/storage/HashTableBase.hpp +++ b/storage/HashTableBase.hpp @@ -21,8 +21,10 @@ #define QUICKSTEP_STORAGE_HASH_TABLE_BASE_HPP_ #include +#include #include "utility/Macros.hpp" +#include "ValueAccessor.hpp" namespace quickstep { @@ -52,6 +54,16 @@ struct HashTablePreallocationState { }; /** + * @brief Codes which indicate the result of a call to put() or + * putCompositeKey(). + **/ +enum class HashTablePutResult { + kOK = 0, + kDuplicateKey, + kOutOfSpace +}; + +/** * @brief An ultra-minimal base class that HashTables with different ValueT * parameters inherit from. This allows for a bit more type-safety than * just passing around void* pointers (although casting will still be @@ -66,7 +78,11 @@ class HashTableBase { public: virtual ~HashTableBase() { } -virtual size_t get_buckets_allocated() const {return 0;} + virtual bool upsertValueAccessorCompositeKeyFast( + const std::vector> &argument, + ValueAccessor *accessor, + const std::vector &key_attr_ids, + const bool check_for_null_keys) {return false;} protected: HashTableBase() { } http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c510d24b/storage/StorageBlock.cpp ---------------------------------------------------------------------- diff --git a/storage/StorageBlock.cpp b/storage/StorageBlock.cpp index 50732fd..8ff18b5 100644 --- a/storage/StorageBlock.cpp +++ b/storage/StorageBlock.cpp @@ -38,7 +38,6 @@ #include "storage/CompressedPackedRowStoreTupleStorageSubBlock.hpp" #include "storage/CountedReference.hpp" #include "storage/HashTableBase.hpp" -#include "storage/FastHashTable.hpp" #include "storage/IndexSubBlock.hpp" #include "storage/InsertDestinationInterface.hpp" #include "storage/PackedRowStoreTupleStorageSubBlock.hpp" @@ -573,11 +572,10 @@ void StorageBlock::aggregateGroupByFast( } } - static_cast(hash_table)->upsertValueAccessorCompositeKeyFast( - argument_ids, - &temp_result, - key_ids, - true); + hash_table->upsertValueAccessorCompositeKeyFast(argument_ids, + &temp_result, + key_ids, + true); }