feat: Support GEOGRAPHY type field (#201)

fluent-plugins-nursery · Dec 16, 2022 · 734faa9 · 734faa9
1 parent ec62bfa
commit 734faa9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/integration/fluent.conf b/integration/fluent.conf
@@ -6,7 +6,7 @@
 
 <source>
   @type dummy
-  dummy {"json_field": {"foo": "val1", "bar": "val2", "hoge": 1}, "timestamp_field": "2022-12-15T22:40:21+09:00", "date": "2022-12-15"}
+  dummy {"json_field": {"foo": "val1", "bar": "val2", "hoge": 1}, "geography_field": {"type": "LineString", "coordinates": [[-118.4085, 33.9416], [-73.7781, 40.6413]]}, "timestamp_field": "2022-12-15T22:40:21+09:00", "date": "2022-12-15", "record_field": {"inner_field": "hoge", "inner_json": {"key1": "val1", "key2": "val2"}}, "repeated_string_field": ["a", "b", "c"]}
   auto_increment_key id
 
   tag insert_data
@@ -29,7 +29,7 @@
     total_limit_size 1g
     path ./log/bigquery-insert-integration
 
-    flush_interval 30
+    flush_interval 15
     flush_thread_count 4
     flush_at_shutdown true
 

diff --git a/integration/schema.json b/integration/schema.json
@@ -14,6 +14,11 @@
     "type": "JSON",
     "mode": "NULLABLE"
   },
+  {
+    "name": "geography_field",
+    "type": "GEOGRAPHY",
+    "mode": "NULLABLE"
+  },
   {
     "name": "timestamp_field",
     "type": "TIMESTAMP",
@@ -33,6 +38,11 @@
         "name": "inner_field",
         "type": "STRING",
         "mode": "REQUIRED"
+      },
+      {
+        "name": "inner_json",
+        "type": "JSON",
+        "mode": "REQUIRED"
       }
     ]
   },

diff --git a/lib/fluent/plugin/bigquery/schema.rb b/lib/fluent/plugin/bigquery/schema.rb
@@ -80,6 +80,12 @@ def format_one(value, is_load: false)
       end
     end
 
+    class GeographyFieldSchema < StringFieldSchema
+      def type
+        :geography
+      end
+    end
+
     class IntegerFieldSchema < FieldSchema
       def type
         :integer
@@ -200,6 +206,7 @@ class RecordSchema < FieldSchema
         datetime: DateTimeFieldSchema,
         time: TimeFieldSchema,
         json: JsonFieldSchema,
+        geography: GeographyFieldSchema,
         record: RecordSchema
       }.freeze