Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
wendelin
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
wendelin
Commits
72a0730d
Commit
72a0730d
authored
May 06, 2020
by
Ivan Tyagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use proper script to get all Data Streams for a Data Set rather than rely on reference. Test it.
parent
eb51cb86
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/DataSet_getDataStreamList.py
...kins/erp5_wendelin_data_lake/DataSet_getDataStreamList.py
+1
-1
bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/getDataStreamList.py
...portal_skins/erp5_wendelin_data_lake/getDataStreamList.py
+6
-7
bt5/erp5_wendelin_data_lake_ingestion/TestTemplateItem/portal_components/test.erp5.testDataLakeIngestion.py
...Item/portal_components/test.erp5.testDataLakeIngestion.py
+3
-1
No files found.
bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/DataSet_getDataStreamList.py
View file @
72a0730d
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
Note: This code is quite computationally costly (for Data Streams having thousands of iles) as it needs to:
Note: This code is quite computationally costly (for Data Streams having thousands of iles) as it needs to:
1. Query MariaDB to find ingestion lines
1. Query MariaDB to find ingestion lines
2. Read from ZODB both Data Ingestion Lines and Data Streams (wh
o
ch itself can be big too)
2. Read from ZODB both Data Ingestion Lines and Data Streams (wh
i
ch itself can be big too)
"""
"""
data_ingestion_line_list
=
context
.
portal_catalog
(
data_ingestion_line_list
=
context
.
portal_catalog
(
portal_type
=
"Data Ingestion Line"
,
portal_type
=
"Data Ingestion Line"
,
...
...
bt5/erp5_wendelin_data_lake_ingestion/SkinTemplateItem/portal_skins/erp5_wendelin_data_lake/getDataStreamList.py
View file @
72a0730d
"""
This script is called from ebulk client to get list of Data Streams for a
Data set.
"""
import
re
import
re
import
json
import
json
from
Products.ERP5Type.Log
import
log
from
Products.ERP5Type.Log
import
log
...
@@ -20,14 +25,8 @@ data_set = portal.data_set_module.get(data_set_reference)
...
@@ -20,14 +25,8 @@ data_set = portal.data_set_module.get(data_set_reference)
if
data_set
is
None
:
if
data_set
is
None
:
return
[]
return
[]
# XXX: use DataSet_getDataStreamList instead!
query_dict
=
{
"portal_type"
:
"Data Stream"
,
"reference"
:
data_set
.
getReference
()
+
reference_separator
+
"%"
}
data_stream_list
=
[]
data_stream_list
=
[]
for
stream
in
data_set
.
DataSet_getDataStreamList
():
for
stream
in
portal_catalog
(
**
query_dict
):
if
stream
.
getVersion
()
==
""
:
if
stream
.
getVersion
()
==
""
:
return
{
"status_code"
:
2
,
"result"
:
[]
}
return
{
"status_code"
:
2
,
"result"
:
[]
}
data_stream_list
.
append
({
'id'
:
'data_stream_module/'
+
stream
.
getId
(),
data_stream_list
.
append
({
'id'
:
'data_stream_module/'
+
stream
.
getId
(),
...
...
bt5/erp5_wendelin_data_lake_ingestion/TestTemplateItem/portal_components/test.erp5.testDataLakeIngestion.py
View file @
72a0730d
...
@@ -84,7 +84,6 @@ class TestDataIngestion(SecurityTestCase):
...
@@ -84,7 +84,6 @@ class TestDataIngestion(SecurityTestCase):
def
ingest
(
self
,
data_chunk
,
reference
,
extension
,
eof
,
randomize_ingestion_reference
=
False
):
def
ingest
(
self
,
data_chunk
,
reference
,
extension
,
eof
,
randomize_ingestion_reference
=
False
):
ingestion_reference
=
self
.
getIngestionReference
(
reference
,
extension
,
randomize_ingestion_reference
)
ingestion_reference
=
self
.
getIngestionReference
(
reference
,
extension
,
randomize_ingestion_reference
)
self
.
portal
.
log
(
ingestion_reference
)
# use default ebulk policy
# use default ebulk policy
ingestion_policy
=
self
.
portal
.
portal_ingestion_policies
.
wendelin_embulk
ingestion_policy
=
self
.
portal
.
portal_ingestion_policies
.
wendelin_embulk
...
@@ -197,6 +196,9 @@ class TestDataIngestion(SecurityTestCase):
...
@@ -197,6 +196,9 @@ class TestDataIngestion(SecurityTestCase):
"""
"""
data_set
,
data_stream_list
=
self
.
stepIngest
(
self
.
CSV
,
","
,
randomize_ingestion_reference
=
True
)
data_set
,
data_stream_list
=
self
.
stepIngest
(
self
.
CSV
,
","
,
randomize_ingestion_reference
=
True
)
self
.
tic
()
self
.
tic
()
# check data relation between Data Set and Data Streams work
self
.
assertSameSet
(
data_stream_list
,
data_set
.
DataSet_getDataStreamList
())
# publish data set and have all Data Streams publsihed automatically
# publish data set and have all Data Streams publsihed automatically
data_set
.
publish
()
data_set
.
publish
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment