You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by gv...@apache.org on 2020/09/14 11:09:50 UTC
[ignite] 02/02: fix merge conflicts
This is an automated email from the ASF dual-hosted git repository.
gvvinblade pushed a commit to branch ignite-12248
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 25e754c2d51e03aafc063755b6cf44d097e9d7f3
Author: Igor Seliverstov <gv...@gmail.com>
AuthorDate: Mon Sep 14 14:09:18 2020 +0300
fix merge conflicts
---
modules/calcite/pom.xml | 2 +-
.../org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 10 ++++++----
.../internal/processors/odbc/jdbc/JdbcConnectionContext.java | 7 ++++---
.../ignite/internal/processors/query/h2/SchemaManager.java | 8 +++++++-
.../ignite/internal/processors/query/h2/opt/GridH2Table.java | 7 ++++---
5 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml
index 469a1d8..d5eabe9 100644
--- a/modules/calcite/pom.xml
+++ b/modules/calcite/pom.xml
@@ -41,7 +41,7 @@
</parent>
<artifactId>ignite-calcite</artifactId>
- <version>2.9.0-SNAPSHOT</version>
+ <version>2.10.0-SNAPSHOT</version>
<url>http://ignite.apache.org</url>
<dependencies>
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
index fc44067..e70bbf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
@@ -30,7 +30,9 @@ import java.util.Objects;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
+
import javax.cache.configuration.Factory;
+
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cache.query.QueryCancelledException;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -97,11 +99,11 @@ public class JdbcThinTcpIo {
/** Version 2.9.0. Adds user attributes support. Adds features flags support. */
private static final ClientListenerProtocolVersion VER_2_9_0 = ClientListenerProtocolVersion.create(2, 9, 0);
- /** Version 2.9.0. */
- private static final ClientListenerProtocolVersion VER_2_9_0 = ClientListenerProtocolVersion.create(2, 9, 0);
+ /** Version 2.10.0. */
+ private static final ClientListenerProtocolVersion VER_2_10_0 = ClientListenerProtocolVersion.create(2, 10, 0);
/** Current version. */
- private static final ClientListenerProtocolVersion CURRENT_VER = VER_2_9_0;
+ private static final ClientListenerProtocolVersion CURRENT_VER = VER_2_10_0;
/** Initial output stream capacity for handshake. */
private static final int HANDSHAKE_MSG_SIZE = 13;
@@ -313,7 +315,7 @@ public class JdbcThinTcpIo {
writer.writeByteArray(ThinProtocolFeature.featuresAsBytes(enabledFeatures()));
}
- if (ver.compareTo(VER_2_9_0) >= 0)
+ if (ver.compareTo(VER_2_10_0) >= 0)
writer.writeBoolean(connProps.isUseExperimentalQueryEngine());
if (!F.isEmpty(connProps.getUsername())) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
index afa842d..02d0bcf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
@@ -21,6 +21,7 @@ import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
+
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.GridKernalContext;
@@ -69,10 +70,10 @@ public class JdbcConnectionContext extends ClientListenerAbstractConnectionConte
static final ClientListenerProtocolVersion VER_2_9_0 = ClientListenerProtocolVersion.create(2, 9, 0);
/** Version 2.9.0: adds experimental query engine support */
- static final ClientListenerProtocolVersion VER_2_9_0 = ClientListenerProtocolVersion.create(2, 9, 0);
+ static final ClientListenerProtocolVersion VER_2_10_0 = ClientListenerProtocolVersion.create(2, 10, 0);
/** Current version. */
- public static final ClientListenerProtocolVersion CURRENT_VER = VER_2_9_0;
+ public static final ClientListenerProtocolVersion CURRENT_VER = VER_2_10_0;
/** Supported versions. */
private static final Set<ClientListenerProtocolVersion> SUPPORTED_VERS = new HashSet<>();
@@ -193,7 +194,7 @@ public class JdbcConnectionContext extends ClientListenerAbstractConnectionConte
features = JdbcThinFeature.enumSet(cliFeatures);
}
- if (ver.compareTo(VER_2_9_0) >= 0)
+ if (ver.compareTo(VER_2_10_0) >= 0)
useExperimentalQueryEngine = reader.readBoolean();
if (ver.compareTo(VER_2_5_0) >= 0) {
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java
index 2b124aa..03a98a6 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/SchemaManager.java
@@ -31,6 +31,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
@@ -54,6 +55,7 @@ import org.apache.ignite.internal.processors.query.QueryField;
import org.apache.ignite.internal.processors.query.QueryIndexDescriptorImpl;
import org.apache.ignite.internal.processors.query.QueryUtils;
import org.apache.ignite.internal.processors.query.h2.opt.GridH2IndexBase;
+import org.apache.ignite.internal.processors.query.h2.opt.GridH2ProxyIndex;
import org.apache.ignite.internal.processors.query.h2.opt.GridH2RowDescriptor;
import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
import org.apache.ignite.internal.processors.query.h2.opt.H2Row;
@@ -554,7 +556,11 @@ public class SchemaManager {
GridH2Table h2Tbl = H2TableEngine.createTable(conn.connection(), sql, rowDesc, tbl);
- GridIndex<H2Row> pk = (GridIndex<H2Row>)h2Tbl.getUniqueIndex();
+ Index uniqueIndex = h2Tbl.getUniqueIndex();
+ if (uniqueIndex instanceof GridH2ProxyIndex)
+ uniqueIndex = ((GridH2ProxyIndex) uniqueIndex).underlyingIndex();
+
+ GridIndex<H2Row> pk = (GridIndex<H2Row>)uniqueIndex;
lsnr.onSqlTypeCreate(schemaName, tbl.type(), tbl.cacheInfo(), pk);
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
index a6a3e16..3805197 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java
@@ -31,6 +31,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteInterruptedException;
@@ -698,7 +699,7 @@ public class GridH2Table extends TableBase {
for (int i = 1, len = idxs.size(); i < len; i++)
if (idxs.get(i) instanceof GridH2IndexBase)
- index(i).destroy(rmIndex);
+ ((GridH2IndexBase)index(i)).destroy(rmIndex);
}
finally {
unlock(true);
@@ -720,8 +721,8 @@ public class GridH2Table extends TableBase {
* @param idx Index in list.
* @return Index.
*/
- private GridH2IndexBase index(int idx) {
- return (GridH2IndexBase)idxs.get(idx);
+ private <T extends Index> T index(int idx) {
+ return (T)idxs.get(idx);
}
/**