From 81f4103d60bcfac0a7bf7b0f008bbb82161a06a8 Mon Sep 17 00:00:00 2001
From: Ilya Averyanov <av@rubybox.dev>
Date: Thu, 11 Jul 2024 00:53:35 +0300
Subject: [PATCH] feat(queue): avoid cyclic dependencies

---
 apps/emqx_durable_storage/src/emqx_ds_skipping_iterator.erl | 1 -
 apps/emqx_durable_storage/src/emqx_ds_skipping_iterator.hrl | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_durable_storage/src/emqx_ds_skipping_iterator.erl b/apps/emqx_durable_storage/src/emqx_ds_skipping_iterator.erl
index d8833f65e..b14bd26f8 100644
--- a/apps/emqx_durable_storage/src/emqx_ds_skipping_iterator.erl
+++ b/apps/emqx_durable_storage/src/emqx_ds_skipping_iterator.erl
@@ -17,7 +17,6 @@
 -module(emqx_ds_skipping_iterator).
 
 -include("emqx_ds_skipping_iterator.hrl").
--include_lib("emqx/include/emqx_mqtt.hrl").
 
 -type t() :: ?skipping_iterator(emqx_ds:iterator(), non_neg_integer(), non_neg_integer()).
 
diff --git a/apps/emqx_durable_storage/src/emqx_ds_skipping_iterator.hrl b/apps/emqx_durable_storage/src/emqx_ds_skipping_iterator.hrl
index 2c0999fcc..6ec8ba16c 100644
--- a/apps/emqx_durable_storage/src/emqx_ds_skipping_iterator.hrl
+++ b/apps/emqx_durable_storage/src/emqx_ds_skipping_iterator.hrl
@@ -30,3 +30,7 @@
 -define(skipping_iterator(Iterator, Q1Skip, Q2Skip), #{
     ?tag => ?IT, ?it => Iterator, ?qos1_skip => Q1Skip, ?qos2_skip => Q2Skip
 }).
+
+-define(QOS_0, 0).
+-define(QOS_1, 1).
+-define(QOS_2, 2).