You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by jf...@apache.org on 2019/07/16 08:17:23 UTC
[incubator-iotdb] branch rel/0.8 updated: Fixed a bug where
CompressionRatioTest fail on a System with Locale different than English.
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/rel/0.8 by this push:
new dd4ecf2 Fixed a bug where CompressionRatioTest fail on a System with Locale different than English.
dd4ecf2 is described below
commit dd4ecf2886cc9d48cb3dfa6ae03172d7e497cf6b
Author: Julian Feinauer <j....@pragmaticminds.de>
AuthorDate: Tue Jul 16 10:16:58 2019 +0200
Fixed a bug where CompressionRatioTest fail on a System with Locale different than English.
---
.../org/apache/iotdb/db/conf/adapter/CompressionRatio.java | 6 ++++--
.../apache/iotdb/db/conf/adapter/CompressionRatioTest.java | 14 ++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java b/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
index 65afce8..c9299d0 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
@@ -20,6 +20,8 @@ package org.apache.iotdb.db.conf.adapter;
import java.io.File;
import java.io.IOException;
+import java.util.Locale;
+
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
@@ -83,11 +85,11 @@ public class CompressionRatio {
*/
public synchronized void updateRatio(double currentCompressionRatio) throws IOException {
File oldFile = new File(directory,
- String.format(RATIO_FILE_PATH_FORMAT, compressionRatioSum, calcTimes));
+ String.format(Locale.ENGLISH, RATIO_FILE_PATH_FORMAT, compressionRatioSum, calcTimes));
compressionRatioSum += currentCompressionRatio;
calcTimes++;
File newFile = new File(directory,
- String.format(RATIO_FILE_PATH_FORMAT, compressionRatioSum, calcTimes));
+ String.format(Locale.ENGLISH, RATIO_FILE_PATH_FORMAT, compressionRatioSum, calcTimes));
persist(oldFile, newFile);
if (CONFIG.isEnableParameterAdapter()) {
IoTDBConfigDynamicAdapter.getInstance().tryToAdaptParameters();
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java b/iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
index 1af951d..db1348b 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
@@ -24,6 +24,8 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
+import java.util.Locale;
+
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
@@ -67,18 +69,18 @@ public class CompressionRatioTest {
public void testCompressionRatio() throws IOException {
double compressionRatioSum = 0;
int calcuTimes = 0;
- if (new File(directory, String.format(CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
+ if (new File(directory, String.format(Locale.ENGLISH, CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
fail();
}
double compressionRatio = 10;
for(int i = 0; i < 500 ; i+= compressionRatio){
this.compressionRatio.updateRatio(compressionRatio);
- if (new File(directory, String.format(CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
+ if (new File(directory, String.format(Locale.ENGLISH, CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
fail();
}
calcuTimes++;
compressionRatioSum += compressionRatio;
- if (!new File(directory, String.format(CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
+ if (!new File(directory, String.format(Locale.ENGLISH, CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
fail();
}
assertEquals(0, Double
@@ -90,18 +92,18 @@ public class CompressionRatioTest {
public void testRestore() throws IOException {
double compressionRatioSum = 0;
int calcuTimes = 0;
- if (new File(directory, String.format(CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
+ if (new File(directory, String.format(Locale.ENGLISH, CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
fail();
}
int compressionRatio = 10;
for(int i = 0; i < 100 ; i+= compressionRatio){
this.compressionRatio.updateRatio(compressionRatio);
- if (new File(directory, String.format(CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
+ if (new File(directory, String.format(Locale.ENGLISH, CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
fail();
}
calcuTimes++;
compressionRatioSum += compressionRatio;
- if (!new File(directory, String.format(CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
+ if (!new File(directory, String.format(Locale.ENGLISH, CompressionRatio.RATIO_FILE_PATH_FORMAT, compressionRatioSum , calcuTimes)).exists()) {
fail();
}
assertEquals(0, Double