GG-20579-1

bin/control.bat

@@ -156,6 +156,11 @@ if %ERRORLEVEL% equ 0 (
     if "%JVM_OPTS%" == "" set JVM_OPTS=-Xms256m -Xmx1g
 )
 
+::
+:: Uncomment to enable experimental commands [--wal]
+::
+:: set JVM_OPTS=%JVM_OPTS% -DIGNITE_ENABLE_EXPERIMENTAL_COMMAND=true
+
 ::
 :: Uncomment the following GC settings if you see spikes in your throughput due to Garbage Collection.
 ::

modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java

@@ -178,6 +178,7 @@ protected static class TestTree extends BPlusTree<Long, Long> {
             super(
                 "test",
                 cacheId,
+                null,
                 pageMem,
                 null,
                 new AtomicLong(),

modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jol/FileStoreHeapUtilizationJolBenchmark.java

@@ -0,0 +1,88 @@
+/*
+ * 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.benchmarks.jol;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.nio.file.Path;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.configuration.DataStorageConfiguration;
+import org.apache.ignite.internal.pagemem.PageMemory;
+import org.apache.ignite.internal.pagemem.store.PageStore;
+import org.apache.ignite.internal.processors.cache.persistence.file.AsyncFileIOFactory;
+import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreFactory;
+import org.apache.ignite.internal.processors.cache.persistence.file.FileVersionCheckingFactory;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.openjdk.jol.info.GraphLayout;
+
+import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.PART_FILE_TEMPLATE;
+
+/**
+ *
+ */
+public class FileStoreHeapUtilizationJolBenchmark {
+    /** */
+    private void benchmark() throws IgniteCheckedException {
+        FilePageStoreFactory factory = new FileVersionCheckingFactory(
+            new AsyncFileIOFactory(),
+            new AsyncFileIOFactory(),
+            new DataStorageConfiguration()
+                .setPageSize(4096)
+        );
+
+        List<PageStore> stores = new LinkedList<>();
+
+        File workDir = U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false);
+
+        for (int i = 0; i < 10000; i++) {
+            final int p = i;
+
+            PageStore ps = factory.createPageStore(
+                PageMemory.FLAG_DATA,
+                () -> getPartitionFilePath(workDir, p),
+                d -> { }
+            );
+
+            ps.ensure();
+
+            ps.write(0, ByteBuffer.allocate(256), 1, false);
+
+            stores.add(ps);
+        }
+
+        System.gc();
+
+        GraphLayout layout = GraphLayout.parseInstance(stores);
+
+        System.out.println("heap usage: " + layout.totalSize());
+
+        U.delete(workDir);
+    }
+
+    /** */
+    private Path getPartitionFilePath(File cacheWorkDir, int partId) {
+        return new File(cacheWorkDir, String.format(PART_FILE_TEMPLATE, partId)).toPath();
+    }
+
+    /** */
+    public static void main(String[] args) throws Exception {
+        new FileStoreHeapUtilizationJolBenchmark().benchmark();
+    }
+}

modules/camel/pom.xml

@@ -35,7 +35,7 @@
     <url>http://ignite.apache.org</url>
 
     <properties>
-        <guava.version>18.0</guava.version>
+        <guava.version>25.1-jre</guava.version>
         <okhttp.version>2.5.0</okhttp.version>
     </properties>
 

modules/cassandra/store/pom.xml

@@ -39,7 +39,7 @@
         <cassandra-driver.version>3.0.0</cassandra-driver.version>
         <cassandra-all.version>3.3</cassandra-all.version>
         <netty.version>4.1.27.Final</netty.version>
-        <guava.version>19.0</guava.version>
+        <guava.version>25.1-jre</guava.version>
         <metrics-core.version>3.0.2</metrics-core.version>
     </properties>
 

modules/cassandra/store/src/main/java/org/apache/ignite/cache/store/cassandra/session/CassandraSessionImpl.java

@@ -648,17 +648,25 @@ private void createKeyspace(KeyValuePersistenceSettings settings) {
 
         while (attempt < CQL_EXECUTION_ATTEMPTS_COUNT) {
             try {
-                log.info("-----------------------------------------------------------------------");
-                log.info("Creating Cassandra keyspace '" + settings.getKeyspace() + "'");
-                log.info("-----------------------------------------------------------------------\n\n" +
-                    settings.getKeyspaceDDLStatement() + "\n");
-                log.info("-----------------------------------------------------------------------");
+                if (log.isInfoEnabled()) {
+                    log.info("-----------------------------------------------------------------------");
+                    log.info("Creating Cassandra keyspace '" + settings.getKeyspace() + "'");
+                    log.info("-----------------------------------------------------------------------\n\n" +
+                        settings.getKeyspaceDDLStatement() + "\n");
+                    log.info("-----------------------------------------------------------------------");
+                }
+
                 session().execute(settings.getKeyspaceDDLStatement());
-                log.info("Cassandra keyspace '" + settings.getKeyspace() + "' was successfully created");
+
+                if (log.isInfoEnabled())
+                    log.info("Cassandra keyspace '" + settings.getKeyspace() + "' was successfully created");
+
                 return;
             }
             catch (AlreadyExistsException ignored) {
-                log.info("Cassandra keyspace '" + settings.getKeyspace() + "' already exist");
+                if (log.isInfoEnabled())
+                    log.info("Cassandra keyspace '" + settings.getKeyspace() + "' already exist");
+
                 return;
             }
             catch (Throwable e) {
@@ -689,17 +697,25 @@ private void createTable(String table, KeyValuePersistenceSettings settings) {
 
         while (attempt < CQL_EXECUTION_ATTEMPTS_COUNT) {
             try {
-                log.info("-----------------------------------------------------------------------");
-                log.info("Creating Cassandra table '" + tableFullName + "'");
-                log.info("-----------------------------------------------------------------------\n\n" +
+                if (log.isInfoEnabled()) {
+                    log.info("-----------------------------------------------------------------------");
+                    log.info("Creating Cassandra table '" + tableFullName + "'");
+                    log.info("-----------------------------------------------------------------------\n\n" +
                         settings.getTableDDLStatement(table) + "\n");
-                log.info("-----------------------------------------------------------------------");
+                    log.info("-----------------------------------------------------------------------");
+                }
+
                 session().execute(settings.getTableDDLStatement(table));
-                log.info("Cassandra table '" + tableFullName + "' was successfully created");
+
+                if (log.isInfoEnabled())
+                    log.info("Cassandra table '" + tableFullName + "' was successfully created");
+
                 return;
             }
             catch (AlreadyExistsException ignored) {
-                log.info("Cassandra table '" + tableFullName + "' already exist");
+                if (log.isInfoEnabled())
+                    log.info("Cassandra table '" + tableFullName + "' already exist");
+
                 return;
             }
             catch (Throwable e) {
@@ -741,14 +757,19 @@ private void createTableIndexes(String table, KeyValuePersistenceSettings settin
 
         while (attempt < CQL_EXECUTION_ATTEMPTS_COUNT) {
             try {
-                log.info("-----------------------------------------------------------------------");
-                log.info("Creating indexes for Cassandra table '" + tableFullName + "'");
-                log.info("-----------------------------------------------------------------------");
+                if (log.isInfoEnabled()) {
+                    log.info("-----------------------------------------------------------------------");
+                    log.info("Creating indexes for Cassandra table '" + tableFullName + "'");
+                    log.info("-----------------------------------------------------------------------");
+                }
 
                 for (String statement : indexDDLStatements) {
                     try {
-                        log.info(statement);
-                        log.info("-----------------------------------------------------------------------");
+                        if (log.isInfoEnabled()) {
+                            log.info(statement);
+                            log.info("-----------------------------------------------------------------------");
+                        }
+
                         session().execute(statement);
                     }
                     catch (AlreadyExistsException ignored) {
@@ -759,7 +780,8 @@ private void createTableIndexes(String table, KeyValuePersistenceSettings settin
                     }
                 }
 
-                log.info("Indexes for Cassandra table '" + tableFullName + "' were successfully created");
+                if (log.isInfoEnabled())
+                    log.info("Indexes for Cassandra table '" + tableFullName + "' were successfully created");
 
                 return;
             }

modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDynamicIndexAbstractSelfTest.java

@@ -31,6 +31,7 @@
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.testframework.GridTestUtils;
 
 /**
  * Test that checks indexes handling with JDBC.
@@ -168,9 +169,9 @@ public void testCreateIndex() throws SQLException {
     public void testCreateIndexWithDuplicateName() throws SQLException {
         jdbcRun(CREATE_INDEX);
 
-        assertSqlException(new RunnableX() {
+        assertSqlException(new GridTestUtils.RunnableX() {
             /** {@inheritDoc} */
-            @Override public void run() throws Exception {
+            @Override public void runx() throws Exception {
                 jdbcRun(CREATE_INDEX);
             }
         });
@@ -219,9 +220,9 @@ public void testDropIndex() throws SQLException {
      * Test that dropping a non-existent index yields an error.
      */
     public void testDropMissingIndex() {
-        assertSqlException(new RunnableX() {
+        assertSqlException(new GridTestUtils.RunnableX() {
             /** {@inheritDoc} */
-            @Override public void run() throws Exception {
+            @Override public void runx() throws Exception {
                 jdbcRun(DROP_INDEX);
             }
         });
@@ -310,11 +311,11 @@ private IgniteCache<String, Person> cache() {
      *
      * @param r Runnable.
      */
-    private static void assertSqlException(RunnableX r) {
+    private static void assertSqlException(GridTestUtils.RunnableX r) {
         // We expect IgniteSQLException with given code inside CacheException inside JDBC SQLException.
 
         try {
-            r.run();
+            r.runx();
         }
         catch (SQLException e) {
             return;
@@ -325,16 +326,4 @@ private static void assertSqlException(RunnableX r) {
 
         fail(SQLException.class.getSimpleName() +  " is not thrown.");
     }
-
-    /**
-     * Runnable which can throw checked exceptions.
-     */
-    private interface RunnableX {
-        /**
-         * Do run.
-         *
-         * @throws Exception If failed.
-         */
-        public void run() throws Exception;
-    }
 }

modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java

@@ -28,12 +28,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Callable;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.processors.odbc.ClientListenerProcessor;
 import org.apache.ignite.internal.processors.port.GridPortRecord;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.GridTestUtils.RunnableX;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 
 /**
@@ -45,68 +45,45 @@ public class JdbcThinAbstractSelfTest extends GridCommonAbstractTest {
      * @param r Runnable to check support.
      */
     protected void checkNotSupported(final RunnableX r) {
-        GridTestUtils.assertThrows(log,
-            new Callable<Object>() {
-                @Override public Object call() throws Exception {
-                    r.run();
-
-                    return null;
-                }
-            }, SQLFeatureNotSupportedException.class, null);
+        GridTestUtils.assertThrowsWithCause(r, SQLFeatureNotSupportedException.class);
     }
 
     /**
      * @param r Runnable to check on closed connection.
      */
     protected void checkConnectionClosed(final RunnableX r) {
-        GridTestUtils.assertThrows(log,
-            new Callable<Object>() {
-                @Override public Object call() throws Exception {
-                    r.run();
+        GridTestUtils.assertThrowsAnyCause(log,
+            () -> {
+                r.run();
 
-                    return null;
-                }
+                return null;
             }, SQLException.class, "Connection is closed");
     }
 
     /**
      * @param r Runnable to check on closed statement.
      */
     protected void checkStatementClosed(final RunnableX r) {
-        GridTestUtils.assertThrows(log,
-            new Callable<Object>() {
-                @Override public Object call() throws Exception {
-                    r.run();
+        GridTestUtils.assertThrowsAnyCause(log,
+            () -> {
+                r.run();
 
-                    return null;
-                }
+                return null;
             }, SQLException.class, "Statement is closed");
     }
 
     /**
      * @param r Runnable to check on closed result set.
      */
     protected void checkResultSetClosed(final RunnableX r) {
-        GridTestUtils.assertThrows(log,
-            new Callable<Object>() {
-                @Override public Object call() throws Exception {
-                    r.run();
+        GridTestUtils.assertThrowsAnyCause(log,
+            () -> {
+                r.run();
 
-                    return null;
-                }
+                return null;
             }, SQLException.class, "Result set is closed");
     }
 
-    /**
-     * Runnable that can throw an exception.
-     */
-    interface RunnableX {
-        /**
-         * @throws Exception On error.
-         */
-        void run() throws Exception;
-    }
-
     /**
      * @param node Node to connect to.
      * @param params Connection parameters.