You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tsfile.apache.org by ji...@apache.org on 2026/09/15 10:22:08 UTC

(tsfile) branch develop updated: Complete TimeColumn accessors and fix dictionary primitive lookup (#961)

This is an automated email from the ASF dual-hosted git repository.

jt2594838 pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/tsfile.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8fdbc49bc Complete TimeColumn accessors and fix dictionary primitive lookup (#961)
8fdbc49bc is described below

commit 8fdbc49bc80eb4a4d6cf6e46cdf0cabd1a1c0837
Author: Jiang Tian <jt...@163.com>
AuthorDate: Tue Sep 15 18:22:03 2026 +0800

    Complete TimeColumn accessors and fix dictionary primitive lookup (#961)
    
    * enhance compatibility of TimeColumn
    
    * Fix dictionary primitive type lookup and add column tests
---
 .../read/common/block/column/DictionaryColumn.java |  2 +-
 .../read/common/block/column/TimeColumn.java       | 43 ++++++++++++++-
 .../org/apache/tsfile/read/common/ColumnTest.java  | 61 ++++++++++++++++++++++
 3 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/java/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/DictionaryColumn.java b/java/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/DictionaryColumn.java
index 7ce598483..729b3a58d 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/DictionaryColumn.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/DictionaryColumn.java
@@ -445,7 +445,7 @@ public final class DictionaryColumn implements Column {
 
   @Override
   public TsPrimitiveType getTsPrimitiveType(int position) {
-    return dictionary.getTsPrimitiveType(position);
+    return dictionary.getTsPrimitiveType(getId(position));
   }
 
   @Override
diff --git a/java/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TimeColumn.java b/java/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TimeColumn.java
index d0dc19377..7776bb72b 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TimeColumn.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/read/common/block/column/TimeColumn.java
@@ -25,11 +25,14 @@ import org.apache.tsfile.block.column.ColumnEncoding;
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.i18n.Messages;
 import org.apache.tsfile.read.common.type.Type;
+import org.apache.tsfile.utils.Binary;
 import org.apache.tsfile.utils.RamUsageEstimator;
+import org.apache.tsfile.utils.TsPrimitiveType;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 import static org.apache.tsfile.read.common.block.column.ColumnUtil.checkArrayRange;
@@ -104,11 +107,49 @@ public class TimeColumn implements Column {
     return values[position + arrayOffset];
   }
 
+  @Override
+  public int getInt(int position) {
+    return (int) getLong(position);
+  }
+
+  @Override
+  public double getDouble(int position) {
+    return getLong(position);
+  }
+
+  @Override
+  public Binary getBinary(int position) {
+    return new Binary(String.valueOf(getLong(position)), StandardCharsets.UTF_8);
+  }
+
+  @Override
+  public double[] getDoubles() {
+    double[] doubles = new double[values.length];
+    for (int i = 0; i < values.length; i++) {
+      doubles[i] = values[i];
+    }
+    return doubles;
+  }
+
+  @Override
+  public Binary[] getBinaries() {
+    Binary[] binaries = new Binary[values.length];
+    for (int i = 0; i < values.length; i++) {
+      binaries[i] = new Binary(String.valueOf(values[i]), StandardCharsets.UTF_8);
+    }
+    return binaries;
+  }
+
   @Override
   public Object getObject(int position) {
     return getLong(position);
   }
 
+  @Override
+  public TsPrimitiveType getTsPrimitiveType(int position) {
+    return new TsPrimitiveType.TsLong(getLong(position));
+  }
+
   @Override
   public void writeTo(int index, ByteBuffer buffer) {
     buffer.putLong(values[index + arrayOffset]);
@@ -253,7 +294,7 @@ public class TimeColumn implements Column {
 
   @Override
   public void setPositionCount(int count) {
-    this.positionCount = positionCount;
+    this.positionCount = count;
   }
 
   @Override
diff --git a/java/tsfile/src/test/java/org/apache/tsfile/read/common/ColumnTest.java b/java/tsfile/src/test/java/org/apache/tsfile/read/common/ColumnTest.java
index 51203e0db..aebf795a3 100644
--- a/java/tsfile/src/test/java/org/apache/tsfile/read/common/ColumnTest.java
+++ b/java/tsfile/src/test/java/org/apache/tsfile/read/common/ColumnTest.java
@@ -42,6 +42,7 @@ import org.apache.tsfile.read.common.block.column.TimeColumnBuilder;
 import org.apache.tsfile.read.common.type.Type;
 import org.apache.tsfile.utils.Binary;
 import org.apache.tsfile.utils.BytesUtils;
+import org.apache.tsfile.utils.TsPrimitiveType;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -56,6 +57,30 @@ import java.util.Optional;
 
 public class ColumnTest {
 
+  @Test
+  public void testDictionaryTsPrimitiveType() {
+    Column dictionary = new LongColumn(3, Optional.empty(), new long[] {10L, 20L, 30L});
+    // The logical input excludes 10 and repeats 30 beyond the dictionary's position count.
+    Column column = DictionaryColumn.create(4, dictionary, new int[] {2, 1, 2, 2});
+    long[] expected = {30L, 20L, 30L, 30L};
+    for (int i = 0; i < expected.length; i++) {
+      Assert.assertEquals(TSDataType.INT64, column.getTsPrimitiveType(i).getDataType());
+      Assert.assertEquals(expected[i], column.getTsPrimitiveType(i).getLong());
+    }
+  }
+
+  @Test
+  public void testDictionaryTsPrimitiveTypeWithOffsets() {
+    Column dictionary =
+        new LongColumn(4, Optional.empty(), new long[] {-1L, 10L, 20L, 30L}).getRegion(1, 3);
+    Column column = DictionaryColumn.create(4, dictionary, new int[] {0, 2, 1, 2}).getRegion(1, 3);
+    // Both the dictionary values and the logical IDs have nonzero offsets.
+    long[] expected = {30L, 20L, 30L};
+    for (int i = 0; i < expected.length; i++) {
+      Assert.assertEquals(expected[i], column.getTsPrimitiveType(i).getLong());
+    }
+  }
+
   @Test
   public void testConvertTo() {
     Column source =
@@ -305,6 +330,42 @@ public class ColumnTest {
     Assert.assertFalse(nullColumn.arePositionsEqual(0, that, 0));
   }
 
+  @Test
+  public void timeColumnPrimitiveAccessorsTest() {
+    long[] values = {10L, 20L, 30L, 40L};
+    TimeColumn timeColumn = (TimeColumn) new TimeColumn(values.length, values).getRegion(1, 2);
+
+    Assert.assertEquals(TSDataType.INT64, timeColumn.getDataType());
+    Assert.assertEquals(20, timeColumn.getInt(0));
+    Assert.assertEquals(20L, timeColumn.getLong(0));
+    Assert.assertEquals(20.0D, timeColumn.getDouble(0), 0);
+    Assert.assertEquals(20L, timeColumn.getObject(0));
+    Assert.assertEquals(new Binary("20", StandardCharsets.UTF_8), timeColumn.getBinary(0));
+    Assert.assertTrue(timeColumn.getTsPrimitiveType(0) instanceof TsPrimitiveType.TsLong);
+    Assert.assertEquals(20L, timeColumn.getTsPrimitiveType(0).getLong());
+
+    Assert.assertArrayEquals(values, timeColumn.getLongs());
+    Assert.assertArrayEquals(new double[] {10.0D, 20.0D, 30.0D, 40.0D}, timeColumn.getDoubles(), 0);
+    Assert.assertArrayEquals(
+        new Binary[] {
+          new Binary("10", StandardCharsets.UTF_8),
+          new Binary("20", StandardCharsets.UTF_8),
+          new Binary("30", StandardCharsets.UTF_8),
+          new Binary("40", StandardCharsets.UTF_8)
+        },
+        timeColumn.getBinaries());
+    Assert.assertFalse(timeColumn.mayHaveNull());
+    Assert.assertFalse(timeColumn.isNull(0));
+  }
+
+  @Test
+  public void timeColumnSetPositionCountTest() {
+    TimeColumn timeColumn = new TimeColumn(4);
+    Assert.assertEquals(0, timeColumn.getPositionCount());
+    timeColumn.setPositionCount(2);
+    Assert.assertEquals(2, timeColumn.getPositionCount());
+  }
+
   @Test
   public void timeColumnSubColumnTest() {
     TimeColumnBuilder columnBuilder = new TimeColumnBuilder(null, 10);