This is an automated email from the ASF dual-hosted git repository.
beto pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 6df74c6 Remove __row_id (#8257)
6df74c6 is described below
commit 6df74c6b8eb4ce502d3b582a56590fc3d9514517
Author: Beto Dealmeida <[email protected]>
AuthorDate: Wed Sep 18 20:32:33 2019 -0700
Remove __row_id (#8257)
---
superset/db_engine_specs/presto.py | 5 ----
tests/db_engine_specs_test.py | 55 +++++---------------------------------
2 files changed, 6 insertions(+), 54 deletions(-)
diff --git a/superset/db_engine_specs/presto.py
b/superset/db_engine_specs/presto.py
index ddc6442..65d5988 100644
--- a/superset/db_engine_specs/presto.py
+++ b/superset/db_engine_specs/presto.py
@@ -926,11 +926,6 @@ class PrestoEngineSpec(BaseEngineSpec):
if not is_feature_enabled("PRESTO_EXPAND_DATA"):
return columns, data, []
- # insert a custom column that tracks the original row
- columns.insert(0, {"name": "__row_id", "type": "BIGINT"})
- for i, row in enumerate(data):
- row["__row_id"] = i
-
# process each column, unnesting ARRAY types and expanding ROW types
into new columns
to_process = deque((column, 0) for column in columns)
all_columns: List[dict] = []
diff --git a/tests/db_engine_specs_test.py b/tests/db_engine_specs_test.py
index ec6ff24..5975f95 100644
--- a/tests/db_engine_specs_test.py
+++ b/tests/db_engine_specs_test.py
@@ -655,49 +655,18 @@ class DbEngineSpecsTestCase(SupersetTestCase):
cols, data
)
expected_cols = [
- {"name": "__row_id", "type": "BIGINT"},
{"name": "row_column", "type": "ROW(NESTED_OBJ VARCHAR)"},
{"name": "row_column.nested_obj", "type": "VARCHAR"},
{"name": "array_column", "type": "ARRAY(BIGINT)"},
]
expected_data = [
- {
- "__row_id": 0,
- "array_column": 1,
- "row_column": ["a"],
- "row_column.nested_obj": "a",
- },
- {
- "__row_id": "",
- "array_column": 2,
- "row_column": "",
- "row_column.nested_obj": "",
- },
- {
- "__row_id": "",
- "array_column": 3,
- "row_column": "",
- "row_column.nested_obj": "",
- },
- {
- "__row_id": 1,
- "array_column": 4,
- "row_column": ["b"],
- "row_column.nested_obj": "b",
- },
- {
- "__row_id": "",
- "array_column": 5,
- "row_column": "",
- "row_column.nested_obj": "",
- },
- {
- "__row_id": "",
- "array_column": 6,
- "row_column": "",
- "row_column.nested_obj": "",
- },
+ {"array_column": 1, "row_column": ["a"], "row_column.nested_obj":
"a"},
+ {"array_column": 2, "row_column": "", "row_column.nested_obj": ""},
+ {"array_column": 3, "row_column": "", "row_column.nested_obj": ""},
+ {"array_column": 4, "row_column": ["b"], "row_column.nested_obj":
"b"},
+ {"array_column": 5, "row_column": "", "row_column.nested_obj": ""},
+ {"array_column": 6, "row_column": "", "row_column.nested_obj": ""},
]
expected_expanded_cols = [{"name": "row_column.nested_obj", "type":
"VARCHAR"}]
@@ -720,7 +689,6 @@ class DbEngineSpecsTestCase(SupersetTestCase):
cols, data
)
expected_cols = [
- {"name": "__row_id", "type": "BIGINT"},
{
"name": "row_column",
"type": "ROW(NESTED_OBJ1 VARCHAR, NESTED_ROW ROW(NESTED_OBJ2
VARCHAR))",
@@ -731,14 +699,12 @@ class DbEngineSpecsTestCase(SupersetTestCase):
]
expected_data = [
{
- "__row_id": 0,
"row_column": ["a1", ["a2"]],
"row_column.nested_obj1": "a1",
"row_column.nested_row": ["a2"],
"row_column.nested_row.nested_obj2": "a2",
},
{
- "__row_id": 1,
"row_column": ["b1", ["b2"]],
"row_column.nested_obj1": "b1",
"row_column.nested_row": ["b2"],
@@ -774,7 +740,6 @@ class DbEngineSpecsTestCase(SupersetTestCase):
cols, data
)
expected_cols = [
- {"name": "__row_id", "type": "BIGINT"},
{"name": "int_column", "type": "BIGINT"},
{
"name": "array_column",
@@ -788,56 +753,48 @@ class DbEngineSpecsTestCase(SupersetTestCase):
]
expected_data = [
{
- "__row_id": 0,
"array_column": [[["a"], ["b"]]],
"array_column.nested_array": ["a"],
"array_column.nested_array.nested_obj": "a",
"int_column": 1,
},
{
- "__row_id": "",
"array_column": "",
"array_column.nested_array": ["b"],
"array_column.nested_array.nested_obj": "b",
"int_column": "",
},
{
- "__row_id": "",
"array_column": [[["c"], ["d"]]],
"array_column.nested_array": ["c"],
"array_column.nested_array.nested_obj": "c",
"int_column": "",
},
{
- "__row_id": "",
"array_column": "",
"array_column.nested_array": ["d"],
"array_column.nested_array.nested_obj": "d",
"int_column": "",
},
{
- "__row_id": 1,
"array_column": [[["e"], ["f"]]],
"array_column.nested_array": ["e"],
"array_column.nested_array.nested_obj": "e",
"int_column": 2,
},
{
- "__row_id": "",
"array_column": "",
"array_column.nested_array": ["f"],
"array_column.nested_array.nested_obj": "f",
"int_column": "",
},
{
- "__row_id": "",
"array_column": [[["g"], ["h"]]],
"array_column.nested_array": ["g"],
"array_column.nested_array.nested_obj": "g",
"int_column": "",
},
{
- "__row_id": "",
"array_column": "",
"array_column.nested_array": ["h"],
"array_column.nested_array.nested_obj": "h",
