jixuan1989
/
IoTDB
mirror of https://github.com/apache/iotdb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add sh

This commit is contained in:
xingtanzjr 2017-05-17 15:29:37 +08:00
parent 6355533668
commit 887a72f3ff
2 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pom.xml
View File

@ -79,11 +79,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@ -124,26 +119,6 @@
</execution>
</executions>
</plugin>
<!-- <plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>4.3</version>
<executions>
<execution>
<id>antlr</id>
<goals>
<goal>antlr4</goal>
</goals>
<phase>none</phase>
</execution>
</executions>
<configuration>
<outputDirectory></outputDirectory>
<listener>true</listener>
<treatWarningsAsErrors>true</treatWarningsAsErrors>
</configuration>
</plugin> -->
</plugins>
</build>
</project>

7
src/main/java/cn/edu/thu/tsfiledb/query/reader/OverflowValueReader.java
View File

@ -750,8 +750,9 @@ public class OverflowValueReader extends ValueReader{
int lastAvailable = bis.available();
pageCount++;
log.debug("read page {}, offset : {}", pageCount, res.pageOffset);
PageHeader pageHeader = pageReader.getNextPageHeader();
PageHeader pageHeader = pageReader.getNextPageHeader();
// System.out.println("===== Page: " + pageCount + ". Count: " + pageHeader.data_page_header.num_rows);
// construct value and time digest for this page
Digest pageDigest = pageHeader.data_page_header.getDigest();
DigestForFilter valueDigestFF = new DigestForFilter(pageDigest.min, pageDigest.max, getDataType());
@ -815,6 +816,7 @@ public class OverflowValueReader extends ValueReader{
res = readOnePageWithOverflow(hasOverflowDataInThisPage, idx, timeValues, page,
pageHeader, res, timeFilter, freqFilter, valueFilter, insertTrue, update);
func.calculateFromDataInThisPage(res);
res.clearData();
}
}
@ -1026,9 +1028,6 @@ public class OverflowValueReader extends ValueReader{
case INT64:
while (decoder.hasNext(page)) {
// put insert points
// if(timeIdx == timeValues.length - 1){
System.out.println(timeIdx);
// }
while (insertTrue.curIdx < insertTrue.length && timeIdx < timeValues.length
&& insertTrue.getTime(insertTrue.curIdx) <= timeValues[timeIdx]) {
res.putTime(insertTrue.getTime(insertTrue.curIdx));