Skip to content

Commit 9470d3f

Browse files
dl239dl239
authored
refactor: rename sdk package (#132)
* refact: rename package * fix: java compile error
1 parent 9b49d65 commit 9470d3f

28 files changed

+101
-101
lines changed

‎java/openmldb-batch/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<maven.compiler.target>1.8</maven.compiler.target>
5151
<!-- Set the default project version -->
5252
<default.project.version>0.1.5</default.project.version>
53-
<default.hybridse.sdk.version>0.1.5-pre-5</default.hybridse.sdk.version>
53+
<default.hybridse.sdk.version>0.1.5</default.hybridse.sdk.version>
5454
</properties>
5555

5656
<profiles>

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/common/LibraryLoader.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/common/LibraryLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.common;
17+
package com._4paradigm.openmldb.common;
1818

1919
import org.apache.commons.io.IOUtils;
2020
import org.slf4j.Logger;

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/jdbc/CallablePreparedStatement.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/jdbc/CallablePreparedStatement.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.jdbc;
17+
package com._4paradigm.openmldb.jdbc;
1818

19-
import com._4paradigm.hybridsql.fedb.SQLRouter;
20-
import com._4paradigm.hybridsql.fedb.Status;
21-
import com._4paradigm.hybridsql.fedb.sdk.QueryFuture;
19+
import com._4paradigm.openmldb.SQLRouter;
20+
import com._4paradigm.openmldb.Status;
21+
import com._4paradigm.openmldb.sdk.QueryFuture;
2222

2323
import java.sql.SQLException;
2424
import java.util.ArrayList;
2525
import java.util.concurrent.TimeUnit;
2626

2727
public class CallablePreparedStatement extends RequestPreparedStatement {
2828
protected String spName;
29-
private com._4paradigm.hybridsql.fedb.ProcedureInfo procedureInfo;
29+
private com._4paradigm.openmldb.ProcedureInfo procedureInfo;
3030

3131
public CallablePreparedStatement(String db, String spName, SQLRouter router) throws SQLException {
3232
if (db == null) throw new SQLException("db is null");

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/jdbc/RequestPreparedStatement.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/jdbc/RequestPreparedStatement.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.jdbc;
17+
package com._4paradigm.openmldb.jdbc;
1818

19-
import com._4paradigm.hybridsql.fedb.*;
19+
import com._4paradigm.openmldb.*;
2020

2121
import java.io.InputStream;
2222
import java.io.Reader;
@@ -96,7 +96,7 @@ public SQLResultSet executeQuery() throws SQLException {
9696
checkClosed();
9797
dataBuild();
9898
Status status = new Status();
99-
com._4paradigm.hybridsql.fedb.ResultSet resultSet = router.ExecuteSQL(db, currentSql, currentRow, status);
99+
com._4paradigm.openmldb.ResultSet resultSet = router.ExecuteSQL(db, currentSql, currentRow, status);
100100
if (resultSet == null || status.getCode() != 0) {
101101
String msg = status.getMsg();
102102
status.delete();

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/jdbc/SQLConnection.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/jdbc/SQLConnection.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.jdbc;
17+
package com._4paradigm.openmldb.jdbc;
1818

1919
import java.sql.*;
2020
import java.util.Map;

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/jdbc/SQLDriver.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/jdbc/SQLDriver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.jdbc;
17+
package com._4paradigm.openmldb.jdbc;
1818

1919
import java.sql.*;
2020
import java.util.Properties;

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/jdbc/SQLInsertMetaData.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/jdbc/SQLInsertMetaData.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.jdbc;
17+
package com._4paradigm.openmldb.jdbc;
1818

19-
import com._4paradigm.hybridsql.fedb.DataType;
20-
import com._4paradigm.hybridsql.fedb.Schema;
19+
import com._4paradigm.openmldb.DataType;
20+
import com._4paradigm.openmldb.Schema;
2121

2222
import java.sql.ResultSetMetaData;
2323
import java.sql.SQLException;

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/jdbc/SQLResultSet.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/jdbc/SQLResultSet.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.jdbc;
17+
package com._4paradigm.openmldb.jdbc;
1818

19-
import com._4paradigm.hybridsql.fedb.DataType;
20-
import com._4paradigm.hybridsql.fedb.QueryFuture;
21-
import com._4paradigm.hybridsql.fedb.Schema;
19+
import com._4paradigm.openmldb.DataType;
20+
import com._4paradigm.openmldb.QueryFuture;
21+
import com._4paradigm.openmldb.Schema;
2222

2323
import java.io.InputStream;
2424
import java.io.Reader;
@@ -29,20 +29,20 @@
2929
import java.util.Map;
3030

3131
public class SQLResultSet implements ResultSet {
32-
private com._4paradigm.hybridsql.fedb.ResultSet resultSet;
32+
private com._4paradigm.openmldb.ResultSet resultSet;
3333
private boolean closed = false;
3434
private int rowNum = 0;
3535
private QueryFuture queryFuture;
3636
private Schema schema;
3737

38-
public SQLResultSet(com._4paradigm.hybridsql.fedb.ResultSet resultSet) {
38+
public SQLResultSet(com._4paradigm.openmldb.ResultSet resultSet) {
3939
this.resultSet = resultSet;
4040
if (resultSet != null) {
4141
this.schema = resultSet.GetSchema();
4242
}
4343
}
4444

45-
public SQLResultSet(com._4paradigm.hybridsql.fedb.ResultSet resultSet, QueryFuture future) {
45+
public SQLResultSet(com._4paradigm.openmldb.ResultSet resultSet, QueryFuture future) {
4646
this.resultSet = resultSet;
4747
this.queryFuture = future;
4848
if (resultSet != null) {
@@ -208,7 +208,7 @@ public Date getDate(int i) throws SQLException {
208208
if (this.resultSet.IsNULL(i - 1)) {
209209
return null;
210210
}
211-
com._4paradigm.hybridsql.fedb.Date date = this.resultSet.GetStructDateUnsafe(i - 1);
211+
com._4paradigm.openmldb.Date date = this.resultSet.GetStructDateUnsafe(i - 1);
212212
return new Date(date.getYear() - 1900, date.getMonth() - 1, date.getDay());
213213
}
214214

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/jdbc/SQLResultSetMetaData.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/jdbc/SQLResultSetMetaData.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.jdbc;
17+
package com._4paradigm.openmldb.jdbc;
1818

19-
import com._4paradigm.hybridsql.fedb.DataType;
20-
import com._4paradigm.hybridsql.fedb.Schema;
19+
import com._4paradigm.openmldb.DataType;
20+
import com._4paradigm.openmldb.Schema;
2121

2222
import java.sql.ResultSetMetaData;
2323
import java.sql.SQLException;

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/sdk/Column.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/Column.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.sdk;
17+
package com._4paradigm.openmldb.sdk;
1818

1919
public class Column {
2020
private String columnName;

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/sdk/Common.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/Common.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.sdk;
17+
package com._4paradigm.openmldb.sdk;
1818

19-
import com._4paradigm.hybridsql.fedb.DataType;
20-
import com._4paradigm.hybridsql.fedb.Schema;
19+
import com._4paradigm.openmldb.DataType;
2120

2221
import java.sql.SQLException;
2322
import java.sql.Types;
@@ -49,7 +48,7 @@ public static int type2SqlType(DataType dataType) throws SQLException {
4948
}
5049
}
5150

52-
public static com._4paradigm.hybridsql.fedb.sdk.Schema convertSchema(Schema schema) throws SQLException {
51+
public static com._4paradigm.openmldb.sdk.Schema convertSchema(com._4paradigm.openmldb.Schema schema) throws SQLException {
5352
if (schema == null || schema.GetColumnCnt() == 0) {
5453
throw new SQLException("schema is null or empty");
5554
}
@@ -62,6 +61,6 @@ public static com._4paradigm.hybridsql.fedb.sdk.Schema convertSchema(Schema sche
6261
column.setConstant(schema.IsConstant(i));
6362
columnList.add(column);
6463
}
65-
return new com._4paradigm.hybridsql.fedb.sdk.Schema(columnList);
64+
return new com._4paradigm.openmldb.sdk.Schema(columnList);
6665
}
6766
}

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/sdk/ProcedureInfo.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/ProcedureInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.sdk;
17+
package com._4paradigm.openmldb.sdk;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/sdk/QueryFuture.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/QueryFuture.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.sdk;
17+
package com._4paradigm.openmldb.sdk;
1818

19-
import com._4paradigm.hybridsql.fedb.Status;
20-
import com._4paradigm.hybridsql.fedb.jdbc.SQLResultSet;
19+
import com._4paradigm.openmldb.Status;
20+
import com._4paradigm.openmldb.jdbc.SQLResultSet;
2121
import org.slf4j.Logger;
2222
import org.slf4j.LoggerFactory;
2323

@@ -28,9 +28,9 @@
2828

2929
public class QueryFuture implements Future<java.sql.ResultSet>{
3030
private static final Logger logger = LoggerFactory.getLogger(QueryFuture.class);
31-
com._4paradigm.hybridsql.fedb.QueryFuture queryFuture;
31+
com._4paradigm.openmldb.QueryFuture queryFuture;
3232

33-
public QueryFuture(com._4paradigm.hybridsql.fedb.QueryFuture queryFuture) {
33+
public QueryFuture(com._4paradigm.openmldb.QueryFuture queryFuture) {
3434
this.queryFuture = queryFuture;
3535
}
3636

@@ -54,7 +54,7 @@ public boolean isDone() {
5454
@Override
5555
public java.sql.ResultSet get() throws InterruptedException, ExecutionException {
5656
Status status = new Status();
57-
com._4paradigm.hybridsql.fedb.ResultSet resultSet = queryFuture.GetResultSet(status);
57+
com._4paradigm.openmldb.ResultSet resultSet = queryFuture.GetResultSet(status);
5858
if (status.getCode() != 0 || resultSet == null) {
5959
String msg = status.getMsg();
6060
status.delete();

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/sdk/Schema.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/Schema.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.sdk;
17+
package com._4paradigm.openmldb.sdk;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/sdk/SdkOption.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/SdkOption.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.sdk;
17+
package com._4paradigm.openmldb.sdk;
1818

1919
public class SdkOption {
2020
private String zkCluster;

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/sdk/SqlException.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/SqlException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.sdk;
17+
package com._4paradigm.openmldb.sdk;
1818

1919
public class SqlException extends Exception {
2020
public SqlException(String message) {

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/sdk/SqlExecutor.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/SqlExecutor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.sdk;
17+
package com._4paradigm.openmldb.sdk;
1818

19-
import com._4paradigm.hybridsql.fedb.*;
20-
import com._4paradigm.hybridsql.fedb.jdbc.CallablePreparedStatement;
19+
import com._4paradigm.openmldb.*;
20+
import com._4paradigm.openmldb.jdbc.CallablePreparedStatement;
2121
import java.sql.PreparedStatement;
2222
import java.sql.SQLException;
2323
import java.util.List;

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/sdk/impl/BatchCallablePreparedStatementImpl.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/impl/BatchCallablePreparedStatementImpl.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.sdk.impl;
17+
package com._4paradigm.openmldb.sdk.impl;
1818

19-
import com._4paradigm.hybridsql.fedb.*;
19+
import com._4paradigm.openmldb.*;
2020

21-
import com._4paradigm.hybridsql.fedb.jdbc.CallablePreparedStatement;
22-
import com._4paradigm.hybridsql.fedb.jdbc.SQLResultSet;
21+
import com._4paradigm.openmldb.jdbc.CallablePreparedStatement;
22+
import com._4paradigm.openmldb.jdbc.SQLResultSet;
23+
import com._4paradigm.openmldb.sdk.QueryFuture;
2324

2425
import java.sql.SQLException;
2526
import java.util.concurrent.TimeUnit;
@@ -43,7 +44,7 @@ public BatchCallablePreparedStatementImpl(String db, String spName, SQLRouter ro
4344
public SQLResultSet executeQuery() throws SQLException {
4445
checkClosed();
4546
Status status = new Status();
46-
com._4paradigm.hybridsql.fedb.ResultSet resultSet = router.ExecuteSQLBatchRequest(
47+
com._4paradigm.openmldb.ResultSet resultSet = router.ExecuteSQLBatchRequest(
4748
db, currentSql, currentRowBatch, status);
4849
if (status.getCode() != 0 || resultSet == null) {
4950
String msg = status.getMsg();
@@ -62,10 +63,10 @@ public SQLResultSet executeQuery() throws SQLException {
6263
}
6364

6465
@Override
65-
public com._4paradigm.hybridsql.fedb.sdk.QueryFuture executeQueryAsync(long timeOut, TimeUnit unit) throws SQLException {
66+
public QueryFuture executeQueryAsync(long timeOut, TimeUnit unit) throws SQLException {
6667
checkClosed();
6768
Status status = new Status();
68-
QueryFuture queryFuture = router.CallSQLBatchRequestProcedure(db, spName, unit.toMillis(timeOut), currentRowBatch, status);
69+
com._4paradigm.openmldb.QueryFuture queryFuture = router.CallSQLBatchRequestProcedure(db, spName, unit.toMillis(timeOut), currentRowBatch, status);
6970
if (status.getCode() != 0 || queryFuture == null) {
7071
String msg = status.getMsg();
7172
status.delete();
@@ -75,7 +76,7 @@ public com._4paradigm.hybridsql.fedb.sdk.QueryFuture executeQueryAsync(long time
7576
throw new SQLException("call procedure fail, msg: " + msg);
7677
}
7778
status.delete();
78-
return new com._4paradigm.hybridsql.fedb.sdk.QueryFuture(queryFuture);
79+
return new QueryFuture(queryFuture);
7980
}
8081

8182
@Override

‎java/openmldb-jdbc/src/main/java/com/_4paradigm/hybridsql/fedb/sdk/impl/BatchRequestPreparedStatementImpl.java ‎java/openmldb-jdbc/src/main/java/com/_4paradigm/openmldb/sdk/impl/BatchRequestPreparedStatementImpl.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com._4paradigm.hybridsql.fedb.sdk.impl;
17+
package com._4paradigm.openmldb.sdk.impl;
1818

19-
import com._4paradigm.hybridsql.fedb.ColumnIndicesSet;
20-
import com._4paradigm.hybridsql.fedb.SQLRequestRowBatch;
21-
import com._4paradigm.hybridsql.fedb.SQLRouter;
22-
import com._4paradigm.hybridsql.fedb.Status;
23-
import com._4paradigm.hybridsql.fedb.jdbc.SQLResultSet;
19+
import com._4paradigm.openmldb.ColumnIndicesSet;
20+
import com._4paradigm.openmldb.SQLRequestRowBatch;
21+
import com._4paradigm.openmldb.SQLRouter;
22+
import com._4paradigm.openmldb.Status;
23+
import com._4paradigm.openmldb.jdbc.SQLResultSet;
2424
import org.slf4j.Logger;
2525
import org.slf4j.LoggerFactory;
2626

@@ -51,7 +51,7 @@ public BatchRequestPreparedStatementImpl(String db, String sql,
5151
public SQLResultSet executeQuery() throws SQLException {
5252
checkClosed();
5353
Status status = new Status();
54-
com._4paradigm.hybridsql.fedb.ResultSet resultSet = router.ExecuteSQLBatchRequest(
54+
com._4paradigm.openmldb.ResultSet resultSet = router.ExecuteSQLBatchRequest(
5555
db, currentSql, currentRowBatch, status);
5656
if (resultSet == null || status.getCode() != 0) {
5757
String msg = status.getMsg();

0 commit comments

Comments
 (0)