From 3678673124ec72aabd3564386c0cab0374fb4a57 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 12 Aug 2022 10:44:47 +0800
Subject: [PATCH] fix: schema default value using raw type before convert

---
 apps/emqx_resource/include/emqx_resource.hrl  | 19 +++++++++++++++++++
 .../src/schema/emqx_resource_schema.erl       |  6 +++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/apps/emqx_resource/include/emqx_resource.hrl b/apps/emqx_resource/include/emqx_resource.hrl
index 190c278ae..8ec57a00e 100644
--- a/apps/emqx_resource/include/emqx_resource.hrl
+++ b/apps/emqx_resource/include/emqx_resource.hrl
@@ -76,16 +76,35 @@
     | {resource_down, term()}.
 
 -define(DEFAULT_QUEUE_SIZE, 1024 * 1024 * 1024).
+-define(DEFAULT_QUEUE_SIZE_RAW, <<"1GB">>).
+
+%% count
 -define(DEFAULT_BATCH_SIZE, 100).
+
+%% milliseconds
 -define(DEFAULT_BATCH_TIME, 10).
+-define(DEFAULT_BATCH_TIME_RAW, <<"10ms">>).
+
+%% count
 -define(DEFAULT_INFLIGHT, 100).
+
+%% milliseconds
 -define(HEALTHCHECK_INTERVAL, 15000).
 -define(HEALTHCHECK_INTERVAL_RAW, <<"15s">>).
+
+%% milliseconds
 -define(RESUME_INTERVAL, 15000).
+-define(RESUME_INTERVAL_RAW, <<"15s">>).
+
 -define(START_AFTER_CREATED, true).
+
+%% milliseconds
 -define(START_TIMEOUT, 5000).
 -define(START_TIMEOUT_RAW, <<"5s">>).
+
+%% milliseconds
 -define(AUTO_RESTART_INTERVAL, 60000).
 -define(AUTO_RESTART_INTERVAL_RAW, <<"60s">>).
+
 -define(TEST_ID_PREFIX, "_test_:").
 -define(RES_METRICS, resource_metrics).
diff --git a/apps/emqx_resource/src/schema/emqx_resource_schema.erl b/apps/emqx_resource/src/schema/emqx_resource_schema.erl
index ccc31a707..6111543d2 100644
--- a/apps/emqx_resource/src/schema/emqx_resource_schema.erl
+++ b/apps/emqx_resource/src/schema/emqx_resource_schema.erl
@@ -90,7 +90,7 @@ enable_queue(_) -> undefined.
 
 resume_interval(type) -> emqx_schema:duration_ms();
 resume_interval(desc) -> ?DESC("resume_interval");
-resume_interval(default) -> ?RESUME_INTERVAL;
+resume_interval(default) -> ?RESUME_INTERVAL_RAW;
 resume_interval(required) -> false;
 resume_interval(_) -> undefined.
 
@@ -108,12 +108,12 @@ batch_size(_) -> undefined.
 
 batch_time(type) -> emqx_schema:duration_ms();
 batch_time(desc) -> ?DESC("batch_time");
-batch_time(default) -> ?DEFAULT_BATCH_TIME;
+batch_time(default) -> ?DEFAULT_BATCH_TIME_RAW;
 batch_time(required) -> false;
 batch_time(_) -> undefined.
 
 queue_max_bytes(type) -> emqx_schema:bytesize();
 queue_max_bytes(desc) -> ?DESC("queue_max_bytes");
-queue_max_bytes(default) -> ?DEFAULT_QUEUE_SIZE;
+queue_max_bytes(default) -> ?DEFAULT_QUEUE_SIZE_RAW;
 queue_max_bytes(required) -> false;
 queue_max_bytes(_) -> undefined.