This is an automated email from the ASF dual-hosted git repository.
laskoviymishka pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg-go.git
The following commit(s) were added to refs/heads/main by this push:
new 2e2ab6886 refactor(schema)!: use JSON initialism in schema constructor
(#2307)
2e2ab6886 is described below
commit 2e2ab68860c63aabd1226e19d95c45aa69a9d8ee
Author: Minh Vu <[email protected]>
AuthorDate: Sun Oct 25 10:11:26 2026 +0100
refactor(schema)!: use JSON initialism in schema constructor (#2307)
---
cmd/iceberg/main.go | 2 +-
cmd/iceberg/schema_defaults_test.go | 6 +++---
schema.go | 4 ++--
schema_test.go | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/cmd/iceberg/main.go b/cmd/iceberg/main.go
index f894614d0..15c0b2360 100644
--- a/cmd/iceberg/main.go
+++ b/cmd/iceberg/main.go
@@ -532,7 +532,7 @@ func runCreate(ctx context.Context, output Output, cat
catalog.Catalog, cmd *Cre
case tbl.Schema != "":
var err error
- schema, err = iceberg.NewSchemaFromJsonFields(0,
tbl.Schema)
+ schema, err = iceberg.NewSchemaFromJSONFields(0,
tbl.Schema)
if err != nil {
output.Error(err)
osExit(1)
diff --git a/cmd/iceberg/schema_defaults_test.go
b/cmd/iceberg/schema_defaults_test.go
index b030f6ef5..893bb8ff6 100644
--- a/cmd/iceberg/schema_defaults_test.go
+++ b/cmd/iceberg/schema_defaults_test.go
@@ -29,7 +29,7 @@ import (
)
func TestBuildSchemaFieldsWithDefaults(t *testing.T) {
- schema, err := iceberg.NewSchemaFromJsonFields(1, `[
+ schema, err := iceberg.NewSchemaFromJSONFields(1, `[
{"id": 1, "name": "id", "required": true, "type": "long"},
{"id": 2, "name": "name", "required": false, "type": "string",
"initial-default": "unknown", "write-default": "N/A"},
{"id": 3, "name": "count", "required": false, "type": "int",
"initial-default": 0, "write-default": 42}
@@ -69,7 +69,7 @@ func TestTextOutputSchemaWithDefaults(t *testing.T) {
pterm.SetDefaultOutput(&buf)
pterm.DisableColor()
- schema, err := iceberg.NewSchemaFromJsonFields(1, `[
+ schema, err := iceberg.NewSchemaFromJSONFields(1, `[
{"id": 1, "name": "id", "required": true, "type": "long"},
{"id": 2, "name": "name", "required": false, "type": "string",
"initial-default": "unknown", "write-default": "N/A"}
]`)
@@ -97,7 +97,7 @@ func TestJSONOutputSchemaWithDefaults(t *testing.T) {
os.Stdout = w
defer func() { os.Stdout = oldStdout }()
- schema, err := iceberg.NewSchemaFromJsonFields(5, `[
+ schema, err := iceberg.NewSchemaFromJSONFields(5, `[
{"id": 1, "name": "x", "required": true, "type": "long"}
]`)
require.NoError(t, err)
diff --git a/schema.go b/schema.go
index ffbcf1c6c..548255aef 100644
--- a/schema.go
+++ b/schema.go
@@ -57,8 +57,8 @@ type Schema struct {
lazyNameMapping func() NameMapping
}
-// NewSchemaFromJsonFields constructs a new schema with the provided ID and
fields in json form
-func NewSchemaFromJsonFields(id int, jsonFieldsStr string) (*Schema, error) {
+// NewSchemaFromJSONFields constructs a new schema with the provided ID and
fields in JSON form.
+func NewSchemaFromJSONFields(id int, jsonFieldsStr string) (*Schema, error) {
var fields []NestedField
err := json.Unmarshal([]byte(jsonFieldsStr), &fields)
if err != nil {
diff --git a/schema_test.go b/schema_test.go
index 1cf9a5e14..573df769d 100644
--- a/schema_test.go
+++ b/schema_test.go
@@ -151,14 +151,14 @@ var (
)
)
-func TestSchemaFromJson(t *testing.T) {
+func TestSchemaFromJSON(t *testing.T) {
testFieldsStr := `[
{"id":1,"name":"foo","type":"string","required":false},
{"id":2,"name":"bar","type":"int","required":true},
{"id":3,"name":"baz","type":"boolean","required":false}
]`
- simpleSchema, err := iceberg.NewSchemaFromJsonFields(1, testFieldsStr)
+ simpleSchema, err := iceberg.NewSchemaFromJSONFields(1, testFieldsStr)
assert.NoError(t, err)
assert.Equal(t, tableSchemaSimple.Fields(), simpleSchema.Fields())
@@ -166,7 +166,7 @@ func TestSchemaFromJson(t *testing.T) {
{"id":1,"name":"id","type":"int","required":true,"doc":"primary
key"},
{"id":2,"name":"name","type":"string","required":false,"doc":"user name"}
]`
- commentSchema, err := iceberg.NewSchemaFromJsonFields(1, testFieldsStr)
+ commentSchema, err := iceberg.NewSchemaFromJSONFields(1, testFieldsStr)
assert.NoError(t, err)
assert.Equal(t, "primary key", commentSchema.Fields()[0].Doc)
assert.Equal(t, "user name", commentSchema.Fields()[1].Doc)
@@ -183,7 +183,7 @@ func TestSchemaFromJson(t *testing.T) {
},
"required": true
}]`
- nestedSchema, err := iceberg.NewSchemaFromJsonFields(1, testFieldsStr)
+ nestedSchema, err := iceberg.NewSchemaFromJSONFields(1, testFieldsStr)
assert.NoError(t, err)
assert.Len(t, nestedSchema.Fields(), 1)
