Merge pull request #486 from jpmorganchase/schema-fix

Fixed 0-sided schema
finos · Mar 15, 2019 · cb62fbf · cb62fbf
2 parents 6aae31b + 49dd654
commit cb62fbf
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 65 deletions.
diff --git a/cpp/perspective/src/cpp/view.cpp b/cpp/perspective/src/cpp/view.cpp
@@ -142,71 +142,6 @@ View<t_ctx2>::set_depth(std::int32_t depth, std::int32_t row_pivot_length) {
     }
 }
 
-/**
- * @brief The schema of this View.  A schema is an std::map, the keys of which
- * are the columns of this View, and the values are their string type names.
- * If this View is aggregated, theses will be the aggregated types;
- * otherwise these types will be the same as the columns in the underlying
- * Table.
- *
- * @return std::map<std::string, std::string>
- */
-template <typename CTX_T>
-std::map<std::string, std::string>
-View<CTX_T>::schema() const {
-    auto schema = m_gnode->get_tblschema();
-    auto _types = schema.types();
-    auto names = schema.columns();
-
-    std::map<std::string, t_dtype> types;
-    std::map<std::string, std::string> new_schema;
-
-    for (std::size_t i = 0, max = names.size(); i != max; ++i) {
-        types[names[i]] = _types[i];
-    }
-
-    auto col_names = _column_names(false);
-    for (const std::string& name : col_names) {
-        // Pull out the main aggregate column
-        std::size_t last_delimiter = name.find_last_of(m_separator);
-        std::string agg_name = name.substr(last_delimiter + 1);
-
-        std::string type_string = dtype_to_str(types[agg_name]);
-        new_schema[agg_name] = type_string;
-
-        if (m_row_pivots.size() > 0 && !is_column_only()) {
-            new_schema[agg_name] = _map_aggregate_types(agg_name, new_schema[agg_name]);
-        }
-    }
-
-    return new_schema;
-}
-/**
- * @brief The schema of this View. Output and logic is as the above
- * schema(), but this version is specialized for zero-sided
- * contexts.
- *
- * @return std::map<std::string, std::string>
- */
-template <>
-std::map<std::string, std::string>
-View<t_ctx0>::schema() const {
-    t_schema schema = m_gnode->get_tblschema();
-    std::vector<t_dtype> _types = schema.types();
-    std::vector<std::string> names = schema.columns();
-
-    std::map<std::string, std::string> new_schema;
-
-    for (std::size_t i = 0, max = names.size(); i != max; ++i) {
-        if (names[i] == "psp_okey") {
-            continue;
-        }
-        new_schema[names[i]] = dtype_to_str(_types[i]);
-    }
-
-    return new_schema;
-}
-
 /**
  * @brief The column names of the View. If the View is aggregated, the
  * individual column names will be joined with a separator character
@@ -286,6 +221,78 @@ View<t_ctx0>::_column_names(bool skip, std::int32_t depth) const {
     return names;
 }
 
+/**
+ * @brief The schema of this View.  A schema is an std::map, the keys of which
+ * are the columns of this View, and the values are their string type names.
+ * If this View is aggregated, theses will be the aggregated types;
+ * otherwise these types will be the same as the columns in the underlying
+ * Table.
+ *
+ * @return std::map<std::string, std::string>
+ */
+template <typename CTX_T>
+std::map<std::string, std::string>
+View<CTX_T>::schema() const {
+    auto schema = m_gnode->get_tblschema();
+    auto _types = schema.types();
+    auto names = schema.columns();
+
+    std::map<std::string, t_dtype> types;
+    std::map<std::string, std::string> new_schema;
+
+    for (std::size_t i = 0, max = names.size(); i != max; ++i) {
+        types[names[i]] = _types[i];
+    }
+
+    auto col_names = _column_names(false);
+    for (const std::string& name : col_names) {
+        // Pull out the main aggregate column
+        std::size_t last_delimiter = name.find_last_of(m_separator);
+        std::string agg_name = name.substr(last_delimiter + 1);
+
+        std::string type_string = dtype_to_str(types[agg_name]);
+        new_schema[agg_name] = type_string;
+
+        if (m_row_pivots.size() > 0 && !is_column_only()) {
+            new_schema[agg_name] = _map_aggregate_types(agg_name, new_schema[agg_name]);
+        }
+    }
+
+    return new_schema;
+}
+/**
+ * @brief The schema of this View. Output and logic is as the above
+ * schema(), but this version is specialized for zero-sided
+ * contexts.
+ *
+ * @return std::map<std::string, std::string>
+ */
+template <>
+std::map<std::string, std::string>
+View<t_ctx0>::schema() const {
+    t_schema schema = m_gnode->get_tblschema();
+    std::vector<t_dtype> _types = schema.types();
+    std::vector<std::string> names = schema.columns();
+
+    std::map<std::string, t_dtype> types;
+    for (std::size_t i = 0, max = names.size(); i != max; ++i) {
+        types[names[i]] = _types[i];
+    }
+
+    std::vector<std::string> column_names = _column_names(false);
+    std::map<std::string, std::string> new_schema;
+
+    for (std::size_t i = 0, max = column_names.size(); i != max; ++i) {
+        std::string name = column_names[i];
+        if (name == "psp_okey") {
+            continue;
+        }
+        new_schema[name] = dtype_to_str(types[name]);
+    }
+
+    return new_schema;
+}
+
 /**
  * @brief Returns a slice of the underlying data of the view.
  *

diff --git a/packages/perspective/test/js/constructors.js b/packages/perspective/test/js/constructors.js
@@ -202,6 +202,26 @@ module.exports = perspective => {
         });
     });
 
+    describe("Schema", function() {
+        it("0-sided view", async function() {
+            const table = perspective.table(int_float_string_data);
+            const view = table.view();
+            const schema = await view.schema();
+            expect(schema).toEqual({int: "integer", float: "float", string: "string"});
+            view.delete();
+            table.delete();
+        });
+
+        it("0-sided view with aggregate selection", async function() {
+            const table = perspective.table(int_float_string_data);
+            const view = table.view({aggregate: [{column: "float", op: "sum"}, {column: "string", op: "sum"}]});
+            const schema = await view.schema();
+            expect(schema).toEqual({float: "float", string: "string"});
+            view.delete();
+            table.delete();
+        });
+    });
+
     describe("Typed Arrays", function() {
         it("Int, 0-sided view", async function() {
             var table = perspective.table(int_float_data);