Skip to content

[WIP] support HCL decoding #39

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

Draft
goldeneggg wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

[WIP] support HCL decoding #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bb4b330
WIP support HCL encoding/decoding
goldeneggg Jul 22, 2022
a683b6f
WIP support HCL encoding/decoding
goldeneggg Jul 22, 2022
2c4e5cb
bump up to 0.10.0
goldeneggg Jul 26, 2022
6bbaf82
WIP hcl
goldeneggg Jul 31, 2022
ed7cdac
WIP support HCL encoding/decoding
goldeneggg Jul 22, 2022
36bd992
refactoring unmarshal logic and temporary removing tests for hcl
goldeneggg Aug 20, 2022
6fe19ca
remove unnecessary codes for yaml.v2 package
goldeneggg Aug 20, 2022
193ce1e
rename method
goldeneggg Aug 20, 2022
a3c7ba8
remove temporary cmd code
goldeneggg Aug 20, 2022
39884f4
support HCL to DynamicStruct by FromHCL method
goldeneggg Aug 20, 2022
57a959a
remove comment line
goldeneggg Aug 21, 2022
3fa9974
fix
goldeneggg Aug 22, 2022
70c0d3d
fix go.mod
goldeneggg Apr 11, 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
9 changes: 0 additions & 9 deletions cmd/strucmd/main.go
View file
Open in desktop

This file was deleted.

360 changes: 332 additions & 28 deletions dynamicstruct/decoder/benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,310 @@ import (
. "github.com/goldeneggg/structil/dynamicstruct/decoder"
)

var (
singleJSON = []byte(`
{
"null_field":null,
"string_field":"かきくけこ",
"int_field":45678,
"float64_field":9.876,
"bool_field":false,
"struct_ptr_field":{
"key":"hugakey",
"value":"hugavalue"
},
"array_string_field":[
"array_str_1",
"array_str_2"
],
"array_struct_field":[
{
"kkk":"kkk1",
"vvvv":"vvv1"
},
{
"kkk":"kkk2",
"vvvv":"vvv2"
},
{
"kkk":"kkk3",
"vvvv":"vvv3"
}
]
}
`)

arrayJSON = []byte(`
[
{
"null_field":null,
"string_field":"かきくけこ",
"int_field":45678,
"float64_field":9.876,
"bool_field":false,
"struct_ptr_field":{
"key":"hugakey",
"value":"hugavalue"
},
"array_string_field":[
"array_str_1",
"array_str_2"
],
"array_struct_field":[
{
"kkk":"kkk1",
"vvvv":"vvv1"
},
{
"kkk":"kkk2",
"vvvv":"vvv2"
},
{
"kkk":"kkk3",
"vvvv":"vvv3"
}
]
},
{
"null_field":null,
"string_field":"さしすせそ",
"int_field":7890,
"float64_field":4.99,
"bool_field":true,
"struct_ptr_field":{
"key":"hugakeyXXX",
"value":"hugavalueXXX"
},
"array_string_field":[
"array_str_111",
"array_str_222"
],
"array_struct_field":[
{
"kkk":"kkk99",
"vvvv":"vvv99"
},
{
"kkk":"kkk999",
"vvvv":"vvv999"
},
{
"kkk":"kkk9999",
"vvvv":"vvv9999"
}
]
}
]
`)

singleYAML = []byte(`
null_field: null
string_field: かきくけこ
int_field: 45678
float64_field: 9.876
bool_field: false
struct_ptr_field:
key: hugakey
value: hugavalue
array_string_field:
- array_str_1
- array_str_2
array_struct_field:
- kkk: kkk1
vvvv: vvv1
- kkk: kkk2
vvvv: vvv2
- kkk: kkk3
vvvv: vvv3
`)

arrayYAML = []byte(`
- null_field: null
string_field: かきくけこ
int_field: 45678
float64_field: 9.876
bool_field: false
struct_ptr_field:
key: hugakey
value: hugavalue
array_string_field:
- array_str_1
- array_str_2
array_struct_field:
- kkk: kkk1
vvvv: vvv1
- kkk: kkk2
vvvv: vvv2
- kkk: kkk3
vvvv: vvv3
- null_field: null
string_field: さしすせそ
int_field: 7890
float64_field: 4.99
bool_field: true
struct_ptr_field:
key: hugakeyXXX
value: hugavalueXXX
array_string_field:
- array_str_111
- array_str_222
array_struct_field:
- kkk: kkk99
vvvv: vvv99
- kkk: kkk999
vvvv: vvv999
- kkk: kkk9999
vvvv: vvv9999
`)

//lint:ignore U1000 It's ok because this is for the future.
singleTOML = []byte(`
string_field = "かきくけこ,"
int_field = 45678
float64_field = "9.876,"
bool_field = false
array_string_field = ["array_str_1", "array_str_2"]

[struct_ptr_field]
key = "hugakey"
value = "hugavalue"

[[array_struct_field]]
kkk = "kkk1"
vvvv = "vvv1"

[[array_struct_field]]
kkk = "kkk2"
vvvv = "vvv2"

[[array_struct_field]]
kkk = "kkk3"
vvvv = "vvv3"
`)

//lint:ignore U1000 It's ok because this is for the future.
singleXML = []byte(`
<?xml version="1.0" encoding="UTF-8" ?>
<root>
<null_field/>
<string_field>かきくけこ</string_field>
<int_field>45678</int_field>
<float64_field>9.876</float64_field>
<bool_field>false</bool_field>
<struct_ptr_field>
<key>hugakey</key>
<value>hugavalue</value>
</struct_ptr_field>
<array_string_field>array_str_1</array_string_field>
<array_string_field>array_str_2</array_string_field>
<array_struct_field>
<kkk>kkk1</kkk>
<vvvv>vvv1</vvvv>
</array_struct_field>
<array_struct_field>
<kkk>kkk2</kkk>
<vvvv>vvv2</vvvv>
</array_struct_field>
<array_struct_field>
<kkk>kkk3</kkk>
<vvvv>vvv3</vvvv>
</array_struct_field>
</root>
`)

//lint:ignore U1000 It's ok because this is for the future.
arrayXML = []byte(`
<?xml version="1.0" encoding="UTF-8" ?>
<root>
<0>
<null_field/>
<string_field>かきくけこ</string_field>
<int_field>45678</int_field>
<float64_field>9.876</float64_field>
<bool_field>false</bool_field>
<struct_ptr_field>
<key>hugakey</key>
<value>hugavalue</value>
</struct_ptr_field>
<array_string_field>array_str_1</array_string_field>
<array_string_field>array_str_2</array_string_field>
<array_struct_field>
<kkk>kkk1</kkk>
<vvvv>vvv1</vvvv>
</array_struct_field>
<array_struct_field>
<kkk>kkk2</kkk>
<vvvv>vvv2</vvvv>
</array_struct_field>
<array_struct_field>
<kkk>kkk3</kkk>
<vvvv>vvv3</vvvv>
</array_struct_field>
</0>
<1>
<null_field/>
<string_field>さしすせそ</string_field>
<int_field>7890</int_field>
<float64_field>4.99</float64_field>
<bool_field>true</bool_field>
<struct_ptr_field>
<key>hugakeyXXX</key>
<value>hugavalueXXX</value>
</struct_ptr_field>
<array_string_field>array_str_111</array_string_field>
<array_string_field>array_str_222</array_string_field>
<array_struct_field>
<kkk>kkk99</kkk>
<vvvv>vvv99</vvvv>
</array_struct_field>
<array_struct_field>
<kkk>kkk999</kkk>
<vvvv>vvv999</vvvv>
</array_struct_field>
<array_struct_field>
<kkk>kkk9999</kkk>
<vvvv>vvv9999</vvvv>
</array_struct_field>
</1>
</root>
`)

//lint:ignore U1000 It's ok because this is for the future.
singleHCL = []byte(`
null_field =

string_field = "かきくけこ,"

int_field = 45678

float64_field = "9.876,"

bool_field = false

struct_ptr_field = {
key = "hugakey"
value = "hugavalue"
}

array_string_field = ["array_str_1", "array_str_2"]

array_struct_field = {
kkk = "kkk1"
vvvv = "vvv1"
}

"array_struct_field" = {
kkk = "kkk2"
vvvv = "vvv2"
}

array_struct_field = {
kkk = "kkk3"
vvvv = "vvv3"
}
`)
)

func BenchmarkFromJSON_singleJSON(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
Expand Down Expand Up @@ -74,6 +378,34 @@ func BenchmarkDynamicStruct_arrayJSON_nest_useTag(b *testing.B) {
}
}

func BenchmarkJSONToGetter_singleJSON_nonNest(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, _ = JSONToGetter(singleJSON, false)
}
}

func BenchmarkJSONToGetter_singleJSON_nest(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, _ = JSONToGetter(singleJSON, true)
}
}

func BenchmarkJSONToGetter_arrayJSON_nonNest(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, _ = JSONToGetter(arrayJSON, false)
}
}

func BenchmarkJSONToGetter_arrayJSON_nest(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, _ = JSONToGetter(arrayJSON, true)
}
}

func BenchmarkFromYAML_singleYAML(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
Expand Down Expand Up @@ -142,34 +474,6 @@ func BenchmarkDynamicStruct_arrayYAML_nest_useTag(b *testing.B) {
}
}

func BenchmarkJSONToGetter_singleJSON_nonNest(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, _ = JSONToGetter(singleJSON, false)
}
}

func BenchmarkJSONToGetter_singleJSON_nest(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, _ = JSONToGetter(singleJSON, true)
}
}

func BenchmarkJSONToGetter_arrayJSON_nonNest(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, _ = JSONToGetter(arrayJSON, false)
}
}

func BenchmarkJSONToGetter_arrayJSON_nest(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, _ = JSONToGetter(arrayJSON, true)
}
}

func BenchmarkYAMLToGetter_singleYAML_nonNest(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
Expand Down
Loading