You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by lu...@apache.org on 2022/11/21 06:30:33 UTC
[skywalking-banyandb-java-client] branch fix-offset-issue created (now 780a358)
This is an automated email from the ASF dual-hosted git repository.
lujiajing pushed a change to branch fix-offset-issue
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-java-client.git
at 780a358 fix null tag issue
This branch includes the following new commits:
new 780a358 fix null tag issue
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking-banyandb-java-client] 01/01: fix null tag issue
Posted by lu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lujiajing pushed a commit to branch fix-offset-issue
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-java-client.git
commit 780a35851d1199f676e52c8d46246eaa95b1a6c5
Author: Megrez Lu <lu...@gmail.com>
AuthorDate: Mon Nov 21 14:30:20 2022 +0800
fix null tag issue
---
.../java/org/apache/skywalking/banyandb/v1/client/MeasureWrite.java | 5 ++---
.../java/org/apache/skywalking/banyandb/v1/client/StreamWrite.java | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/skywalking/banyandb/v1/client/MeasureWrite.java b/src/main/java/org/apache/skywalking/banyandb/v1/client/MeasureWrite.java
index 5304dad..0241926 100644
--- a/src/main/java/org/apache/skywalking/banyandb/v1/client/MeasureWrite.java
+++ b/src/main/java/org/apache/skywalking/banyandb/v1/client/MeasureWrite.java
@@ -70,14 +70,13 @@ public class MeasureWrite extends AbstractWrite<BanyandbMeasure.WriteRequest> {
// memorize the last offset for the last tag family
int lastFamilyOffset = 0;
for (final int tagsPerFamily : this.entityMetadata.getTagFamilyCapacity()) {
- final BanyandbModel.TagFamilyForWrite.Builder b = BanyandbModel.TagFamilyForWrite.newBuilder();
boolean firstNonNullTagFound = false;
Deque<BanyandbModel.TagValue> tags = new LinkedList<>();
for (int j = tagsPerFamily - 1; j >= 0; j--) {
Object obj = this.tags[lastFamilyOffset + j];
if (obj == null) {
if (firstNonNullTagFound) {
- b.addTags(TagAndValue.nullTagValue().serialize());
+ tags.addFirst(TagAndValue.nullTagValue().serialize());
}
continue;
}
@@ -85,7 +84,7 @@ public class MeasureWrite extends AbstractWrite<BanyandbMeasure.WriteRequest> {
tags.addFirst(((Serializable<BanyandbModel.TagValue>) obj).serialize());
}
lastFamilyOffset += tagsPerFamily;
- datapointValueBuilder.addTagFamilies(b.addAllTags(tags).build());
+ datapointValueBuilder.addTagFamilies(BanyandbModel.TagFamilyForWrite.newBuilder().addAllTags(tags).build());
}
for (int i = 0; i < this.entityMetadata.getTotalFields(); i++) {
diff --git a/src/main/java/org/apache/skywalking/banyandb/v1/client/StreamWrite.java b/src/main/java/org/apache/skywalking/banyandb/v1/client/StreamWrite.java
index b055d17..b2f85c2 100644
--- a/src/main/java/org/apache/skywalking/banyandb/v1/client/StreamWrite.java
+++ b/src/main/java/org/apache/skywalking/banyandb/v1/client/StreamWrite.java
@@ -66,14 +66,13 @@ public class StreamWrite extends AbstractWrite<BanyandbStream.WriteRequest> {
// memorize the last offset for the last tag family
int lastFamilyOffset = 0;
for (final int tagsPerFamily : this.entityMetadata.getTagFamilyCapacity()) {
- final BanyandbModel.TagFamilyForWrite.Builder b = BanyandbModel.TagFamilyForWrite.newBuilder();
boolean firstNonNullTagFound = false;
Deque<BanyandbModel.TagValue> tags = new LinkedList<>();
for (int j = tagsPerFamily - 1; j >= 0; j--) {
Object obj = this.tags[lastFamilyOffset + j];
if (obj == null) {
if (firstNonNullTagFound) {
- b.addTags(TagAndValue.nullTagValue().serialize());
+ tags.addFirst(TagAndValue.nullTagValue().serialize());
}
continue;
}
@@ -81,7 +80,7 @@ public class StreamWrite extends AbstractWrite<BanyandbStream.WriteRequest> {
tags.addFirst(((Serializable<BanyandbModel.TagValue>) obj).serialize());
}
lastFamilyOffset += tagsPerFamily;
- elemValBuilder.addTagFamilies(b.addAllTags(tags).build());
+ elemValBuilder.addTagFamilies(BanyandbModel.TagFamilyForWrite.newBuilder().addAllTags(tags).build());
}
builder.setElement(elemValBuilder);
return builder.build();