Skip to content

Commit 41fd780

Browse files
author
chengyitian
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 6e593e7 + 19eccc5 commit 41fd780

11 files changed

Lines changed: 788 additions & 392 deletions

‎test/com/xxdb/ConnectionPoolTest.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,13 +1829,13 @@ public void test_pool_execute_decimal_arrayvector() throws Exception {
18291829
System.out.println(res.getString());
18301830
assertEquals(7,res.columns());
18311831
assertEquals(2,res.rows());
1832-
assertEquals("[[1,3,99999],[-1,0,0]]",res.getColumn(0).getString());
1833-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
1834-
assertEquals("[[1.000,3.000,99999.999],[-1.000,0.000,0.123]]",res.getColumn(2).getString());
1835-
assertEquals("[[1,3,99999],[-1,0,0]]",res.getColumn(3).getString());
1836-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(4).getString());
1837-
assertEquals("[[1.0000,3.0000,99999.9999],[-1.0000,0.0000,0.1234]]",res.getColumn(5).getString());
1838-
assertEquals("[[1.00000000,3.00001000,99999.99999999],[-1.00000000,0.00000000,0.12345678]]",res.getColumn(6).getString());
1832+
assertEquals("[[1,3,100000],[-1,0,0]]",res.getColumn(0).getString());
1833+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
1834+
assertEquals("[[1.000,3.000,100000.000],[-1.000,0.000,0.123]]",res.getColumn(2).getString());
1835+
assertEquals("[[1,3,100000],[-1,0,0]]",res.getColumn(3).getString());
1836+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(4).getString());
1837+
assertEquals("[[1.0000,3.0000,100000.0000],[-1.0000,0.0000,0.1235]]",res.getColumn(5).getString());
1838+
assertEquals("[[1.00000000,3.00001000,100000.00000000],[-1.00000000,0.00000000,0.12345679]]",res.getColumn(6).getString());
18391839
System.out.println(res.getColumn(0).getString());
18401840
pool.shutdown();
18411841
}
@@ -1867,13 +1867,13 @@ public void test_pool_execute_decimal_arrayvector_compress_true() throws Excepti
18671867
System.out.println(res.getString());
18681868
assertEquals(7,res.columns());
18691869
assertEquals(2,res.rows());
1870-
assertEquals("[[1,3,99999],[-1,0,0]]",res.getColumn(0).getString());
1871-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
1872-
assertEquals("[[1.000,3.000,99999.999],[-1.000,0.000,0.123]]",res.getColumn(2).getString());
1873-
assertEquals("[[1,3,99999],[-1,0,0]]",res.getColumn(3).getString());
1874-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(4).getString());
1875-
assertEquals("[[1.0000,3.0000,99999.9999],[-1.0000,0.0000,0.1234]]",res.getColumn(5).getString());
1876-
assertEquals("[[1.00000000,3.00001000,99999.99999999],[-1.00000000,0.00000000,0.12345678]]",res.getColumn(6).getString());
1870+
assertEquals("[[1,3,100000],[-1,0,0]]",res.getColumn(0).getString());
1871+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
1872+
assertEquals("[[1.000,3.000,100000.000],[-1.000,0.000,0.123]]",res.getColumn(2).getString());
1873+
assertEquals("[[1,3,100000],[-1,0,0]]",res.getColumn(3).getString());
1874+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(4).getString());
1875+
assertEquals("[[1.0000,3.0000,100000.0000],[-1.0000,0.0000,0.1235]]",res.getColumn(5).getString());
1876+
assertEquals("[[1.00000000,3.00001000,100000.00000000],[-1.00000000,0.00000000,0.12345679]]",res.getColumn(6).getString());
18771877
System.out.println(res.getColumn(0).getString());
18781878
pool.shutdown();
18791879
}
@@ -1901,9 +1901,9 @@ public void test_pool_execute_decimal128_arrayvector() throws Exception {
19011901
System.out.println(res.getString());
19021902
assertEquals(5, res.columns());
19031903
assertEquals(2, res.rows());
1904-
assertEquals("[[1,3,99999],[-1,0,0]]",res.getColumn(0).getString());
1905-
assertEquals("[[1.0000,3.0000,99999.9999],[-1.0000,0.0000,0.1234]]",res.getColumn(1).getString());
1906-
assertEquals("[[1.0000000000,3.0000100000,99999.9999999999],[-1.0000000000,0.0000000000,0.1234567890]]",res.getColumn(2).getString());
1904+
assertEquals("[[1,3,100000],[-1,0,0]]",res.getColumn(0).getString());
1905+
assertEquals("[[1.0000,3.0000,100000.0000],[-1.0000,0.0000,0.1235]]",res.getColumn(1).getString());
1906+
assertEquals("[[1.0000000000,3.0000100000,100000.0000000000],[-1.0000000000,0.0000000000,0.1234567890]]",res.getColumn(2).getString());
19071907
assertEquals("[[1.0000000000000000000,3.0000100000000000000,99999.9999999999849005056],[-1.0000000000000000000,0.0000000000000000000,0.1234567890000000000]]",res.getColumn(3).getString());
19081908
assertEquals("[[1.0000000000000000000000000000000000000,3.0000000000000000000000000000000000000,1.0000000000000000000000000000000000000],[-3.0000000000000000000000000000000000000,0.0000000000000000000000000000000000000,0.1234567889999999866557890289987485696]]",res.getColumn(4).getString());
19091909
}
@@ -1931,9 +1931,9 @@ public void test_pool_execute_decimal128_arrayvector_compress_true() throws Exce
19311931
System.out.println(res.getString());
19321932
assertEquals(5, res.columns());
19331933
assertEquals(2, res.rows());
1934-
assertEquals("[[1,3,99999],[-1,0,0]]",res.getColumn(0).getString());
1935-
assertEquals("[[1.0000,3.0000,99999.9999],[-1.0000,0.0000,0.1234]]",res.getColumn(1).getString());
1936-
assertEquals("[[1.0000000000,3.0000100000,99999.9999999999],[-1.0000000000,0.0000000000,0.1234567890]]",res.getColumn(2).getString());
1934+
assertEquals("[[1,3,100000],[-1,0,0]]",res.getColumn(0).getString());
1935+
assertEquals("[[1.0000,3.0000,100000.0000],[-1.0000,0.0000,0.1235]]",res.getColumn(1).getString());
1936+
assertEquals("[[1.0000000000,3.0000100000,100000.0000000000],[-1.0000000000,0.0000000000,0.1234567890]]",res.getColumn(2).getString());
19371937
assertEquals("[[1.0000000000000000000,3.0000100000000000000,99999.9999999999849005056],[-1.0000000000000000000,0.0000000000000000000,0.1234567890000000000]]",res.getColumn(3).getString());
19381938
assertEquals("[[1.0000000000000000000000000000000000000,3.0000000000000000000000000000000000000,1.0000000000000000000000000000000000000],[-3.0000000000000000000000000000000000000,0.0000000000000000000000000000000000000,0.1234567889999999866557890289987485696]]",res.getColumn(4).getString());
19391939
}

‎test/com/xxdb/DBConnectionTest.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,6 +1890,7 @@ public void testStringMatrixUploadNull() throws IOException {
18901890
Entity matrixStringRes = conn.run("matrixString");
18911891
BasicString datatype1 = (BasicString)conn.run("typestr(matrixString)");
18921892
System.out.println(datatype1.getString());
1893+
assertEquals("STRING MATRIX", datatype1.getString());
18931894
assertEquals(2, matrixStringRes.rows());
18941895
assertEquals(4, matrixStringRes.columns());
18951896
assertEquals(matrixString.getString(), matrixStringRes.getString());
@@ -4039,13 +4040,13 @@ public void test_tableInsert_decimal_arrayvector() throws Exception {
40394040
System.out.println(res.getString());
40404041
assertEquals(7,res.columns());
40414042
assertEquals(4,res.rows());
4042-
assertEquals("[[1,3,99999],[-1,0,0],[1,3,99999],[-1,0,0]]",res.getColumn(0).getString());
4043-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1],[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4044-
assertEquals("[[1.000,3.000,99999.999],[-1.000,0.000,0.123],[1.000,3.000,99999.999],[-1.000,0.000,0.123]]",res.getColumn(2).getString());
4045-
assertEquals("[[1,3,99999],[-1,0,0],[1,3,99999],[-1,0,0]]",res.getColumn(3).getString());
4046-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1],[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(4).getString());
4047-
assertEquals("[[1.0000,3.0000,99999.9999],[-1.0000,0.0000,0.1234],[1.0000,3.0000,99999.9999],[-1.0000,0.0000,0.1234]]",res.getColumn(5).getString());
4048-
assertEquals("[[1.00000000,3.00001000,99999.99999999],[-1.00000000,0.00000000,0.12345678],[1.00000000,3.00001000,99999.99999999],[-1.00000000,0.00000000,0.12345678]]",res.getColumn(6).getString());
4043+
assertEquals("[[1,3,100000],[-1,0,0],[1,3,100000],[-1,0,0]]",res.getColumn(0).getString());
4044+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1],[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4045+
assertEquals("[[1.000,3.000,100000.000],[-1.000,0.000,0.123],[1.000,3.000,100000.000],[-1.000,0.000,0.123]]",res.getColumn(2).getString());
4046+
assertEquals("[[1,3,100000],[-1,0,0],[1,3,100000],[-1,0,0]]",res.getColumn(3).getString());
4047+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1],[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(4).getString());
4048+
assertEquals("[[1.0000,3.0000,100000.0000],[-1.0000,0.0000,0.1235],[1.0000,3.0000,100000.0000],[-1.0000,0.0000,0.1235]]",res.getColumn(5).getString());
4049+
assertEquals("[[1.00000000,3.00001000,100000.00000000],[-1.00000000,0.00000000,0.12345679],[1.00000000,3.00001000,100000.00000000],[-1.00000000,0.00000000,0.12345679]]",res.getColumn(6).getString());
40494050
System.out.println(res.getColumn(0).getString());
40504051

40514052
}
@@ -4072,12 +4073,11 @@ public void test_tableInsert_decimal128_arrayvector() throws Exception {
40724073
System.out.println(res.getString());
40734074
assertEquals(4,res.columns());
40744075
assertEquals(4,res.rows());
4075-
assertEquals("[[1,3,99999],[-1,0,0],[1,3,99999],[-1,0,0]]",res.getColumn(0).getString());
4076-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1],[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4077-
assertEquals("[[1.0000000000,3.0000100000,99999.9999999999],[-1.0000000000,0.0000000000,0.1234567890],[1.0000000000,3.0000100000,99999.9999999999],[-1.0000000000,0.0000000000,0.1234567890]]",res.getColumn(2).getString());
4076+
assertEquals("[[1,3,100000],[-1,0,0],[1,3,100000],[-1,0,0]]",res.getColumn(0).getString());
4077+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1],[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4078+
assertEquals("[[1.0000000000,3.0000100000,100000.0000000000],[-1.0000000000,0.0000000000,0.1234567890],[1.0000000000,3.0000100000,100000.0000000000],[-1.0000000000,0.0000000000,0.1234567890]]",res.getColumn(2).getString());
40784079
assertEquals("[[1.000000000000000000000000000000,3.000010000000000339718860439552,99999.999999999978416622034208423936],[-1.000000000000000000000000000000,0.000000000000000000000000000000,0.123456788999999991885143736320],[1.000000000000000000000000000000,3.000010000000000339718860439552,99999.999999999978416622034208423936],[-1.000000000000000000000000000000,0.000000000000000000000000000000,0.123456788999999991885143736320]]",res.getColumn(3).getString());
40794080
System.out.println(res.getColumn(0).getString());
4080-
40814081
}
40824082
@Test
40834083
public void test_tableInsert_decimal_arrayvector_compress_true() throws Exception {
@@ -4104,13 +4104,13 @@ public void test_tableInsert_decimal_arrayvector_compress_true() throws Exceptio
41044104
System.out.println(res.getString());
41054105
assertEquals(7,res.columns());
41064106
assertEquals(4,res.rows());
4107-
assertEquals("[[1,3,99999],[-1,0,0],[1,3,99999],[-1,0,0]]",res.getColumn(0).getString());
4108-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1],[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4109-
assertEquals("[[1.000,3.000,99999.999],[-1.000,0.000,0.123],[1.000,3.000,99999.999],[-1.000,0.000,0.123]]",res.getColumn(2).getString());
4110-
assertEquals("[[1,3,99999],[-1,0,0],[1,3,99999],[-1,0,0]]",res.getColumn(3).getString());
4111-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1],[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(4).getString());
4112-
assertEquals("[[1.0000,3.0000,99999.9999],[-1.0000,0.0000,0.1234],[1.0000,3.0000,99999.9999],[-1.0000,0.0000,0.1234]]",res.getColumn(5).getString());
4113-
assertEquals("[[1.00000000,3.00001000,99999.99999999],[-1.00000000,0.00000000,0.12345678],[1.00000000,3.00001000,99999.99999999],[-1.00000000,0.00000000,0.12345678]]",res.getColumn(6).getString());
4107+
assertEquals("[[1,3,100000],[-1,0,0],[1,3,100000],[-1,0,0]]",res.getColumn(0).getString());
4108+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1],[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4109+
assertEquals("[[1.000,3.000,100000.000],[-1.000,0.000,0.123],[1.000,3.000,100000.000],[-1.000,0.000,0.123]]",res.getColumn(2).getString());
4110+
assertEquals("[[1,3,100000],[-1,0,0],[1,3,100000],[-1,0,0]]",res.getColumn(3).getString());
4111+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1],[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(4).getString());
4112+
assertEquals("[[1.0000,3.0000,100000.0000],[-1.0000,0.0000,0.1235],[1.0000,3.0000,100000.0000],[-1.0000,0.0000,0.1235]]",res.getColumn(5).getString());
4113+
assertEquals("[[1.00000000,3.00001000,100000.00000000],[-1.00000000,0.00000000,0.12345679],[1.00000000,3.00001000,100000.00000000],[-1.00000000,0.00000000,0.12345679]]",res.getColumn(6).getString());
41144114
System.out.println(res.getColumn(0).getString());
41154115
}
41164116
@Test
@@ -4135,9 +4135,9 @@ public void test_tableInsert_decimal128_arrayvector_compress_true() throws Excep
41354135
System.out.println(res.getString());
41364136
assertEquals(4,res.columns());
41374137
assertEquals(4,res.rows());
4138-
assertEquals("[[1,3,99999],[-1,0,0],[1,3,99999],[-1,0,0]]",res.getColumn(0).getString());
4139-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1],[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4140-
assertEquals("[[1.0000000000,3.0000100000,99999.9999999999],[-1.0000000000,0.0000000000,0.1234567890],[1.0000000000,3.0000100000,99999.9999999999],[-1.0000000000,0.0000000000,0.1234567890]]",res.getColumn(2).getString());
4138+
assertEquals("[[1,3,100000],[-1,0,0],[1,3,100000],[-1,0,0]]",res.getColumn(0).getString());
4139+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1],[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4140+
assertEquals("[[1.0000000000,3.0000100000,100000.0000000000],[-1.0000000000,0.0000000000,0.1234567890],[1.0000000000,3.0000100000,100000.0000000000],[-1.0000000000,0.0000000000,0.1234567890]]",res.getColumn(2).getString());
41414141
assertEquals("[[1.000000000000000000000000000000,3.000010000000000339718860439552,99999.999999999978416622034208423936],[-1.000000000000000000000000000000,0.000000000000000000000000000000,0.123456788999999991885143736320],[1.000000000000000000000000000000,3.000010000000000339718860439552,99999.999999999978416622034208423936],[-1.000000000000000000000000000000,0.000000000000000000000000000000,0.123456788999999991885143736320]]",res.getColumn(3).getString());
41424142
System.out.println(res.getColumn(0).getString());
41434143

@@ -4162,13 +4162,13 @@ public void test_insert_into_decimal_arrayvector() throws Exception {
41624162
System.out.println(res.getString());
41634163
assertEquals(7,res.columns());
41644164
assertEquals(2,res.rows());
4165-
assertEquals("[[1,3,99999],[-1,0,0]]",res.getColumn(0).getString());
4166-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4167-
assertEquals("[[1.000,3.000,99999.999],[-1.000,0.000,0.123]]",res.getColumn(2).getString());
4168-
assertEquals("[[1,3,99999],[-1,0,0]]",res.getColumn(3).getString());
4169-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(4).getString());
4170-
assertEquals("[[1.0000,3.0000,99999.9999],[-1.0000,0.0000,0.1234]]",res.getColumn(5).getString());
4171-
assertEquals("[[1.00000000,3.00001000,99999.99999999],[-1.00000000,0.00000000,0.12345678]]",res.getColumn(6).getString());
4165+
assertEquals("[[1,3,100000],[-1,0,0]]",res.getColumn(0).getString());
4166+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4167+
assertEquals("[[1.000,3.000,100000.000],[-1.000,0.000,0.123]]",res.getColumn(2).getString());
4168+
assertEquals("[[1,3,100000],[-1,0,0]]",res.getColumn(3).getString());
4169+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(4).getString());
4170+
assertEquals("[[1.0000,3.0000,100000.000],[-1.0000,0.0000,0.12345]]",res.getColumn(5).getString());
4171+
assertEquals("[[1.00000000,3.00001000,100000.00000000],[-1.00000000,0.00000000,0.12345679]]",res.getColumn(6).getString());
41724172

41734173
}
41744174
@Test
@@ -4187,8 +4187,8 @@ public void test_insert_into_decimal128_arrayvector() throws Exception {
41874187
System.out.println(res.getString());
41884188
assertEquals(3,res.columns());
41894189
assertEquals(2,res.rows());
4190-
assertEquals("[[1,3,99999],[-1,0,0]]",res.getColumn(0).getString());
4191-
assertEquals("[[1.0,3.0,99999.9],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
4190+
assertEquals("[[1,3,100000],[-1,0,0]]",res.getColumn(0).getString());
4191+
assertEquals("[[1.0,3.0,100000.0],[-1.0,0.0,0.1]]",res.getColumn(1).getString());
41924192
assertEquals("[[1.000000000000000000000000000000,3.000010000000000339718860439552,99999.999999999978416622034208423936],[-1.000000000000000000000000000000,0.000000000000000000000000000000,0.123456788999999991885143736320]]",res.getColumn(2).getString());
41934193
}
41944194
@Test

0 commit comments

Comments
 (0)