You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2019/01/23 12:35:18 UTC
[incubator-iotdb] branch fix_sonar updated: fix sonar problem in
query and read package
This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a commit to branch fix_sonar
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/fix_sonar by this push:
new d37c8ed fix sonar problem in query and read package
new 8cecd26 Merge branch 'fix_sonar' of github.com:apache/incubator-iotdb into fix_sonar
d37c8ed is described below
commit d37c8ed39de25b1d3b7a7eb4c00ca527f32e6fba
Author: CGF <cg...@foxmail.com>
AuthorDate: Wed Jan 23 20:34:34 2019 +0800
fix sonar problem in query and read package
---
.../query/control/OpenedFilePathsManagerTest.java | 23 --------
.../db/query/control/QueryTokenManagerTest.java | 2 +-
.../org/apache/iotdb/tsfile/read/ReadTest.java | 64 ++++++++++----------
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 68 +++++++++++-----------
.../controller/MetadataQuerierByFileImplTest.java | 2 +-
5 files changed, 68 insertions(+), 91 deletions(-)
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/control/OpenedFilePathsManagerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/query/control/OpenedFilePathsManagerTest.java
deleted file mode 100644
index fc6ef6b..0000000
--- a/iotdb/src/test/java/org/apache/iotdb/db/query/control/OpenedFilePathsManagerTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.iotdb.db.query.control;
-
-public class OpenedFilePathsManagerTest {
-
-}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryTokenManagerTest.java b/iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryTokenManagerTest.java
index eb6a389..3ac1540 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryTokenManagerTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/query/control/QueryTokenManagerTest.java
@@ -24,6 +24,6 @@ public class QueryTokenManagerTest {
@Test
public void test() {
-
+ //TODO
}
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java
index 3de9b29..260490f 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadTest.java
@@ -73,10 +73,10 @@ public class ReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (count == 0) {
- assertEquals(r.getTimestamp(), 1480562618010L);
+ assertEquals(1480562618010L, r.getTimestamp());
}
if (count == 499) {
- assertEquals(r.getTimestamp(), 1480562618999L);
+ assertEquals(1480562618999L, r.getTimestamp());
}
count++;
}
@@ -138,14 +138,14 @@ public class ReadTest {
RowRecord record = dataSet.next();
Field value = record.getFields().get(0);
if (cnt == 0) {
- assertEquals(record.getTimestamp(), 1480562618973L);
- assertEquals(value.getLongV(), 9732);
+ assertEquals(1480562618973L, record.getTimestamp());
+ assertEquals(9732, value.getLongV());
} else if (cnt == 1) {
- assertEquals(record.getTimestamp(), 1480562618974L);
- assertEquals(value.getLongV(), 9742);
+ assertEquals(1480562618974L, record.getTimestamp());
+ assertEquals(9742, value.getLongV());
} else if (cnt == 7) {
- assertEquals(record.getTimestamp(), 1480562618985L);
- assertEquals(value.getLongV(), 9852);
+ assertEquals(1480562618985L, record.getTimestamp());
+ assertEquals(9852, value.getLongV());
}
cnt++;
@@ -206,18 +206,18 @@ public class ReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618970L);
+ assertEquals(1480562618970L, r.getTimestamp());
} else if (cnt == 2) {
- assertEquals(r.getTimestamp(), 1480562618971L);
+ assertEquals(1480562618971L, r.getTimestamp());
} else if (cnt == 3) {
- assertEquals(r.getTimestamp(), 1480562618973L);
+ assertEquals(1480562618973L, r.getTimestamp());
} else if (cnt == 4) {
- assertEquals(r.getTimestamp(), 1480562618974L);
+ assertEquals(1480562618974L, r.getTimestamp());
}
// System.out.println(r);
cnt++;
}
- assertEquals(cnt, 5);
+ assertEquals(5, cnt);
pathList.clear();
pathList.add(new Path("d1.s1"));
@@ -239,7 +239,7 @@ public class ReadTest {
dataSet.next();
cnt++;
}
- assertEquals(cnt, 4);
+ assertEquals(4, cnt);
}
@Test
@@ -258,14 +258,14 @@ public class ReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618972L);
+ assertEquals(1480562618972L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.getBoolV(), false);
+ assertEquals(false, f1.getBoolV());
}
if (cnt == 2) {
- assertEquals(r.getTimestamp(), 1480562618981L);
+ assertEquals(1480562618981L, r.getTimestamp());
Field f2 = r.getFields().get(0);
- assertEquals(f2.getBoolV(), false);
+ assertEquals(false, f2.getBoolV());
}
cnt++;
}
@@ -288,14 +288,14 @@ public class ReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 0) {
- assertEquals(r.getTimestamp(), 1480562618976L);
+ assertEquals(1480562618976L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.toString(), "dog976");
+ assertEquals("dog976", f1.toString());
}
// System.out.println(r);
cnt++;
}
- Assert.assertEquals(cnt, 1);
+ Assert.assertEquals(1, cnt);
pathList = new ArrayList<>();
pathList.add(new Path("d1.s4"));
@@ -309,14 +309,14 @@ public class ReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618976L);
+ assertEquals(1480562618976L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.getBinaryV().getStringValue(), "dog976");
+ assertEquals("dog976", f1.getBinaryV().getStringValue());
}
// System.out.println(r);
cnt++;
}
- Assert.assertEquals(cnt, 0);
+ Assert.assertEquals(0, cnt);
}
@@ -336,14 +336,14 @@ public class ReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618980L);
+ assertEquals(1480562618980L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.getFloatV(), 108.0, 0.0);
+ assertEquals(108.0, f1.getFloatV(), 0.0);
}
if (cnt == 2) {
- assertEquals(r.getTimestamp(), 1480562618990L);
+ assertEquals(1480562618990L, r.getTimestamp());
Field f2 = r.getFields().get(0);
- assertEquals(f2.getFloatV(), 110.0, 0.0);
+ assertEquals(110.0, f2.getFloatV(),0.0);
}
cnt++;
}
@@ -365,14 +365,14 @@ public class ReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618022L);
+ assertEquals(1480562618022L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.getDoubleV(), 2.0, 0.0);
+ assertEquals(2.0, f1.getDoubleV(), 0.0);
}
if (cnt == 2) {
- assertEquals(r.getTimestamp(), 1480562618033L);
+ assertEquals(1480562618033L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.getDoubleV(), 3.0, 0.0);
+ assertEquals(3.0, f1.getDoubleV(), 0.0);
}
cnt++;
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java
index 84f1997..94940ab 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TimePlainEncodeReadTest.java
@@ -75,14 +75,14 @@ public class TimePlainEncodeReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (count == 0) {
- assertEquals(r.getTimestamp(), 1480562618010L);
+ assertEquals(1480562618010L, r.getTimestamp());
}
if (count == 499) {
- assertEquals(r.getTimestamp(), 1480562618999L);
+ assertEquals(1480562618999L, r.getTimestamp());
}
count++;
}
- assertEquals(count, 500);
+ assertEquals(500, count);
}
@Test
@@ -103,7 +103,7 @@ public class TimePlainEncodeReadTest {
}
count++;
}
- assertEquals(count, 750);
+ assertEquals(750, count);
}
@Test
@@ -143,16 +143,16 @@ public class TimePlainEncodeReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618970L);
+ assertEquals(1480562618970L, r.getTimestamp());
} else if (cnt == 2) {
- assertEquals(r.getTimestamp(), 1480562618971L);
+ assertEquals(1480562618971L, r.getTimestamp());
} else if (cnt == 3) {
- assertEquals(r.getTimestamp(), 1480562618973L);
+ assertEquals(1480562618973L, r.getTimestamp());
}
// System.out.println(r);
cnt++;
}
- assertEquals(cnt, 7);
+ assertEquals(7, cnt);
}
@Test
@@ -177,18 +177,18 @@ public class TimePlainEncodeReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618973L);
+ assertEquals(1480562618973L, r.getTimestamp());
} else if (cnt == 2) {
- assertEquals(r.getTimestamp(), 1480562618974L);
+ assertEquals(1480562618974L, r.getTimestamp());
} else if (cnt == 3) {
- assertEquals(r.getTimestamp(), 1480562618975L);
+ assertEquals(1480562618975L, r.getTimestamp());
} else if (cnt == 4) {
- assertEquals(r.getTimestamp(), 1480562618976L);
+ assertEquals(1480562618976L, r.getTimestamp());
}
// System.out.println(r);
cnt++;
}
- assertEquals(cnt, 5);
+ assertEquals(5, cnt);
pathList.clear();
pathList.add(new Path("d1.s1"));
@@ -218,13 +218,13 @@ public class TimePlainEncodeReadTest {
RowRecord r = dataSet.next();
// System.out.println(r);
if (cnt == 4) {
- assertEquals(r.getTimestamp(), 1480562618913L);
+ assertEquals(1480562618913L, r.getTimestamp());
} else if (cnt == 7) {
- assertEquals(r.getTimestamp(), 1480562618930L);
+ assertEquals(1480562618930L, r.getTimestamp());
}
cnt++;
}
- assertEquals(cnt, 9);
+ assertEquals(9, cnt);
}
@Test
@@ -244,14 +244,14 @@ public class TimePlainEncodeReadTest {
RowRecord r = dataSet.next();
System.out.println(r);
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618972L);
+ assertEquals(1480562618972L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.getBoolV(), false);
+ assertEquals(false, f1.getBoolV());
}
if (cnt == 2) {
- assertEquals(r.getTimestamp(), 1480562618981L);
+ assertEquals(1480562618981L, r.getTimestamp());
Field f2 = r.getFields().get(0);
- assertEquals(f2.getBoolV(), false);
+ assertEquals(false, f2.getBoolV());
}
cnt++;
}
@@ -274,14 +274,14 @@ public class TimePlainEncodeReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 0) {
- assertEquals(r.getTimestamp(), 1480562618976L);
+ assertEquals(1480562618976L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.toString(), "dog976");
+ assertEquals("dog976", f1.toString());
}
// System.out.println(r);
cnt++;
}
- Assert.assertEquals(cnt, 1);
+ Assert.assertEquals(1, cnt);
pathList = new ArrayList<>();
pathList.add(new Path("d1.s4"));
@@ -295,14 +295,14 @@ public class TimePlainEncodeReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618976L);
+ assertEquals(1480562618976L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.getBinaryV(), "dog976");
+ assertEquals("dog976", f1.getBinaryV());
}
// System.out.println(r);
cnt++;
}
- Assert.assertEquals(cnt, 0);
+ Assert.assertEquals(0, cnt);
}
@@ -322,14 +322,14 @@ public class TimePlainEncodeReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618980L);
+ assertEquals(1480562618980L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.getFloatV(), 108.0, 0.0);
+ assertEquals(108.0, f1.getFloatV(), 0.0);
}
if (cnt == 2) {
- assertEquals(r.getTimestamp(), 1480562618990L);
+ assertEquals(1480562618990L, r.getTimestamp());
Field f2 = r.getFields().get(0);
- assertEquals(f2.getFloatV(), 110.0, 0.0);
+ assertEquals(110.0, f2.getFloatV(), 0.0);
}
cnt++;
}
@@ -351,14 +351,14 @@ public class TimePlainEncodeReadTest {
while (dataSet.hasNext()) {
RowRecord r = dataSet.next();
if (cnt == 1) {
- assertEquals(r.getTimestamp(), 1480562618022L);
+ assertEquals(1480562618022L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.getDoubleV(), 2.0, 0.0);
+ assertEquals(2.0, f1.getDoubleV(), 0.0);
}
if (cnt == 2) {
- assertEquals(r.getTimestamp(), 1480562618033L);
+ assertEquals(1480562618033L, r.getTimestamp());
Field f1 = r.getFields().get(0);
- assertEquals(f1.getDoubleV(), 3.0, 0.0);
+ assertEquals(3.0, f1.getDoubleV(), 0.0);
}
cnt++;
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImplTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImplTest.java
index 6d91e8f..2867310 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImplTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImplTest.java
@@ -53,7 +53,7 @@ public class MetadataQuerierByFileImplTest {
List<ChunkMetaData> chunkMetaDataList = metadataQuerierByFile
.getChunkMetaDataList(new Path("d2.s1"));
for (ChunkMetaData chunkMetaData : chunkMetaDataList) {
- Assert.assertEquals(chunkMetaData.getMeasurementUid(), "s1");
+ Assert.assertEquals("s1", chunkMetaData.getMeasurementUid());
}
}
}