Skip to content

Commit 86b2672

Browse files
author
chengyitian
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 8a7511a + e9abdb8 commit 86b2672

9 files changed

+340
-464
lines changed

‎test/com/xxdb/MultithreadedTableWriterTest.java

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void dropAllDB() throws IOException {
7070
conn.close();
7171
}
7272

73-
public void checkData(BasicTable exception, BasicTable resTable) {
73+
public static void checkData(BasicTable exception, BasicTable resTable) {
7474
assertEquals(exception.rows(), resTable.rows());
7575
for (int i = 0; i < exception.columns(); i++) {
7676
System.out.println("col" + resTable.getColumnName(i));
@@ -7679,5 +7679,24 @@ public void test_MultithreadedTableWriter_allDataType_array_null() throws Except
76797679
assertEquals(0, bt.rows());
76807680
conn.close();
76817681
}
7682+
7683+
// @Test(timeout = 120000)
7684+
// public void test_insert_haStreamTable() throws Exception {
7685+
// conn.run("haTableName='ha_stream'; " +
7686+
// "try{ dropStreamTable(haTableName); }catch(ex){}\n " +
7687+
// "t = table(1:0, `tradeDate`tradePrice`vwap`volume`valueTrade, [DATETIME, DOUBLE, DOUBLE, INT, DOUBLE]);" +
7688+
// "haStreamTable(3,t,haTableName,1000000);");
7689+
// mutithreadTableWriter_ = new MultithreadedTableWriter(HOST, PORT, "admin", "123456",
7690+
// "", "ha_stream", false, true, ipports, 10, 1,
7691+
// 1, "tradeDate");
7692+
// List<List<Entity>> tb = new ArrayList<>();
7693+
// for (int i = 0; i < 10000; i++) {
7694+
// mutithreadTableWriter_.insert( LocalDateTime.of(2012, 1, i % 10 + 1, 1, i%10), i + 0.1, i + 0.1, i % 10, i + 0.1);
7695+
// }
7696+
// Thread.sleep(2000);
7697+
// BasicTable ex = (BasicTable) conn.run("select * from ha_stream order by tradeDate,tradePrice,vwap,volume,valueTrade;");
7698+
// assertEquals(10000,ex.rows());
7699+
// mutithreadTableWriter_.waitForThreadCompletion();
7700+
// }
76827701
}
76837702

‎test/com/xxdb/data/BasicDecimal128MatrixTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ public void test_BasicDecimal128Matrix_set() throws Exception {
231231
System.out.println(re1.getString());
232232
assertEquals(6, re1.getScale());
233233
assertEquals(new BasicDecimal128("1.999990",6).getString(), re1.get(0,0).getString());
234-
assertEquals(new BasicDecimal128("0.000000",6).getString(), re1.get(0,1).getString());
235-
assertEquals(new BasicDecimal128("999.999000",6).getString(), re1.get(1,0).getString());
234+
assertEquals(new BasicDecimal128("-1.000000",6).getString(), re1.get(0,1).getString());
235+
assertEquals(new BasicDecimal128("1000.000000",6).getString(), re1.get(1,0).getString());
236236
assertEquals(new BasicDecimal128("-999.999990",6).getString(), re1.get(1,1).getString());
237237
}
238238

‎test/com/xxdb/data/BasicDecimal128Test.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.junit.Test;
88

99
import java.io.IOException;
10+
import java.math.BigInteger;
1011
import java.util.HashMap;
1112
import java.util.Map;
1213
import java.util.ResourceBundle;
@@ -66,7 +67,26 @@ public void test_BasicDecimal128_value_string_1(){
6667
BasicDecimal128 Decimal128 = new BasicDecimal128("121.23", 6);
6768
assertEquals("121.230000",Decimal128.getString());
6869
}
70+
@Test
71+
public void test_BasicDecimal128_value_BigInteger (){
72+
BasicDecimal128 Decimal128 = new BasicDecimal128(new BigInteger("1234"),4);
73+
assertEquals("1234.0000",Decimal128.getString());
74+
75+
BasicDecimal128 re1 = new BasicDecimal128(new BigInteger("-1234"),0);
76+
assertEquals("-1234",re1.getString());
77+
78+
BasicDecimal128 re2 = new BasicDecimal128(new BigInteger("10000000000000000000000000000000000000"),0);
79+
assertEquals("10000000000000000000000000000000000000",re2.getString());
6980

81+
BasicDecimal128 re3 = new BasicDecimal128(new BigInteger("-10000000000000000000000000000000000000"),0);
82+
assertEquals("-10000000000000000000000000000000000000",re3.getString());
83+
84+
BasicDecimal128 re4 = new BasicDecimal128(new BigInteger("-1"),38);
85+
assertEquals("-1.00000000000000000000000000000000000000",re4.getString());
86+
87+
BasicDecimal128 re5 = new BasicDecimal128(new BigInteger("0"),38);
88+
assertEquals("0.00000000000000000000000000000000000000",re5.getString());
89+
}
7090
@Test
7191
public void test_BasicDecimal128_scale_0() throws Exception {
7292
BasicDecimal128 Decimal128 = new BasicDecimal128("123.2",0);

‎test/com/xxdb/data/BasicDecimal128VectorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ public void test_BasicDecimal128Vector_dataValue_not_true() throws Exception {
9898
}catch(Exception E){
9999
ex=E.getMessage();
100100
}
101-
assertEquals("Decimal128 overflow -17014118346046923173168730371588410572900000",ex);
101+
assertEquals("Decimal128 overflow -170141183460469231731687303715884105729.00000",ex);
102102
String ex1 = null;
103103
String[] tmp_string_v1 = {"170141183460469231731687303715884105729"};
104104
try{
105105
BasicDecimal128Vector tmp_128_v = new BasicDecimal128Vector(tmp_string_v1,5);
106106
}catch(Exception E){
107107
ex1 = E.getMessage();
108108
}
109-
assertEquals("Decimal128 overflow 17014118346046923173168730371588410572900000",ex1);
109+
assertEquals("Decimal128 overflow 170141183460469231731687303715884105729.00000",ex1);
110110
}
111111

112112
@Test

‎test/com/xxdb/data/BasicDecimal32MatrixTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ public void test_BasicDecimal32Matrix_set() throws Exception {
229229
System.out.println(re1.getString());
230230
assertEquals(6, re1.getScale());
231231
assertEquals(new BasicDecimal32("1.999990",6).getString(), re1.get(0,0).getString());
232-
assertEquals(new BasicDecimal32("0.000000",6).getString(), re1.get(0,1).getString());
233-
assertEquals(new BasicDecimal32("999.999000",6).getString(), re1.get(1,0).getString());
232+
assertEquals(new BasicDecimal32("-1.000000",6).getString(), re1.get(0,1).getString());
233+
assertEquals(new BasicDecimal32("1000.000000",6).getString(), re1.get(1,0).getString());
234234
assertEquals(new BasicDecimal32("-999.999990",6).getString(), re1.get(1,1).getString());
235235
}
236236

‎test/com/xxdb/data/BasicDecimal64MatrixTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ public void test_BasicDecimal64Matrix_set() throws Exception {
230230
System.out.println(re1.getString());
231231
assertEquals(6, re1.getScale());
232232
assertEquals(new BasicDecimal64("1.999990",6).getString(), re1.get(0,0).getString());
233-
assertEquals(new BasicDecimal64("0.000000",6).getString(), re1.get(0,1).getString());
234-
assertEquals(new BasicDecimal64("999.999000",6).getString(), re1.get(1,0).getString());
233+
assertEquals(new BasicDecimal64("-1.000000",6).getString(), re1.get(0,1).getString());
234+
assertEquals(new BasicDecimal64("1000.000000",6).getString(), re1.get(1,0).getString());
235235
assertEquals(new BasicDecimal64("-999.999990",6).getString(), re1.get(1,1).getString());
236236
re1.setScale(10);
237237
re1.set(0,0,new BasicDecimal64("1.999900009",9));
@@ -241,8 +241,8 @@ public void test_BasicDecimal64Matrix_set() throws Exception {
241241
System.out.println(re1.getString());
242242
assertEquals(10, re1.getScale());
243243
assertEquals(new BasicDecimal64("1.9999000090",10).getString(), re1.get(0,0).getString());
244-
assertEquals(new BasicDecimal64("-0.0000000000",10).getString(), re1.get(0,1).getString());
245-
assertEquals(new BasicDecimal64("99999999.9990000000",10).getString(), re1.get(1,0).getString());
244+
assertEquals(new BasicDecimal64("-1.0000000000",10).getString(), re1.get(0,1).getString());
245+
assertEquals(new BasicDecimal64("100000000.0000000000",10).getString(), re1.get(1,0).getString());
246246
assertEquals(new BasicDecimal64("-99999999.9999900000",10).getString(), re1.get(1,1).getString());
247247
}
248248

‎test/com/xxdb/data/UtilsTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44

55
import com.xxdb.DBConnection;
6+
import junit.framework.Assert;
67
import org.junit.Test;
78

89
import java.io.IOException;
@@ -297,6 +298,9 @@ public void test_getDataTypeString(){
297298
assertEquals("decimal32",getDataTypeString(Entity.DATA_TYPE.DT_DECIMAL32));
298299
assertEquals("decimal64",getDataTypeString(Entity.DATA_TYPE.DT_DECIMAL64));
299300
assertEquals("DT_DECIMAL128",getDataTypeString(Entity.DATA_TYPE.DT_DECIMAL128));
300-
301+
}
302+
@Test
303+
public void test_getJavaApiVersion(){
304+
Assert.assertNotNull(Utils.getJavaApiVersion());
301305
}
302306
}

0 commit comments

Comments
 (0)