Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SXML: optimize json parsing #801

Merged
merged 10 commits into from
Oct 22, 2023
Merged

SXML: optimize json parsing #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1a00a08
wip
larshp Oct 20, 2023
4db70fd
update
larshp Oct 20, 2023
cac1878
test
larshp Oct 22, 2023
34b89fe
refactor
larshp Oct 22, 2023
9aa5c5e
use field symbol
larshp Oct 22, 2023
ba04a0e
optimize
larshp Oct 22, 2023
c8236af
cleanup
larshp Oct 22, 2023
d67acf5
optimize
larshp Oct 22, 2023
47567d7
inline
larshp Oct 22, 2023
52fa605
cleanup
larshp Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
},
"license": "MIT",
"dependencies": {
"@abaplint/cli": "^2.102.58",
"@abaplint/runtime": "^2.7.114",
"@abaplint/cli": "^2.102.60",
"@abaplint/runtime": "^2.7.117",
"@abaplint/database-sqlite": "^2.7.101",
"@abaplint/transpiler-cli": "^2.7.114"
"@abaplint/transpiler-cli": "^2.7.117"
}
}
102 changes: 40 additions & 62 deletions src/sxml/cl_sxml_string_reader.clas.locals_imp.abap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ CLASS lcl_json_parser DEFINITION.
IMPORTING
iv_json TYPE any
iv_key TYPE string OPTIONAL.
METHODS traverse_basic
IMPORTING
iv_json TYPE any
iv_key TYPE string OPTIONAL.
METHODS traverse_array
IMPORTING
iv_json TYPE any
Expand Down Expand Up @@ -97,42 +93,32 @@ CLASS lcl_json_parser IMPLEMENTATION.
WHEN 'array'.
traverse_array( iv_json = iv_json iv_key = iv_key ).
WHEN 'string' OR 'boolean' OR 'number' OR 'null'.
traverse_basic( iv_json = iv_json iv_key = iv_key ).
WRITE '@KERNEL iv_json = iv_json.value + "";'.

CASE lv_type.
WHEN 'string'.
lv_type = 'str'.
WHEN 'number'.
lv_type = 'num'.
WHEN 'boolean'.
lv_type = 'bool'.
ENDCASE.

append( iv_type = if_sxml_node=>co_nt_element_open
iv_name = lv_type
iv_key = iv_key ).
IF lv_type <> 'null'.
append( iv_type = if_sxml_node=>co_nt_value
iv_value = iv_json ).
ENDIF.
append( iv_type = if_sxml_node=>co_nt_element_close
iv_name = lv_type ).
WHEN OTHERS.
ASSERT 2 = 'todo'.
ENDCASE.

ENDMETHOD.

METHOD traverse_basic.

DATA lv_type TYPE string.

WRITE '@KERNEL let parsed = iv_json.value;'.
WRITE '@KERNEL iv_json = new abap.types.String().set(iv_json.value + "");'.
WRITE '@KERNEL lv_type.set(typeof parsed);'.
WRITE '@KERNEL if (parsed === null) lv_type.set("null");'.

CASE lv_type.
WHEN 'string'.
lv_type = 'str'.
WHEN 'number'.
lv_type = 'num'.
WHEN 'boolean'.
lv_type = 'bool'.
ENDCASE.

append( iv_type = if_sxml_node=>co_nt_element_open
iv_name = lv_type
iv_key = iv_key ).
IF lv_type <> 'null'.
append( iv_type = if_sxml_node=>co_nt_value
iv_value = iv_json ).
ENDIF.
append( iv_type = if_sxml_node=>co_nt_element_close
iv_name = lv_type ).

ENDMETHOD.

METHOD traverse_array.

Expand Down Expand Up @@ -160,7 +146,7 @@ CLASS lcl_json_parser IMPLEMENTATION.

METHOD traverse_object.

DATA lt_keys TYPE STANDARD TABLE OF string WITH DEFAULT KEY.
DATA lt_keys TYPE STANDARD TABLE OF string WITH DEFAULT KEY.
DATA lv_key LIKE LINE OF lt_keys.
DATA lv_value TYPE string.

Expand Down Expand Up @@ -280,73 +266,61 @@ CLASS lcl_reader DEFINITION.
DATA mv_json TYPE string.
DATA mt_nodes TYPE ty_nodes.
DATA mv_pointer TYPE i.
DATA mv_initialized TYPE abap_bool.
ENDCLASS.

CLASS lcl_reader IMPLEMENTATION.
METHOD constructor.
mv_json = iv_json.
mv_initialized = abap_false.
ENDMETHOD.

METHOD initialize.

TYPES: BEGIN OF ty_cache,
name TYPE string,
ref TYPE REF TO if_sxml_node,
END OF ty_cache.

DATA lo_json TYPE REF TO lcl_json_parser.
DATA lt_parsed TYPE REF TO lcl_json_parser=>ty_nodes.
DATA ls_parsed TYPE lcl_json_parser=>ty_node.
DATA li_node TYPE REF TO if_sxml_node.
DATA lt_attributes TYPE if_sxml_attribute=>attributes.
DATA li_attribute TYPE REF TO if_sxml_attribute.

DATA lt_close TYPE HASHED TABLE OF ty_cache WITH UNIQUE KEY name.
DATA lt_open TYPE HASHED TABLE OF ty_cache WITH UNIQUE KEY name.
DATA lt_value TYPE HASHED TABLE OF ty_cache WITH UNIQUE KEY name.
DATA ls_cache TYPE ty_cache.

FIELD-SYMBOLS <ls_cache> TYPE ty_cache.
FIELD-SYMBOLS <ls_parsed> TYPE lcl_json_parser=>ty_node.

IF mv_json IS INITIAL.
RETURN.
ENDIF.
ASSERT mv_initialized = abap_false.
mv_initialized = abap_true.

* todo, for now this only handles json, but the class is really meant for XML
* todo: for now this only handles json, but the class is really meant for XML
CREATE OBJECT lo_json.
CREATE DATA lt_parsed.
lo_json->parse(
iv_json = mv_json
it_nodes = lt_parsed ).
CLEAR lo_json. " release memory

LOOP AT lt_parsed->* INTO ls_parsed.
CASE ls_parsed-type.
LOOP AT lt_parsed->* ASSIGNING <ls_parsed>.
CASE <ls_parsed>-type.
WHEN if_sxml_node=>co_nt_element_open.
CLEAR lt_attributes.
IF ls_parsed-key IS NOT INITIAL.
IF <ls_parsed>-key IS NOT INITIAL.
CREATE OBJECT li_attribute TYPE lcl_attribute
EXPORTING
name = 'name'
value = ls_parsed-key
value = <ls_parsed>-key
value_type = if_sxml_value=>co_vt_text.
APPEND li_attribute TO lt_attributes.
ENDIF.

* optimized by using singletons,
CREATE OBJECT li_node TYPE lcl_open_node
EXPORTING
name = ls_parsed-name
name = <ls_parsed>-name
attributes = lt_attributes.
WHEN if_sxml_node=>co_nt_element_close.
* optimized by using singletons,
CREATE OBJECT li_node TYPE lcl_close_node
EXPORTING
name = ls_parsed-name.
name = <ls_parsed>-name.
WHEN if_sxml_node=>co_nt_value.
CREATE OBJECT li_node TYPE lcl_value_node
EXPORTING
value = ls_parsed-value.
value = <ls_parsed>-value.
WHEN OTHERS.
ASSERT 1 = 2.
ENDCASE.
Expand All @@ -367,7 +341,9 @@ CLASS lcl_reader IMPLEMENTATION.
DATA close TYPE REF TO if_sxml_close_element.
DATA value TYPE REF TO if_sxml_value_node.

initialize( ).
IF mv_initialized = abap_false.
initialize( ).
ENDIF.
READ TABLE mt_nodes INDEX mv_pointer INTO node.
mv_pointer = mv_pointer + 1.
if_sxml_reader~node_type = node->type.
Expand All @@ -388,7 +364,9 @@ CLASS lcl_reader IMPLEMENTATION.
ENDMETHOD.

METHOD if_sxml_reader~read_next_node.
initialize( ).
IF mv_initialized = abap_false.
initialize( ).
ENDIF.
READ TABLE mt_nodes INDEX mv_pointer INTO node.
mv_pointer = mv_pointer + 1.
ENDMETHOD.
Expand Down