Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qxj rc/1.1 1015 #263

Open
wants to merge 2 commits into
base: rc/1.1
Choose a base branch
from
Open

Qxj rc/1.1 1015 #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
049b00d
NO TEXT statistics
HTHou Aug 12, 2024
e4aa5eb
update version to 1.1.0-qxj-snapsjot
shuwenwei Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
<version>1.1.0-240924-SNAPSHOT</version>
<version>1.1.0-qxj-snapsjot</version>
</parent>
<artifactId>tsfile-cpp</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion java/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
<version>1.1.0-240924-SNAPSHOT</version>
<version>1.1.0-qxj-snapsjot</version>
</parent>
<artifactId>common</artifactId>
<name>TsFile: Java: Common</name>
Expand Down
4 changes: 2 additions & 2 deletions java/examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
<version>1.1.0-240924-SNAPSHOT</version>
<version>1.1.0-qxj-snapsjot</version>
</parent>
<artifactId>examples</artifactId>
<packaging>pom</packaging>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
<version>1.1.0-240924-SNAPSHOT</version>
<version>1.1.0-qxj-snapsjot</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
<version>1.1.0-240924-SNAPSHOT</version>
<version>1.1.0-qxj-snapsjot</version>
</parent>
<artifactId>tsfile-java</artifactId>
<version>1.1.0-240924-SNAPSHOT</version>
<version>1.1.0-qxj-snapsjot</version>
<packaging>pom</packaging>
<name>TsFile: Java</name>
<modules>
Expand Down
4 changes: 2 additions & 2 deletions java/tsfile/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-java</artifactId>
<version>1.1.0-240924-SNAPSHOT</version>
<version>1.1.0-qxj-snapsjot</version>
</parent>
<artifactId>tsfile</artifactId>
<name>TsFile: Java: TsFile</name>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.tsfile</groupId>
<artifactId>common</artifactId>
<version>1.1.0-240924-SNAPSHOT</version>
<version>1.1.0-qxj-snapsjot</version>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
Expand Down
2 changes: 1 addition & 1 deletion java/tsfile/src/main/java/org/apache/tsfile/common/conf/TSFileConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public class TSFileConfig implements Serializable {
private int pageSizeInByte = 64 * 1024;

/** The maximum number of data points in a page, default value is 10000. */
private int maxNumberOfPointsInPage = 10_000;
private int maxNumberOfPointsInPage = 256;

/** The maximum degree of a metadataIndex node, default value is 256. */
private int maxDegreeOfIndexNode = 256;
Expand Down
18 changes: 9 additions & 9 deletions java/tsfile/src/main/java/org/apache/tsfile/file/metadata/statistics/BinaryStatistics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,24 +71,24 @@ public long getRetainedSizeInBytes() {
* @param last the last value
*/
public void initializeStats(Binary first, Binary last) {
this.firstValue = first;
this.lastValue = last;
// this.firstValue = first;
// this.lastValue = last;
}

private void updateLastStats(Binary lastValue) {
this.lastValue = lastValue;
// this.lastValue = lastValue;
}

private void updateStats(Binary firstValue, Binary lastValue, long startTime, long endTime) {
// only if endTime greater or equals to the current endTime need we update the last value
// only if startTime less or equals to the current startTime need we update the first value
// otherwise, just ignore
if (startTime <= this.getStartTime()) {
this.firstValue = firstValue;
}
if (endTime >= this.getEndTime()) {
this.lastValue = lastValue;
}
// if (startTime <= this.getStartTime()) {
// this.firstValue = firstValue;
// }
// if (endTime >= this.getEndTime()) {
// this.lastValue = lastValue;
// }
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
<version>1.1.0-240924-SNAPSHOT</version>
<version>1.1.0-qxj-snapsjot</version>
<packaging>pom</packaging>
<name>Apache TsFile Project Parent POM</name>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion python/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tsfile</groupId>
<artifactId>tsfile-parent</artifactId>
<version>1.1.0-240924-SNAPSHOT</version>
<version>1.1.0-qxj-snapsjot</version>
</parent>
<artifactId>tsfile-python</artifactId>
<packaging>pom</packaging>
Expand Down