This is an automated email from the ASF dual-hosted git repository. jiangtian pushed a commit to branch mem_usage_refinement in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 39a43a46e5cdc9c7ecb96f963393b46b74186720 Author: Tian Jiang <[email protected]> AuthorDate: Wed Apr 23 10:05:06 2025 +0800 Revert "fix bloom filter" This reverts commit 5f7f9ef18f7bfffe9437a0708364db4b7ac97243. --- java/tsfile/src/main/java/org/apache/tsfile/utils/BloomFilter.java | 6 +----- .../test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/java/tsfile/src/main/java/org/apache/tsfile/utils/BloomFilter.java b/java/tsfile/src/main/java/org/apache/tsfile/utils/BloomFilter.java index 3f10f5b5..d4a0f9f5 100644 --- a/java/tsfile/src/main/java/org/apache/tsfile/utils/BloomFilter.java +++ b/java/tsfile/src/main/java/org/apache/tsfile/utils/BloomFilter.java @@ -172,9 +172,6 @@ public class BloomFilter { if (!useCheapHash) { ret = bits.get(hash(value.getFullPath(), size, SEEDS[index++])); } else { - if (!(value instanceof FullPath)) { - value = new FullPath(value.getIDeviceID(), value.getMeasurement()); - } ret = bits.get(hash(value, size, SEEDS[index++])); } } @@ -182,7 +179,6 @@ public class BloomFilter { return ret; } - @Deprecated public boolean contains(String value) { if (value == null) { return false; @@ -268,7 +264,7 @@ public class BloomFilter { if (bytes.length != 0) { int filterSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer); int hashFunctionSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer); - if (hashFunctionSize != Integer.MAX_VALUE) { + if (hashFunctionSize != Integer.MIN_VALUE) { return BloomFilter.buildBloomFilter(bytes, filterSize, hashFunctionSize); } else { hashFunctionSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer); diff --git a/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java b/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java index 7deb073b..854e80ac 100644 --- a/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java +++ b/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java @@ -34,7 +34,6 @@ import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.file.metadata.IDeviceID.Factory; import org.apache.tsfile.file.metadata.TableSchema; import org.apache.tsfile.file.metadata.enums.TSEncoding; -import org.apache.tsfile.read.common.FullPath; import org.apache.tsfile.read.common.Path; import org.apache.tsfile.utils.BloomFilter; import org.apache.tsfile.utils.FileGenerator; @@ -189,7 +188,7 @@ public class TsFileSequenceReaderTest { TsFileSequenceReader reader = new TsFileSequenceReader(testFile.getAbsolutePath()); BloomFilter bloomFilter = reader.readBloomFilter(); assertNotNull(bloomFilter); - assertTrue(bloomFilter.contains(new FullPath(deviceID, "s"))); + assertTrue(bloomFilter.contains(deviceID.toString() + ".s")); assertFalse( bloomFilter.contains(Factory.DEFAULT_FACTORY.create("root.topic2").toString() + ".s")); }
