AJ-695:update test case about BasicDecimal32Vector and BasicDecimal64Vector;

Author: weisun123

test/com/xxdb/data/BasicDecimal32VectorTest.java

@@ -490,20 +490,20 @@ public void testBasicDecimal32Vector_toJsonString() throws IOException {
         BasicDecimal32Vector re1 = new BasicDecimal32Vector(tmp_string_v,4);
         String re = JSONObject.toJSONString(re1);
         System.out.println(re);
-        assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL32\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal32\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":4,\"string\":\"[0.0000,-123.0043,132.2042,100.0000]\",\"table\":false,\"unitLength\":4,\"values\":[0,-1230043,1322042,1000000],\"vector\":true}", re);
+        assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL32\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal32\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":4,\"string\":\"[0.0000,-123.0043,132.2042,100.0000]\",\"table\":false,\"unitLength\":4,\"unscaledValues\":[0,-1230043,1322042,1000000],\"vector\":true}", re);
     }
     @Test
     public void testBasicDecimal32Vector_toJsonString_null() throws IOException {
         BasicDecimal32Vector re1 = new BasicDecimal32Vector(2,2);
         String re = JSONObject.toJSONString(re1);
         System.out.println(re);
-        assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL32\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal32\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":2,\"string\":\"[0.00,0.00]\",\"table\":false,\"unitLength\":4,\"values\":[0,0],\"vector\":true}", re);
+        assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL32\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal32\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":2,\"string\":\"[0.00,0.00]\",\"table\":false,\"unitLength\":4,\"unscaledValues\":[0,0],\"vector\":true}", re);
     }
     @Test
     public void testBasicDecimal32Vector_getValue() throws IOException {
         String[] tmp_string_v = {"0.0","-123.00432","132.204234","100.0"};
         BasicDecimal32Vector re1 = new BasicDecimal32Vector(tmp_string_v,4);
-        int[] re = re1.getValues();
+        int[] re = re1.getUnscaledValues();
         System.out.println(Arrays.toString(re));
         assertEquals("[0, -1230043, 1322042, 1000000]",Arrays.toString(re));
     }

test/com/xxdb/data/BasicDecimal64VectorTest.java

@@ -442,20 +442,20 @@ public void testBasicDecimal64Vector_toJsonString() throws IOException {
         BasicDecimal64Vector re1 = new BasicDecimal64Vector(tmp_string_v,4);
         String re = JSONObject.toJSONString(re1);
         System.out.println(re);
-        assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL64\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal64\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":4,\"string\":\"[0.0000,-123.0043,132.2042,100.0000]\",\"table\":false,\"unitLength\":8,\"values\":[0,-1230043,1322042,1000000],\"vector\":true}", re);
+        assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL64\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal64\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":4,\"string\":\"[0.0000,-123.0043,132.2042,100.0000]\",\"table\":false,\"unitLength\":8,\"unscaledValues\":[0,-1230043,1322042,1000000],\"vector\":true}", re);
     }
     @Test
     public void testBasicDecimal64Vector_toJsonString_null() throws IOException {
         BasicDecimal64Vector re1 = new BasicDecimal64Vector(2,2);
         String re = JSONObject.toJSONString(re1);
         System.out.println(re);
-        assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL64\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal64\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":2,\"string\":\"[0.00,0.00]\",\"table\":false,\"unitLength\":8,\"values\":[0,0],\"vector\":true}", re);
+        assertEquals("{\"chart\":false,\"chunk\":false,\"dataCategory\":\"DENARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_DECIMAL64\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicDecimal64\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"scale\":2,\"string\":\"[0.00,0.00]\",\"table\":false,\"unitLength\":8,\"unscaledValues\":[0,0],\"vector\":true}", re);
     }
     @Test
     public void testBasicDecimal64Vector_getValue() throws IOException {
         String[] tmp_string_v = {"0.0","-123.00432","132.204234","100.0"};
         BasicDecimal64Vector re1 = new BasicDecimal64Vector(tmp_string_v,4);
-        long[] re = re1.getValues();
+        long[] re = re1.getUnscaledValues();
         System.out.println(Arrays.toString(re));
         assertEquals("[0, -1230043, 1322042, 1000000]",Arrays.toString(re));
     }

test/com/xxdb/data/BasicInt128Test.java

@@ -250,6 +250,6 @@ public void test_BasicInt128Vector_toJSONString(){
         BasicInt128Vector bi128v = new BasicInt128Vector(new Long2[]{new Long2(17L,6L),new Long2(29L,2L)});
         String re = JSONObject.toJSONString(bi128v);
         System.out.println(re);
-        assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[{\"high\":17,\"low\":6,\"null\":false},{\"high\":29,\"low\":2,\"null\":false}],\"dataCategory\":\"BINARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_INT128\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicInt128\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[00000000000000110000000000000006,000000000000001d0000000000000002]\",\"table\":false,\"unitLength\":16,\"values\":[{\"high\":17,\"low\":6,\"null\":false},{\"high\":29,\"low\":2,\"null\":false}],\"vector\":true}", re);
+        assertEquals("{\"chart\":false,\"chunk\":false,\"dataArray\":[{\"high\":17,\"low\":6,\"null\":false},{\"high\":29,\"low\":2,\"null\":false}],\"dataCategory\":\"BINARY\",\"dataForm\":\"DF_VECTOR\",\"dataType\":\"DT_INT128\",\"dictionary\":false,\"elementClass\":\"com.xxdb.data.BasicInt128\",\"jsonString\":\"[00000000000000110000000000000006,000000000000001d0000000000000002]\",\"matrix\":false,\"pair\":false,\"scalar\":false,\"string\":\"[00000000000000110000000000000006,000000000000001d0000000000000002]\",\"table\":false,\"unitLength\":16,\"values\":[{\"high\":17,\"low\":6,\"null\":false},{\"high\":29,\"low\":2,\"null\":false}],\"vector\":true}", re);
     }
 }