You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/06/06 16:17:08 UTC

ignite git commit: IGNITE-5406 WIP.

Repository: ignite
Updated Branches:
  refs/heads/ignite-5406 [created] ce0f52949


IGNITE-5406 WIP.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce0f5294
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce0f5294
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce0f5294

Branch: refs/heads/ignite-5406
Commit: ce0f529499a6337d58ac0d75fc3a8f7958cf5706
Parents: 808ad9f
Author: Alexey Kuznetsov <ak...@gridgain.com>
Authored: Tue Jun 6 23:16:58 2017 +0700
Committer: Alexey Kuznetsov <ak...@gridgain.com>
Committed: Tue Jun 6 23:16:58 2017 +0700

----------------------------------------------------------------------
 .../SqlConnectorConfiguration.java              |   2 +-
 .../visor/node/VisorOdbcConfiguration.java      |   1 +
 .../node/VisorSqlConnectorConfiguration.java    | 166 +++++++++++++++++++
 3 files changed, 168 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ce0f5294/modules/core/src/main/java/org/apache/ignite/configuration/SqlConnectorConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/SqlConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/SqlConnectorConfiguration.java
index 15563c8..9921974 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/SqlConnectorConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/SqlConnectorConfiguration.java
@@ -48,7 +48,7 @@ public class SqlConnectorConfiguration {
     /** Port. */
     private int port = DFLT_PORT;
 
-    /** Poart range. */
+    /** Port range. */
     private int portRange = DFLT_PORT_RANGE;
 
     /** Socket send buffer size. */

http://git-wip-us.apache.org/repos/asf/ignite/blob/ce0f5294/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorOdbcConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorOdbcConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorOdbcConfiguration.java
index e29376b..4909c7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorOdbcConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorOdbcConfiguration.java
@@ -28,6 +28,7 @@ import org.apache.ignite.internal.visor.VisorDataTransferObject;
 /**
  * Data transfer object for configuration of ODBC data structures.
  */
+@Deprecated
 public class VisorOdbcConfiguration extends VisorDataTransferObject {
     /** */
     private static final long serialVersionUID = 0L;

http://git-wip-us.apache.org/repos/asf/ignite/blob/ce0f5294/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSqlConnectorConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSqlConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSqlConnectorConfiguration.java
new file mode 100644
index 0000000..ccde415
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSqlConnectorConfiguration.java
@@ -0,0 +1,166 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.visor.node;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.configuration.SqlConnectorConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorDataTransferObject;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Data transfer object for SQL connector configuration.
+ */
+public class VisorSqlConnectorConfiguration extends VisorDataTransferObject {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Host. */
+    private String host;
+
+    /** Port. */
+    private int port;
+
+    /** Port range. */
+    private int portRange;
+
+    /** Max number of opened cursors per connection. */
+    private int maxOpenCursorsPerConn;
+
+    /** Socket send buffer size. */
+    private int sockSndBufSize;
+
+    /** Socket receive buffer size. */
+    private int sockRcvBufSize;
+
+    /** TCP no delay. */
+    private boolean tcpNoDelay;
+
+    /** Thread pool size. */
+    private int threadPoolSize ;
+
+    /**
+     * Default constructor.
+     */
+    public VisorSqlConnectorConfiguration() {
+        // No-op.
+    }
+
+    /**
+     * Create data transfer object for Sql connector configuration.
+     *
+     * @param cfg Sql connector configuration.
+     */
+    public VisorSqlConnectorConfiguration(SqlConnectorConfiguration cfg) {
+        host = cfg.getHost();
+        port = cfg.getPort();
+        portRange = cfg.getPortRange();
+        maxOpenCursorsPerConn = cfg.getMaxOpenCursorsPerConnection();
+        sockSndBufSize = cfg.getSocketSendBufferSize();
+        sockRcvBufSize = cfg.getSocketReceiveBufferSize();
+        tcpNoDelay = cfg.isTcpNoDelay();
+        threadPoolSize = cfg.getThreadPoolSize();
+    }
+
+    /**
+     * @return Host.
+     */
+    @Nullable public String getHost() {
+        return host;
+    }
+
+    /**
+     * @return Port.
+     */
+    public int getPort() {
+        return port;
+    }
+
+    /**
+     * @return Port range.
+     */
+    public int getPortRange() {
+        return portRange;
+    }
+
+    /**
+     * @return Maximum number of opened cursors.
+     */
+    public int getMaxOpenCursorsPerConnection() {
+        return maxOpenCursorsPerConn;
+    }
+
+    /**
+     * @return Socket send buffer size in bytes.
+     */
+    public int getSocketSendBufferSize() {
+        return sockSndBufSize;
+    }
+
+    /**
+     * @return Socket receive buffer size in bytes.
+     */
+    public int getSocketReceiveBufferSize() {
+        return sockRcvBufSize;
+    }
+
+    /**
+     * @return TCP NO_DELAY flag.
+     */
+    public boolean isTcpNoDelay() {
+        return tcpNoDelay;
+    }
+    /**
+     * @return Thread pool that is in charge of processing SQL requests.
+     */
+    public int getThreadPoolSize() {
+        return threadPoolSize;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void writeExternalData(ObjectOutput out) throws IOException {
+        U.writeString(out, host);
+        out.writeInt(port);
+        out.writeInt(portRange);
+        out.writeInt(maxOpenCursorsPerConn);
+        out.writeInt(sockSndBufSize);
+        out.writeInt(sockRcvBufSize );
+        out.writeBoolean(tcpNoDelay);
+        out.writeInt(threadPoolSize);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+        host = U.readString(in);
+        port = in.readInt();
+        portRange = in.readInt();
+        maxOpenCursorsPerConn = in.readInt();
+        sockSndBufSize = in.readInt();
+        sockRcvBufSize = in.readInt();
+        tcpNoDelay = in.readBoolean();
+        threadPoolSize = in.readInt();
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(VisorSqlConnectorConfiguration.class, this);
+    }
+}