You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/08/20 13:14:39 UTC
[1/4] incubator-ignite git commit: ignite-1263 Fixed timestamp and
CLOB type detection. Closes #21.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-10606 53143f932 -> 3310db271
ignite-1263 Fixed timestamp and CLOB type detection. Closes #21.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e9a0d06f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e9a0d06f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e9a0d06f
Branch: refs/heads/ignite-gg-10606
Commit: e9a0d06ffa104c0e54e0e95b0af229f7648d22d1
Parents: 09da9c2
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Wed Aug 19 14:33:52 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Aug 19 14:33:52 2015 +0700
----------------------------------------------------------------------
.../ignite/schema/model/PojoDescriptor.java | 6 +-
.../parser/dialect/OracleMetadataDialect.java | 101 ++++++++++---------
2 files changed, 57 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e9a0d06f/modules/schema-import/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
index 5e1da06..5a4a1fa 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/model/PojoDescriptor.java
@@ -504,7 +504,11 @@ public class PojoDescriptor {
case TIMESTAMP:
return java.sql.Timestamp.class;
- // BINARY, VARBINARY, LONGVARBINARY, ARRAY, BLOB, CLOB, NCLOB, NULL, DATALINK
+ case CLOB:
+ case NCLOB:
+ return String.class;
+
+ // BINARY, VARBINARY, LONGVARBINARY, ARRAY, BLOB, NULL, DATALINK
// OTHER, JAVA_OBJECT, DISTINCT, STRUCT, REF, ROWID, SQLXML
default:
return Object.class;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e9a0d06f/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
index 860ff68..30dda5d 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
@@ -87,73 +87,76 @@ public class OracleMetadataDialect extends DatabaseMetadataDialect {
* @throws SQLException If failed to decode type.
*/
private int decodeType(ResultSet rs) throws SQLException {
- switch (rs.getString(DATA_TYPE_IDX)) {
- case "CHAR":
- case "NCHAR":
- return CHAR;
+ String type = rs.getString(DATA_TYPE_IDX);
- case "VARCHAR2":
- case "NVARCHAR2":
- return VARCHAR;
+ if (type.startsWith("TIMESTAMP"))
+ return TIMESTAMP;
+ else {
+ switch (type) {
+ case "CHAR":
+ case "NCHAR":
+ return CHAR;
- case "LONG":
- return LONGVARCHAR;
+ case "VARCHAR2":
+ case "NVARCHAR2":
+ return VARCHAR;
- case "LONG RAW":
- return LONGVARBINARY;
+ case "LONG":
+ return LONGVARCHAR;
- case "FLOAT":
- return FLOAT;
+ case "LONG RAW":
+ return LONGVARBINARY;
- case "NUMBER":
- int precision = rs.getInt(DATA_PRECISION_IDX);
- int scale = rs.getInt(DATA_SCALE_IDX);
+ case "FLOAT":
+ return FLOAT;
- if (scale > 0) {
- if (scale < 4 && precision < 19)
- return FLOAT;
+ case "NUMBER":
+ int precision = rs.getInt(DATA_PRECISION_IDX);
+ int scale = rs.getInt(DATA_SCALE_IDX);
- if (scale > 4 || precision > 19)
- return DOUBLE;
+ if (scale > 0) {
+ if (scale < 4 && precision < 19)
+ return FLOAT;
- return NUMERIC;
- }
- else {
- if (precision < 1)
- return INTEGER;
+ if (scale > 4 || precision > 19)
+ return DOUBLE;
- if (precision < 2)
- return BOOLEAN;
+ return NUMERIC;
+ }
+ else {
+ if (precision < 1)
+ return INTEGER;
- if (precision < 4)
- return TINYINT;
+ if (precision < 2)
+ return BOOLEAN;
- if (precision < 6)
- return SMALLINT;
+ if (precision < 4)
+ return TINYINT;
- if (precision < 11)
- return INTEGER;
+ if (precision < 6)
+ return SMALLINT;
- if (precision < 20)
- return BIGINT;
+ if (precision < 11)
+ return INTEGER;
- return NUMERIC;
- }
+ if (precision < 20)
+ return BIGINT;
- case "DATE":
- return DATE;
+ return NUMERIC;
+ }
- case "TIMESTAMP":
- return TIMESTAMP;
+ case "DATE":
+ return DATE;
- case "BFILE":
- case "BLOB":
- return BLOB;
+ case "BFILE":
+ case "BLOB":
+ return BLOB;
- case "CLOB":
- case "NCLOB":
- case "XMLTYPE":
- return CLOB;
+ case "CLOB":
+ case "NCLOB":
+ case "XMLTYPE":
+ return CLOB;
+ }
}
return OTHER;
[2/4] incubator-ignite git commit: Minor (log message fix)
Posted by sb...@apache.org.
Minor (log message fix)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e18147dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e18147dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e18147dd
Branch: refs/heads/ignite-gg-10606
Commit: e18147dd219d01c26e4cd969c31d2984f96d6f1a
Parents: e9a0d06
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Aug 19 16:36:23 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Aug 19 16:36:23 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e18147dd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 4f354ab..6c70eb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -4141,7 +4141,7 @@ class ServerImpl extends TcpDiscoveryImpl {
(hasRemoteSrvNodes = ring.hasRemoteServerNodes())) {
log.info("Local node seems to be disconnected from topology (failure detection timeout " +
- "is reached): [failureDetectionTimeout=" + spi.failureDetectionTimeout() +
+ "is reached) [failureDetectionTimeout=" + spi.failureDetectionTimeout() +
", connCheckFreq=" + connCheckFreq + ']');
failureThresholdReached = true;
[4/4] incubator-ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10606
Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10606
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3310db27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3310db27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3310db27
Branch: refs/heads/ignite-gg-10606
Commit: 3310db27136d036f715f6d6f62e52688246c7b7b
Parents: 53143f9 7a96a4b
Author: iveselovskiy <iv...@gridgain.com>
Authored: Thu Aug 20 12:40:17 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Thu Aug 20 12:40:17 2015 +0300
----------------------------------------------------------------------
.../internal/interop/InteropIgnition.java | 55 ----------
.../internal/interop/InteropProcessor.java | 12 ---
.../ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../ignite/schema/model/PojoDescriptor.java | 6 +-
.../parser/dialect/OracleMetadataDialect.java | 101 ++++++++++---------
5 files changed, 58 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-ignite git commit: Removed interop finalizer as this
was a bad design decision.
Posted by sb...@apache.org.
Removed interop finalizer as this was a bad design decision.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7a96a4be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7a96a4be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7a96a4be
Branch: refs/heads/ignite-gg-10606
Commit: 7a96a4be5220954514c323e33e4f64f6c6f68f9a
Parents: e18147d
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Aug 20 10:06:24 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Aug 20 10:06:24 2015 +0300
----------------------------------------------------------------------
.../internal/interop/InteropIgnition.java | 55 --------------------
.../internal/interop/InteropProcessor.java | 12 -----
2 files changed, 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a96a4be/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
index faae72b..35e9bc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropIgnition.java
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
-import java.lang.ref.*;
import java.net.*;
import java.security.*;
import java.util.*;
@@ -69,8 +68,6 @@ public class InteropIgnition {
InteropProcessor proc = bootstrap.start(cfg, envPtr, dataPtr);
- trackFinalization(proc);
-
InteropProcessor old = instances.put(gridName, proc);
assert old == null;
@@ -181,58 +178,6 @@ public class InteropIgnition {
}
/**
- * Track processor finalization.
- *
- * @param proc Processor.
- */
- private static void trackFinalization(InteropProcessor proc) {
- Thread thread = new Thread(new Finalizer(proc));
-
- thread.setDaemon(true);
-
- thread.start();
- }
-
- /**
- * Finalizer runnable.
- */
- private static class Finalizer implements Runnable {
- /** Queue where we expect notification to appear. */
- private final ReferenceQueue<InteropProcessor> queue;
-
- /** Phantom reference to processor. */
- private final PhantomReference<InteropProcessor> proc;
-
- /** Cleanup runnable. */
- private final Runnable cleanup;
-
- /**
- * Constructor.
- *
- * @param proc Processor.
- */
- public Finalizer(InteropProcessor proc) {
- queue = new ReferenceQueue<>();
-
- this.proc = new PhantomReference<>(proc, queue);
-
- cleanup = proc.cleanupCallback();
- }
-
- /** {@inheritDoc} */
- @Override public void run() {
- try {
- queue.remove(0);
-
- cleanup.run();
- }
- catch (InterruptedException ignore) {
- // No-op.
- }
- }
- }
-
- /**
* Private constructor.
*/
private InteropIgnition() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a96a4be/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
index 94b733f..2551047 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/interop/InteropProcessor.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.interop;
import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
/**
* Interop processor.
@@ -37,15 +36,4 @@ public interface InteropProcessor {
* @return Environment pointer.
*/
public long environmentPointer();
-
- /**
- * Get stop runnable to perform cleanup when interop is not longer used.
- * <p/>
- * <b>NOTE!</b> This runnable is called when current instance of interop processor is eligible for garbage
- * collection. Therefore you should <b>never</b> store any references to Ignite internal inside it. Otherwise
- * this runnable will never be called.
- *
- * @return Stop runnable. If {@code null} is returned, then no cleanup is expected.
- */
- @Nullable public Runnable cleanupCallback();
}