[incubator-iotdb] branch master updated: [hotfix] Simplify the setting of Locale defaults for String.format().

[jfeinauer]

This is an automated email from the ASF dual-hosted git repository.

jfeinauer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new c07ce8f  [hotfix] Simplify the setting of Locale defaults for 
String.format().
     new cce087f  Merge pull request #739 from sunjincheng121/IOTDB-417-followup
c07ce8f is described below

commit c07ce8f6289827818a408282fbadd9d9131601e1
Author: sunjincheng121 <sunjincheng...@gmail.com>
AuthorDate: Tue Jan 14 17:58:44 2020 +0800

    [hotfix] Simplify the setting of Locale defaults for String.format().
---
 .../org/apache/iotdb/db/integration/IoTDBDeletionIT.java    | 13 +++++++------
 .../iotdb/db/integration/IoTDBFlushQueryMergeTest.java      |  7 ++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git 
a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java 
b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
index 7feca92..b8ff156 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBDeletionIT.java
@@ -53,6 +53,7 @@ public class IoTDBDeletionIT {
 
   @Before
   public void setUp() throws Exception {
+    Locale.setDefault(Locale.ENGLISH);
     EnvironmentUtils.closeStatMonitor();
     EnvironmentUtils.envSetUp();
     IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(1000);
@@ -186,27 +187,27 @@ public class IoTDBDeletionIT {
       // prepare BufferWrite file
       for (int i = 201; i <= 300; i++) {
         statement.execute(
-            String.format(Locale.ENGLISH, insertTemplate, i, i, i, (double) i, 
"\'" + i + "\'",
+            String.format(insertTemplate, i, i, i, (double) i, "\'" + i + "\'",
                 i % 2 == 0));
       }
       statement.execute("merge");
       // prepare Unseq-File
       for (int i = 1; i <= 100; i++) {
         statement.execute(
-            String.format(Locale.ENGLISH, insertTemplate, i, i, i, (double) i, 
"\'" + i + "\'",
+            String.format(insertTemplate, i, i, i, (double) i, "\'" + i + "\'",
                 i % 2 == 0));
       }
       statement.execute("merge");
       // prepare BufferWrite cache
       for (int i = 301; i <= 400; i++) {
         statement.execute(
-            String.format(Locale.ENGLISH, insertTemplate, i, i, i, (double) i, 
"\'" + i + "\'",
+            String.format(insertTemplate, i, i, i, (double) i, "\'" + i + "\'",
                 i % 2 == 0));
       }
       // prepare Overflow cache
       for (int i = 101; i <= 200; i++) {
         statement.execute(
-            String.format(Locale.ENGLISH, insertTemplate, i, i, i, (double) i, 
"\'" + i + "\'",
+            String.format(insertTemplate, i, i, i, (double) i, "\'" + i + "\'",
                 i % 2 == 0));
       }
 
@@ -230,12 +231,12 @@ public class IoTDBDeletionIT {
 
       // prepare BufferWrite data
       for (int i = 10001; i <= 20000; i++) {
-        statement.execute(String.format(Locale.ENGLISH, insertTemplate, i, i, 
i, (double) i, "\'" + i + "\'",
+        statement.execute(String.format(insertTemplate, i, i, i, (double) i, 
"\'" + i + "\'",
             i % 2 == 0));
       }
       // prepare Overflow data
       for (int i = 1; i <= 10000; i++) {
-        statement.execute(String.format(Locale.ENGLISH, insertTemplate, i, i, 
i, (double) i, "\'" + i + "\'",
+        statement.execute(String.format(insertTemplate, i, i, i, (double) i, 
"\'" + i + "\'",
             i % 2 == 0));
       }
 
diff --git 
a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
 
b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
index 60dcb63..aaa0f44 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBFlushQueryMergeTest.java
@@ -59,6 +59,7 @@ public class IoTDBFlushQueryMergeTest {
 
   @BeforeClass
   public static void setUp() throws Exception {
+    Locale.setDefault(Locale.ENGLISH);
     EnvironmentUtils.closeStatMonitor();
     EnvironmentUtils.envSetUp();
     insertData();
@@ -121,14 +122,14 @@ public class IoTDBFlushQueryMergeTest {
 
       for (int i = 1; i <= 3; i++) {
         for (int j = 10; j < 20; j++) {
-          statement.execute(String.format(Locale.ENGLISH, insertTemplate, i, 
j, j, j*0.1, String.valueOf(j)));
+          statement.execute(String.format(insertTemplate, i, j, j, j*0.1, 
String.valueOf(j)));
         }
       }
       statement.execute("FLUSH");
 
       for (int i = 1; i <= 3; i++) {
         for (int j = 0; j < 10; j++) {
-          statement.execute(String.format(Locale.ENGLISH, insertTemplate, i, 
j, j, j*0.1, String.valueOf(j)));
+          statement.execute(String.format(insertTemplate, i, j, j, j*0.1, 
String.valueOf(j)));
         }
       }
       statement.execute("FLUSH root.group1");
@@ -136,7 +137,7 @@ public class IoTDBFlushQueryMergeTest {
 
       for (int i = 1; i <= 3; i++) {
         for (int j = 0; j < 30; j++) {
-          statement.execute(String.format(Locale.ENGLISH, insertTemplate, i, 
j, j, j*0.1, String.valueOf(j)));
+          statement.execute(String.format(insertTemplate, i, j, j, j*0.1, 
String.valueOf(j)));
         }
       }
       statement.execute("FLUSH root.group1 true");