fix merge

ideoma · ideoma · commit 0e8fe8163c7c · 2025-09-01T14:02:03.000+01:00
diff --git a/core/src/main/java/io/questdb/cairo/TxReader.java b/core/src/main/java/io/questdb/cairo/TxReader.java
@@ -246,7 +246,7 @@ public long getNextLogicalPartitionTimestamp(long timestamp) {
         return Long.MAX_VALUE;
     }
 
-    public long getNextPartitionTimestamp(long timestamp) {
+    public long getNextExistingPartitionTimestamp(long timestamp) {
         if (partitionBy == PartitionBy.NONE) {
             return Long.MAX_VALUE;
         }
@@ -264,10 +264,6 @@ public long getNextPartitionTimestamp(long timestamp) {
         return Long.MAX_VALUE;
     }
 
-    public long getNextLogicalPartitionTimestamp(long timestamp) {
-        return partitionCeilMethod.ceil(timestamp);
-    }
-
     public long getNextPartitionTimestamp(long timestamp) {
         if (partitionBy == PartitionBy.NONE) {
             return Long.MAX_VALUE;

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public long getNextLogicalPartitionTimestamp(long timestamp) {`
`246`	`246`	`return Long.MAX_VALUE;`
`247`	`247`	`}`
`248`	`248`
`249`		`- public long getNextPartitionTimestamp(long timestamp) {`
	`249`	`+ public long getNextExistingPartitionTimestamp(long timestamp) {`
`250`	`250`	`if (partitionBy == PartitionBy.NONE) {`
`251`	`251`	`return Long.MAX_VALUE;`
`252`	`252`	`}`
`@@ -264,10 +264,6 @@ public long getNextPartitionTimestamp(long timestamp) {`
`264`	`264`	`return Long.MAX_VALUE;`
`265`	`265`	`}`
`266`	`266`
`267`		`- public long getNextLogicalPartitionTimestamp(long timestamp) {`
`268`		`- return partitionCeilMethod.ceil(timestamp);`
`269`		`- }`
`270`		`-`
`271`	`267`	`public long getNextPartitionTimestamp(long timestamp) {`
`272`	`268`	`if (partitionBy == PartitionBy.NONE) {`
`273`	`269`	`return Long.MAX_VALUE;`