Skip to content

Commit

Permalink
serialize client session (#444)
Browse files Browse the repository at this point in the history
* serialize client session

* fix checkstyle

Co-authored-by: Harris.Chu <1726587+HarrisChu@users.noreply.github.com>
  • Loading branch information
Nicole00 and HarrisChu authored Mar 3, 2022
1 parent 36c6a23 commit e320716
Show file tree
Hide file tree
Showing 18 changed files with 84 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
package com.vesoft.nebula.client.graph;

import com.vesoft.nebula.client.graph.data.SSLParam;
import java.io.Serializable;

public class NebulaPoolConfig implements Serializable {

private static final long serialVersionUID = 3977910115039279651L;

public class NebulaPoolConfig {
// The min connections in pool for all addresses
private int minConnsSize = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@

import com.vesoft.nebula.client.graph.data.HostAddress;
import com.vesoft.nebula.client.graph.net.NebulaPool;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;

public class SessionsManagerConfig {
public class SessionsManagerConfig implements Serializable {

private static final long serialVersionUID = -2460063747630193912L;

// graphd addresses
private List<HostAddress> addresses = new ArrayList<>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

package com.vesoft.nebula.client.graph.data;

public abstract class BaseDataObject {
import java.io.Serializable;

public abstract class BaseDataObject implements Serializable {
private String decodeType = "utf-8";
private int timezoneOffset = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

package com.vesoft.nebula.client.graph.data;

public class HostAddress {
import java.io.Serializable;

public class HostAddress implements Serializable {
private final String host;
private final int port;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@

package com.vesoft.nebula.client.graph.data;

public abstract class SSLParam {
import java.io.Serializable;

public abstract class SSLParam implements Serializable {

private static final long serialVersionUID = 7410233298826490747L;

public enum SignMode {
NONE,
SELF_SIGNED,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@

package com.vesoft.nebula.client.graph.net;

public class AuthResult {
import java.io.Serializable;

public class AuthResult implements Serializable {

private static final long serialVersionUID = 8795815613377375650L;

private final long sessionId;
private final int timezoneOffset;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@
import com.vesoft.nebula.client.graph.data.HostAddress;
import com.vesoft.nebula.client.graph.exception.ClientServerIncompatibleException;
import com.vesoft.nebula.client.graph.exception.IOErrorException;
import java.io.Serializable;
import org.apache.commons.pool2.BasePooledObjectFactory;
import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.impl.DefaultPooledObject;

public class ConnObjectPool extends BasePooledObjectFactory<SyncConnection> {
public class ConnObjectPool extends BasePooledObjectFactory<SyncConnection>
implements Serializable {

private static final long serialVersionUID = 6101157301791971560L;

private final NebulaPoolConfig config;
private final LoadBalancer loadBalancer;
private static final int retryTime = 3;
Expand All @@ -32,7 +37,7 @@ public SyncConnection create() throws IOErrorException, ClientServerIncompatible
if (config.isEnableSsl()) {
if (config.getSslParam() == null) {
throw new IllegalArgumentException("SSL Param is required when enableSsl "
+ "is set to true");
+ "is set to true");
}
conn.open(address, config.getTimeout(), config.getSslParam());
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
import com.vesoft.nebula.client.graph.data.SSLParam;
import com.vesoft.nebula.client.graph.exception.ClientServerIncompatibleException;
import com.vesoft.nebula.client.graph.exception.IOErrorException;
import java.io.Serializable;

public abstract class Connection implements Serializable {

private static final long serialVersionUID = -8425216612015802331L;

public abstract class Connection {
protected HostAddress serverAddr = null;

public HostAddress getServerAddress() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.vesoft.nebula.client.graph.exception.IOErrorException;
import com.vesoft.nebula.client.graph.exception.InvalidConfigException;
import com.vesoft.nebula.client.graph.exception.NotValidConnectionException;
import java.io.Serializable;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
Expand All @@ -24,7 +25,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class NebulaPool {
public class NebulaPool implements Serializable {

private static final long serialVersionUID = 6226487268001127885L;

private GenericObjectPool<SyncConnection> objectPool = null;
private LoadBalancer loadBalancer;
private final Logger log = LoggerFactory.getLogger(this.getClass());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.vesoft.nebula.client.graph.data.ResultSet;
import com.vesoft.nebula.client.graph.exception.IOErrorException;
import com.vesoft.nebula.graph.ExecutionResponse;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand All @@ -38,7 +39,10 @@
* The user can directly read the data using the interface of ValueWrapper.
*/

public class Session {
public class Session implements Serializable {

private static final long serialVersionUID = -8855886967097862376L;

private final long sessionID;
private final int timezoneOffset;
private SyncConnection connection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@
import com.vesoft.nebula.client.graph.data.ResultSet;
import com.vesoft.nebula.client.graph.exception.IOErrorException;
import com.vesoft.nebula.client.graph.exception.InvalidSessionException;
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicBoolean;

public class SessionWrapper {
public class SessionWrapper implements Serializable {

private static final long serialVersionUID = -8128331485649098264L;

private final Session session;
private final AtomicBoolean available = new AtomicBoolean(true);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@
import com.vesoft.nebula.client.graph.exception.ClientServerIncompatibleException;
import com.vesoft.nebula.client.graph.exception.IOErrorException;
import com.vesoft.nebula.client.graph.exception.NotValidConnectionException;
import java.io.Serializable;
import java.net.UnknownHostException;
import java.util.BitSet;
import java.util.concurrent.CopyOnWriteArrayList;

public class SessionsManager {
public class SessionsManager implements Serializable {

private static final long serialVersionUID = 7519424097351713021L;

private final SessionsManagerConfig config;
private NebulaPool pool = null;
private final CopyOnWriteArrayList<SessionWrapper> sessionList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@
import com.vesoft.nebula.storage.ScanVertexRequest;
import com.vesoft.nebula.util.SslUtil;
import java.io.IOException;
import java.io.Serializable;
import java.net.InetAddress;
import javax.net.ssl.SSLSocketFactory;

public class GraphStorageConnection {
public class GraphStorageConnection implements Serializable {

private static final long serialVersionUID = -3631352515689239788L;

protected TTransport transport = null;
protected TProtocol protocol = null;
public HostAddress address;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
package com.vesoft.nebula.client.storage;

import com.vesoft.nebula.client.graph.data.HostAddress;
import java.io.Serializable;
import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class StorageConnPool {
public class StorageConnPool implements Serializable {

private static final Logger LOGGER = LoggerFactory.getLogger(StorageConnPool.class);
private static final long serialVersionUID = -6459633350295900558L;

private final GenericKeyedObjectPool<HostAddress, GraphStorageConnection> keyedPool;
private final StorageConnPoolFactory poolFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
package com.vesoft.nebula.client.storage;

import com.vesoft.nebula.client.graph.data.SSLParam;
import java.io.Serializable;

public class StoragePoolConfig implements Serializable {

private static final long serialVersionUID = 8022858741090966149L;

public class StoragePoolConfig {
// The min connections in pool for all addresses
private int minConnsSize = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@
package com.vesoft.nebula.client.storage.scan;

import com.vesoft.nebula.client.graph.data.HostAddress;
import java.io.Serializable;
import java.util.Set;

public class PartScanQueue {
public class PartScanQueue implements Serializable {

private static final long serialVersionUID = 4817985176727025002L;

private final Set<PartScanInfo> partScanInfoSet;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
import com.vesoft.nebula.client.storage.data.EdgeTableRow;
import com.vesoft.nebula.client.storage.data.ScanStatus;
import com.vesoft.nebula.client.storage.processor.EdgeProcessor;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class ScanEdgeResult {
public class ScanEdgeResult implements Serializable {
private static final Logger LOGGER = LoggerFactory.getLogger(ScanEdgeResult.class);
private static final long serialVersionUID = 519190254786197550L;

private final List<DataSet> dataSets;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@
import com.vesoft.nebula.client.storage.data.VertexRow;
import com.vesoft.nebula.client.storage.data.VertexTableRow;
import com.vesoft.nebula.client.storage.processor.VertexProcessor;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class ScanVertexResult {
public class ScanVertexResult implements Serializable {

private static final Logger LOGGER = LoggerFactory.getLogger(ScanVertexResult.class);
private static final long serialVersionUID = -2446261806893848521L;

private final List<DataSet> dataSets;

Expand Down

0 comments on commit e320716

Please sign in to comment.