Skip to content

Commit ea50cdc

Browse files
author
chengyitian
committed
Merge remote-tracking branch 'origin/release130' into release130
2 parents 1abebf0 + b55746e commit ea50cdc

14 files changed

+1332
-3296
lines changed

‎target/test-classes/com/xxdb/README.md‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎target/test-classes/com/xxdb/route/AutoFitTableAppenderTest.java‎

Lines changed: 0 additions & 2044 deletions
This file was deleted.

‎target/test-classes/com/xxdb/setup/settings.properties‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
package com.xxdb.data;
2+
import com.alibaba.fastjson2.JSONObject;
3+
import com.xxdb.DBConnection;
4+
import org.junit.Test;
5+
import java.io.IOException;
6+
import java.nio.ByteBuffer;
7+
import java.text.SimpleDateFormat;
8+
import java.time.*;
9+
import java.util.*;
10+
import static com.xxdb.data.Utils.countMilliseconds;
11+
import static org.junit.Assert.*;
12+
public class BasicDateHourTest {
13+
@Test
14+
public void testDateHourCombine(){
15+
List<Integer> list = Arrays.asList(1,2,3);
16+
BasicDateHourVector v = new BasicDateHourVector(list);
17+
List<Integer> list1 = Arrays.asList(3,2,1);
18+
BasicDateHourVector v1 = new BasicDateHourVector(list1);
19+
BasicDateHourVector v2 = (BasicDateHourVector) v.combine(v1);
20+
List<Integer> list2 = Arrays.asList(1,2,3,3,2,1);
21+
BasicDateHourVector v3 = new BasicDateHourVector(list2);
22+
for (int i = 0;i<list2.size();i++){
23+
assertEquals(v3.get(i).getString() ,v2.get(i).getString());
24+
}
25+
}
26+
@Test
27+
public void test_BasicDateHour(){
28+
Calendar calendar = Calendar.getInstance();
29+
calendar.set(2022,0,31,2,2,2);
30+
BasicDateHour date = new BasicDateHour(calendar);
31+
assertEquals("2022.01.31T02",date.getString());
32+
LocalDateTime dt = LocalDateTime.of(2022,2,28,2,2,2);
33+
date = new BasicDateHour(dt);
34+
assertEquals("2022.02.28T02",date.getString());
35+
dt = LocalDateTime.of(2008,2,29,2,2,2);
36+
date = new BasicDateHour(dt);
37+
assertEquals("2008.02.29T02",date.getString());
38+
dt = LocalDateTime.of(2022,3,31,2,2,2);
39+
date = new BasicDateHour(dt);
40+
assertEquals("2022.03.31T02",date.getString());
41+
dt = LocalDateTime.of(2022,1,1,2,2,2);
42+
date = new BasicDateHour(dt);
43+
assertEquals("2022.01.01T02",date.getString());
44+
dt = LocalDateTime.of(2022,12,31,2,2,2);
45+
date = new BasicDateHour(dt);
46+
assertEquals("2022.12.31T02",date.getString());
47+
dt = LocalDateTime.of(2022,3,1,2,2,2);
48+
date = new BasicDateHour(dt);
49+
assertEquals("2022.03.01T02",date.getString());
50+
dt = LocalDateTime.of(2000,2,29,2,2,2);
51+
date = new BasicDateHour(dt);
52+
assertEquals("2000.02.29T02",date.getString());
53+
}
54+
@Test
55+
public void test_BasicDateHourMatrix() throws Exception {
56+
BasicDateHourMatrix bdhm = new BasicDateHourMatrix(2,2);
57+
bdhm.setDateHour(0,0,LocalDateTime.of(2022,7,29,11,07));
58+
bdhm.setDateHour(0,1,LocalDateTime.of(1970,1,1,11,11));
59+
bdhm.setDateHour(1,0,LocalDateTime.of(1993,6,23,15,36));
60+
bdhm.setDateHour(1,1,LocalDateTime.MIN);
61+
assertEquals("1993-06-23T15:00",bdhm.getDateHour(1,0).toString());
62+
assertEquals(BasicDateHour.class,bdhm.getElementClass());
63+
assertEquals(Entity.DATA_CATEGORY.TEMPORAL,bdhm.getDataCategory());
64+
List<int[]> listofArrays = new ArrayList<>(2);
65+
listofArrays.add(new int[]{2861000,7963000});
66+
listofArrays.add(new int[]{4565000,2467000});
67+
BasicDateHourMatrix bdhm2 = new BasicDateHourMatrix(2,2,listofArrays);
68+
assertEquals("2490-10-09T08:00",bdhm2.getDateHour(0,1).toString());
69+
}
70+
71+
@Test
72+
public void test_BasicDateHourVector() throws Exception{
73+
int[] array = new int[]{2861000,7963000,4565000,2467000,Integer.MIN_VALUE};
74+
BasicDateHourVector btv = new BasicDateHourVector(array,true);
75+
assertEquals(Entity.DATA_CATEGORY.TEMPORAL,btv.getDataCategory());
76+
assertEquals("2251-06-08T16:00",btv.getDateHour(3).toString());
77+
int[] indices = new int[]{0,2,1};
78+
assertEquals("[2296.05.19T08,2490.10.09T08,2878.05.31T16]",btv.getSubVector(indices).getString());
79+
btv.setDateHour(2,LocalDateTime.of(1984,7,14,11,25));
80+
assertEquals("1984-07-14T11:00",btv.getDateHour(2).toString());
81+
assertNull(btv.getDateHour(4));
82+
assertEquals("2251.06.08T16",btv.get(3).getString());
83+
assertEquals(BasicDateHour.class,btv.getElementClass());
84+
BasicDateHourVector bdhv = new BasicDateHourVector(Entity.DATA_FORM.DF_VECTOR,1);
85+
assertEquals("1970-01-01T00:00",bdhv.getDateHour(0).toString());
86+
List<Integer> list = Arrays.asList(2861000,7963000,4565000,2467000,Integer.MIN_VALUE);
87+
BasicDateHourVector bdhv2 = new BasicDateHourVector(list);
88+
assertEquals("2878-05-31T16:00",bdhv2.getDateHour(1).toString());
89+
ByteBuffer bb = ByteBuffer.allocate(10000);
90+
bdhv2.writeVectorToBuffer(bb);
91+
}
92+
93+
@Test
94+
public void test_BasicDateHourVector_Append() throws Exception {
95+
BasicDateHourVector bdhv = new BasicDateHourVector(new int[]{476,1004});
96+
int size = bdhv.size;
97+
int capacity = bdhv.capaticy;
98+
bdhv.Append(new BasicDateHour(LocalDateTime.now()));
99+
assertEquals(capacity*2,bdhv.capaticy);
100+
System.out.println(bdhv.get(2));
101+
bdhv.Append(bdhv);
102+
assertEquals(size+4,bdhv.size);
103+
assertEquals(7,bdhv.capaticy);
104+
}
105+
@Test
106+
public void test_BasicDateHour_toJSONString() throws Exception {
107+
BasicDateHour date = new BasicDateHour(100);
108+
String re = JSONObject.toJSONString(date);
109+
System.out.println(re);
110+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_SCALAR\",\"dataType\":\"DT_DATEHOUR\",\"dateHour\":\"1970-01-05 04:00:00\",\"dictionary\":false,\"int\":100,\"jsonString\":\"\\\"1970.01.05T04\\\"\",\"matrix\":false,\"null\":false,\"number\":100,\"pair\":false,\"scalar\":true,\"scale\":0,\"string\":\"1970.01.05T04\",\"table\":false,\"vector\":false}", re);
111+
}
112+
@Test
113+
public void test_BasicDateHourVector_toJSONString() throws Exception {
114+
List<Integer> list = Arrays.asList(1,2,3);
115+
BasicDateHourVector v = new BasicDateHourVector(list);
116+
String re = JSONObject.toJSONString(v);
117+
System.out.println(re);
118+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[1,2,3],\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DATEHOUR\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDateHour\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[1970.01.01T01,1970.01.01T02,1970.01.01T03]\",\"table\":false,\"unitLength\":4,\"vector\":true}", re);
119+
}
120+
@Test
121+
public void test_BasicDateHourMatrix_toJSONString() throws Exception {
122+
List<int[]> listofArrays = new ArrayList<>(2);
123+
listofArrays.add(new int[]{1,2});
124+
listofArrays.add(new int[]{3,4});
125+
BasicDateHourMatrix bdhm2 = new BasicDateHourMatrix(2,2,listofArrays);
126+
String re = JSONObject.toJSONString(bdhm2);
127+
System.out.println(re);
128+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_MATRIX\",\"dataType\":\"DT_DATEHOUR\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDateHour\",\"matrix\":true,\"pair\":false,\"scalar\":false,\"string\":\"#0 #1 \\n1970.01.01T01 1970.01.01T03\\n1970.01.01T02 1970.01.01T04\\n\",\"table\":false,\"vector\":false}", re);
129+
}
130+
}

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

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
package com.xxdb.data;
2+
import com.alibaba.fastjson2.JSONObject;
3+
import com.xxdb.DBConnection;
4+
import org.junit.Test;
5+
import java.io.IOException;
6+
import java.nio.ByteBuffer;
7+
import java.text.SimpleDateFormat;
8+
import java.time.*;
9+
import java.util.*;
10+
import static com.xxdb.data.Utils.countMilliseconds;
11+
import static org.junit.Assert.*;
12+
public class BasicDateTest {
13+
@Test
14+
public void testDateCombine(){
15+
List<Integer> list = Arrays.asList(1,2,3);
16+
BasicDateVector v = new BasicDateVector(list);
17+
List<Integer> list1 = Arrays.asList(3,2,1);
18+
BasicDateVector v1 = new BasicDateVector(list1);
19+
BasicDateVector v2 = (BasicDateVector) v.combine(v1);
20+
List<Integer> list2 = Arrays.asList(1,2,3,3,2,1);
21+
BasicDateVector v3 = new BasicDateVector(list2);
22+
for (int i = 0;i<list2.size();i++){
23+
assertEquals(v3.get(i).getString() ,v2.get(i).getString());
24+
}
25+
}
26+
@Test
27+
public void test_BasicDateMatrix() throws Exception {
28+
BasicDateMatrix bdhm = new BasicDateMatrix(2,2);
29+
bdhm.setDate(0,0,LocalDate.of(2022,7,29));
30+
bdhm.setDate(0,1,LocalDate.of(1970,1,1));
31+
bdhm.setDate(1,0,LocalDate.of(1993,6,23));
32+
bdhm.setDate(1,1,LocalDate.MIN);
33+
assertEquals("1993-06-23",bdhm.getDate(1,0).toString());
34+
assertEquals(BasicDate.class,bdhm.getElementClass());
35+
assertEquals(Entity.DATA_CATEGORY.TEMPORAL,bdhm.getDataCategory());
36+
List<int[]> listofArrays = new ArrayList<>(2);
37+
listofArrays.add(new int[]{2861,7963});
38+
listofArrays.add(new int[]{4565,2467});
39+
BasicDateMatrix bdhm2 = new BasicDateMatrix(2,2,listofArrays);
40+
assertEquals("1982-07-02",bdhm2.getDate(0,1).toString());
41+
}
42+
43+
@Test
44+
public void test_BasicDateVector() throws Exception{
45+
int[] array = new int[]{2861,7963,4565,2467,Integer.MIN_VALUE};
46+
BasicDateVector btv = new BasicDateVector(array,true);
47+
assertEquals(Entity.DATA_CATEGORY.TEMPORAL,btv.getDataCategory());
48+
assertEquals("1976-10-03",btv.getDate(3).toString());
49+
int[] indices = new int[]{0,2,1};
50+
assertEquals("[1977.11.01,1982.07.02,1991.10.21]",btv.getSubVector(indices).getString());
51+
btv.setDate(2,LocalDate.of(1984,7,14));
52+
assertEquals("1984-07-14",btv.getDate(2).toString());
53+
assertNull(btv.getDate(4));
54+
assertEquals(BasicDate.class,btv.getElementClass());
55+
assertEquals(new BasicDate(LocalDate.of(1976,10,3)),btv.get(3));
56+
BasicDateVector bdhv = new BasicDateVector(Entity.DATA_FORM.DF_VECTOR,1);
57+
assertEquals("1970-01-01",bdhv.getDate(0).toString());
58+
List<Integer> list = Arrays.asList(2861,7963,4565,2467,Integer.MIN_VALUE);
59+
BasicDateVector bdhv2 = new BasicDateVector(list);
60+
assertEquals("1991-10-21",bdhv2.getDate(1).toString());
61+
ByteBuffer bb = ByteBuffer.allocate(10000);
62+
bdhv2.writeVectorToBuffer(bb);
63+
}
64+
65+
@Test
66+
public void test_BasicDateVector_Append() throws Exception {
67+
BasicDateVector bdv = new BasicDateVector(new int[]{25,220,280});
68+
int size = bdv.size;
69+
int capacity = bdv.capaticy;
70+
bdv.Append(new BasicDate(317));
71+
assertEquals(capacity*2,bdv.capaticy);
72+
bdv.Append(new BasicDateVector(new int[]{420,587,618}));
73+
assertEquals(capacity*2+3,bdv.capaticy);
74+
assertEquals(size+4,bdv.size);
75+
System.out.println(bdv.getString());
76+
}
77+
@Test
78+
public void test_BasicDate_toJSONString() throws Exception {
79+
LocalDate dt = LocalDate.of(2022,1,31);
80+
BasicDate date = new BasicDate(dt);
81+
String re = JSONObject.toJSONString(date);
82+
System.out.println(re);
83+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_SCALAR\",\"dataType\":\"DT_DATE\",\"date\":\"2022-01-31\",\"dictionary\":false,\"int\":19023,\"jsonString\":\"\\\"2022.01.31\\\"\",\"matrix\":false,\"null\":false,\"number\":19023,\"pair\":false,\"scalar\":true,\"scale\":0,\"string\":\"2022.01.31\",\"table\":false,\"vector\":false}", re);
84+
}
85+
@Test
86+
public void test_BasicDateVector_toJSONString() throws Exception {
87+
List<Integer> list = Arrays.asList(1,2,3);
88+
BasicDateVector v = new BasicDateVector(list);
89+
String re = JSONObject.toJSONString(v);
90+
System.out.println(re);
91+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[1,2,3],\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DATE\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDate\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[1970.01.02,1970.01.03,1970.01.04]\",\"table\":false,\"unitLength\":4,\"vector\":true}", re);
92+
}
93+
@Test
94+
public void test_BasicDateMatrix_toJSONString() throws Exception {
95+
List<int[]> listofArrays = new ArrayList<>(2);
96+
listofArrays.add(new int[]{2861,7963});
97+
listofArrays.add(new int[]{4565,2467});
98+
BasicDateMatrix bdhm2 = new BasicDateMatrix(2,2,listofArrays);
99+
String re = JSONObject.toJSONString(bdhm2);
100+
System.out.println(re);
101+
assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"TEMPORAL\",\"dataForm\":\"DF_MATRIX\",\"dataType\":\"DT_DATE\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDate\",\"matrix\":true,\"pair\":false,\"scalar\":false,\"string\":\"#0 #1 \\n1977.11.01 1982.07.02\\n1991.10.21 1976.10.03\\n\",\"table\":false,\"vector\":false}", re);
102+
}
103+
}

0 commit comments

Comments
 (0)