Skip to content

Commit e119c06

Browse files
author
chengyitian
committed
Merge branch 'dev' of dolphindb.net:dolphindb/api-java
2 parents 6b62517 + 424ab40 commit e119c06

File tree

7 files changed

+163
-55
lines changed

7 files changed

+163
-55
lines changed

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.dolphindb</groupId>
44
<artifactId>dolphindb-javaapi</artifactId>
5-
<version>3.00.2.0</version>
5+
<version>3.00.2.1</version>
66
<packaging>jar</packaging>
77

88
<properties>
9-
<dolphindb.version>3.00.2.0</dolphindb.version>
9+
<dolphindb.version>3.00.2.1</dolphindb.version>
1010
</properties>
1111
<name>DolphinDB Java API</name>
1212
<description>The messaging and data conversion protocol between Java and DolphinDB server</description>
@@ -31,7 +31,7 @@
3131
<connection>scm:git:git@github.com:dolphindb/api-java.git</connection>
3232
<developerConnection>scm:git:git@github.com:dolphindb/api-java.git</developerConnection>
3333
<url>git@github.com:dolphindb/api-java.git</url>
34-
<tag>api-java-3.00.2.0</tag>
34+
<tag>api-java-3.00.2.1</tag>
3535
</scm>
3636
<dependencies>
3737
<dependency>

‎src/com/xxdb/data/BasicIotAnyVector.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ public Entity get(int index) {
7777
BasicInt curDataType = (BasicInt) indexsDataType.get(index);
7878
BasicInt curIndex = (BasicInt) indexs.get(index);
7979

80-
return ((Vector) subVector.get(curDataType.getInt())).get(curIndex.getInt());
80+
if (curDataType.getInt() == 0)
81+
return new Void();
82+
else
83+
return ((Vector) subVector.get(curDataType.getInt())).get(curIndex.getInt());
8184
}
8285

8386
public String getString(int index) {

‎src/com/xxdb/data/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
public class Utils {
1717

18-
public static final String JAVA_API_VERSION = "3.00.2.0";
18+
public static final String JAVA_API_VERSION = "3.00.2.1";
1919

2020
public static final int DISPLAY_ROWS = 20;
2121
public static final int DISPLAY_COLS = 100;

‎test/com/xxdb/ConnectionPoolTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2294,7 +2294,7 @@ public void test_PartitionedTableAppender_allDataType_array_null() throws Except
22942294
@Test
22952295
public void Test_PartitionedTableAppender_iotAnyVector() throws Exception {
22962296
String script = "if(existsDatabase(\"dfs://testIOT_allDateType\")) dropDatabase(\"dfs://testIOT_allDateType\")\n" +
2297-
" create database \"dfs://testIOT_allDateType\" partitioned by VALUE(1..20),RANGE(2020.01.01 2022.01.01 2025.01.01), engine='TSDB'\n" +
2297+
" create database \"dfs://testIOT_allDateType\" partitioned by VALUE(1..20),RANGE(2020.01.01 2022.01.01 2025.01.01), engine='IOTDB'\n" +
22982298
" create table \"dfs://testIOT_allDateType\".\"pt\"(\n" +
22992299
" deviceId INT,\n" +
23002300
" timestamp TIMESTAMP,\n" +
@@ -2337,7 +2337,7 @@ public void Test_PartitionedTableAppender_iotAnyVector() throws Exception {
23372337
@Test
23382338
public void Test_PartitionedTableAppender_iotAnyVector_compress_true() throws Exception {
23392339
String script = "if(existsDatabase(\"dfs://testIOT_allDateType\")) dropDatabase(\"dfs://testIOT_allDateType\")\n" +
2340-
" create database \"dfs://testIOT_allDateType\" partitioned by VALUE(1..20),RANGE(2020.01.01 2022.01.01 2025.01.01), engine='TSDB'\n" +
2340+
" create database \"dfs://testIOT_allDateType\" partitioned by VALUE(1..20),RANGE(2020.01.01 2022.01.01 2025.01.01), engine='IOTDB'\n" +
23412341
" create table \"dfs://testIOT_allDateType\".\"pt\"(\n" +
23422342
" deviceId INT,\n" +
23432343
" timestamp TIMESTAMP,\n" +
@@ -2379,7 +2379,7 @@ public void Test_PartitionedTableAppender_iotAnyVector_compress_true() throws Ex
23792379
@Test
23802380
public void Test_PartitionedTableAppender_iotAnyVector_null() throws Exception {
23812381
String script = "if(existsDatabase(\"dfs://testIOT_allDateType\")) dropDatabase(\"dfs://testIOT_allDateType\")\n" +
2382-
" create database \"dfs://testIOT_allDateType\" partitioned by VALUE(1..20),RANGE(2020.01.01 2022.01.01 2025.01.01), engine='TSDB'\n" +
2382+
" create database \"dfs://testIOT_allDateType\" partitioned by VALUE(1..20),RANGE(2020.01.01 2022.01.01 2025.01.01), engine='IOTDB'\n" +
23832383
" create table \"dfs://testIOT_allDateType\".\"pt\"(\n" +
23842384
" deviceId INT,\n" +
23852385
" timestamp TIMESTAMP,\n" +
@@ -2434,7 +2434,7 @@ public void Test_PartitionedTableAppender_iotAnyVector_null() throws Exception {
24342434
@Test
24352435
public void Test_PartitionedTableAppender_iotAnyVector_null_compress_true() throws Exception {
24362436
String script = "if(existsDatabase(\"dfs://testIOT_allDateType\")) dropDatabase(\"dfs://testIOT_allDateType\")\n" +
2437-
" create database \"dfs://testIOT_allDateType\" partitioned by VALUE(1..20),RANGE(2020.01.01 2022.01.01 2025.01.01), engine='TSDB'\n" +
2437+
" create database \"dfs://testIOT_allDateType\" partitioned by VALUE(1..20),RANGE(2020.01.01 2022.01.01 2025.01.01), engine='IOTDB'\n" +
24382438
" create table \"dfs://testIOT_allDateType\".\"pt\"(\n" +
24392439
" deviceId INT,\n" +
24402440
" timestamp TIMESTAMP,\n" +
@@ -2488,7 +2488,7 @@ public void Test_PartitionedTableAppender_iotAnyVector_null_compress_true() thro
24882488
@Test
24892489
public void Test_PartitionedTableAppender_iotAnyVector_big_data() throws Exception {
24902490
String script = "if(existsDatabase(\"dfs://testIOT_allDateType1\")) dropDatabase(\"dfs://testIOT_allDateType1\")\n" +
2491-
" create database \"dfs://testIOT_allDateType1\" partitioned by RANGE(100000*(0..10)),RANGE(2020.01.01 2022.01.01 2025.01.01), engine='TSDB'\n" +
2491+
" create database \"dfs://testIOT_allDateType1\" partitioned by RANGE(100000*(0..10)),RANGE(2020.01.01 2022.01.01 2025.01.01), engine='IOTDB'\n" +
24922492
" create table \"dfs://testIOT_allDateType1\".\"pt\"(\n" +
24932493
" deviceId INT,\n" +
24942494
" timestamp TIMESTAMP,\n" +

0 commit comments

Comments
 (0)