Eng 11366 windowed count (#4099)

Implement count(*) and count(EXPR) window functions. https://issues.voltdb.com/browse/ENG-11366
VoltDB · Dec 8, 2016 · f45aa90 · f45aa90
1 parent 8f12ce5
commit f45aa90
Show file tree

Hide file tree

Showing 29 changed files with 1,863 additions and 442 deletions.
diff --git a/build.py b/build.py
@@ -496,7 +496,8 @@
     OptimizedProjectorTest
     MergeReceiveExecutorTest
     TestGeneratedPlans
-    TestRank
+    TestWindowedRank
+    TestWindowedCount
     """
 
 if whichtests in ("${eetestsuite}", "expressions"):

diff --git a/src/ee/common/TupleSchema.cpp b/src/ee/common/TupleSchema.cpp
@@ -19,6 +19,8 @@
 #include <cstdio>
 #include "common/TupleSchema.h"
 #include "common/NValue.hpp"
+#include "expressions/abstractexpression.h"
+#include "plannodes/abstractplannode.h"
 
 namespace voltdb {
 
@@ -229,6 +231,26 @@ TupleSchema::createTupleSchema(const TupleSchema *first,
     return schema;
 }
 
+TupleSchema* TupleSchema::createTupleSchema(
+        const std::vector<AbstractExpression *> &exprs) {
+    std::vector<ValueType> columnTypes;
+    std::vector<int32_t> columnSizes;
+    std::vector<bool> columnAllowNull;
+    std::vector<bool> columnInBytes;
+
+    for (auto b = exprs.begin(), e = exprs.end(); b != e; b++) {
+        const AbstractExpression *expr = *b;
+        columnTypes.push_back(expr->getValueType());
+        columnSizes.push_back(expr->getValueSize());
+        columnAllowNull.push_back(true);
+        columnInBytes.push_back(expr->getInBytes());
+    }
+    return TupleSchema::createTupleSchema(columnTypes,
+                                          columnSizes,
+                                          columnAllowNull,
+                                          columnInBytes);
+}
+
 void TupleSchema::freeTupleSchema(TupleSchema *schema) {
     delete[] reinterpret_cast<char*>(schema);
 }

diff --git a/src/ee/common/TupleSchema.h b/src/ee/common/TupleSchema.h
@@ -34,6 +34,7 @@
 
 namespace voltdb {
 
+class AbstractExpression;
 /**
  * Represents the schema of a tuple or table row. Used to define table rows, as
  * well as index keys. Note: due to arbitrary size embedded array data, this class
@@ -86,6 +87,8 @@ class TupleSchema {
                                                  const std::vector<int32_t> columnSizes,
                                                  const std::vector<bool> allowNull);
 
+    static TupleSchema* createTupleSchema(const std::vector<AbstractExpression *> &exprs);
+
     /** Static factory method fakes a copy constructor (will also
      *  duplicate hidden columns) */
     static TupleSchema* createTupleSchema(const TupleSchema *schema);

diff --git a/src/ee/common/types.cpp b/src/ee/common/types.cpp
@@ -623,6 +623,9 @@ string expressionToString(ExpressionType type)
     case EXPRESSION_TYPE_AGGREGATE_WINDOWED_DENSE_RANK: {
         return "EXPRESSION_TYPE_AGGREGATE_WINDOWED_RANK";
     }
+    case EXPRESSION_TYPE_AGGREGATE_WINDOWED_COUNT: {
+        return "EXPRESSION_TYPE_AGGREGATE_WINDOWED_COUNT";
+    }
     case EXPRESSION_TYPE_AGGREGATE_SUM: {
         return "AGGREGATE_SUM";
     }
@@ -732,6 +735,8 @@ ExpressionType stringToExpression(string str )
         return EXPRESSION_TYPE_AGGREGATE_WINDOWED_RANK;
     } else if (str == "AGGREGATE_WINDOWED_DENSE_RANK") {
         return EXPRESSION_TYPE_AGGREGATE_WINDOWED_DENSE_RANK;
+    } else if (str == "AGGREGATE_WINDOWED_COUNT") {
+        return EXPRESSION_TYPE_AGGREGATE_WINDOWED_COUNT;
     } else if (str == "AGGREGATE_SUM") {
         return EXPRESSION_TYPE_AGGREGATE_SUM;
     } else if (str == "AGGREGATE_MIN") {

diff --git a/src/ee/common/types.h b/src/ee/common/types.h
@@ -318,6 +318,7 @@ enum ExpressionType {
     // -----------------------------
     EXPRESSION_TYPE_AGGREGATE_WINDOWED_RANK                   = 70,
     EXPRESSION_TYPE_AGGREGATE_WINDOWED_DENSE_RANK             = 71,
+    EXPRESSION_TYPE_AGGREGATE_WINDOWED_COUNT                  = 72,
     // -----------------------------
     // Functions
     // -----------------------------