This is an automated email from the ASF dual-hosted git repository. lujiajing pushed a commit to branch banyandb-integration-stream in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit fab639b17996b6a80c73a5872d84ec89820eb2ed Author: Megrez Lu <[email protected]> AuthorDate: Thu Dec 9 18:31:39 2021 +0800 use unified tag family name --- .../storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java index 0b89545ee4..a3d2f1dc85 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/AbstractBanyanDBDAO.java @@ -25,6 +25,7 @@ import org.apache.skywalking.banyandb.v1.client.StreamQueryResponse; import org.apache.skywalking.banyandb.v1.client.TimestampRange; import org.apache.skywalking.oap.server.core.storage.AbstractDAO; import org.apache.skywalking.oap.server.storage.plugin.banyandb.BanyanDBStorageClient; +import org.apache.skywalking.oap.server.storage.plugin.banyandb.StreamMetaInfo; import java.util.List; import java.util.function.Function; @@ -53,24 +54,22 @@ public abstract class AbstractBanyanDBDAO extends AbstractDAO<BanyanDBStorageCli } protected abstract static class QueryBuilder { - protected static final String SEARCHABLE = "searchable"; - abstract void apply(final StreamQuery query); protected PairQueryCondition<Long> eq(String name, long value) { - return PairQueryCondition.LongQueryCondition.eq(SEARCHABLE, name, value); + return PairQueryCondition.LongQueryCondition.eq(StreamMetaInfo.TAG_FAMILY_SEARCHABLE, name, value); } protected PairQueryCondition<Long> lte(String name, long value) { - return PairQueryCondition.LongQueryCondition.le(SEARCHABLE, name, value); + return PairQueryCondition.LongQueryCondition.le(StreamMetaInfo.TAG_FAMILY_SEARCHABLE, name, value); } protected PairQueryCondition<Long> gte(String name, long value) { - return PairQueryCondition.LongQueryCondition.ge(SEARCHABLE, name, value); + return PairQueryCondition.LongQueryCondition.ge(StreamMetaInfo.TAG_FAMILY_SEARCHABLE, name, value); } protected PairQueryCondition<String> eq(String name, String value) { - return PairQueryCondition.StringQueryCondition.eq(SEARCHABLE, name, value); + return PairQueryCondition.StringQueryCondition.eq(StreamMetaInfo.TAG_FAMILY_SEARCHABLE, name, value); } }
