You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by al...@apache.org on 2022/02/11 08:51:44 UTC

[ignite] branch sql-calcite updated: IGNITE-16511 Move system properties constants to IgniteSystemProperties class - Fixes #9818.

This is an automated email from the ASF dual-hosted git repository.

alexpl pushed a commit to branch sql-calcite
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/sql-calcite by this push:
     new 8733a69  IGNITE-16511 Move system properties constants to IgniteSystemProperties class - Fixes #9818.
8733a69 is described below

commit 8733a69412a0c043dea75183bf76fd40c308699f
Author: Aleksey Plekhanov <pl...@gmail.com>
AuthorDate: Fri Feb 11 11:49:23 2022 +0300

    IGNITE-16511 Move system properties constants to IgniteSystemProperties class - Fixes #9818.
    
    Signed-off-by: Aleksey Plekhanov <pl...@gmail.com>
---
 .../query/calcite/exec/rel/AbstractNode.java       | 13 +++++---
 .../query/calcite/externalize/RelJsonWriter.java   |  4 ++-
 .../org/apache/ignite/IgniteSystemProperties.java  | 35 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractNode.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractNode.java
index 3f9fa5e..5a4006f 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractNode.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/AbstractNode.java
@@ -28,21 +28,26 @@ import org.apache.ignite.internal.processors.query.calcite.exec.ExecutionContext
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.U;
 
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CALCITE_EXEC_IN_BUFFER_SIZE;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CALCITE_EXEC_IO_BATCH_CNT;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CALCITE_EXEC_IO_BATCH_SIZE;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CALCITE_EXEC_MODIFY_BATCH_SIZE;
+
 /**
  * Abstract node of execution tree.
  */
 public abstract class AbstractNode<Row> implements Node<Row> {
     /** */
-    protected static final int IN_BUFFER_SIZE = IgniteSystemProperties.getInteger("IGNITE_CALCITE_EXEC_IN_BUFFER_SIZE", 512);
+    protected static final int IN_BUFFER_SIZE = IgniteSystemProperties.getInteger(IGNITE_CALCITE_EXEC_IN_BUFFER_SIZE, 512);
 
     /** */
-    protected static final int MODIFY_BATCH_SIZE = IgniteSystemProperties.getInteger("IGNITE_CALCITE_EXEC_BATCH_SIZE", 100);
+    protected static final int MODIFY_BATCH_SIZE = IgniteSystemProperties.getInteger(IGNITE_CALCITE_EXEC_MODIFY_BATCH_SIZE, 100);
 
     /** */
-    protected static final int IO_BATCH_SIZE = IgniteSystemProperties.getInteger("IGNITE_CALCITE_EXEC_IO_BATCH_SIZE", 256);
+    protected static final int IO_BATCH_SIZE = IgniteSystemProperties.getInteger(IGNITE_CALCITE_EXEC_IO_BATCH_SIZE, 256);
 
     /** */
-    protected static final int IO_BATCH_CNT = IgniteSystemProperties.getInteger("IGNITE_CALCITE_EXEC_IO_BATCH_CNT", 4);
+    protected static final int IO_BATCH_CNT = IgniteSystemProperties.getInteger(IGNITE_CALCITE_EXEC_IO_BATCH_CNT, 4);
 
     /** for debug purpose */
     private volatile Thread thread;
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonWriter.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonWriter.java
index e628313..0a2ae5a 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonWriter.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJsonWriter.java
@@ -35,6 +35,8 @@ import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteSystemProperties;
 import org.apache.ignite.internal.processors.query.calcite.prepare.BaseQueryContext;
 
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_CALCITE_REL_JSON_PRETTY_PRINT;
+
 /**
  * Callback for a relational expression to dump itself as JSON.
  *
@@ -42,7 +44,7 @@ import org.apache.ignite.internal.processors.query.calcite.prepare.BaseQueryCont
  */
 public class RelJsonWriter implements RelWriter {
     /** */
-    private static final boolean PRETTY_PRINT = IgniteSystemProperties.getBoolean("IGNITE_CALCITE_REL_JSON_PRETTY_PRINT", false);
+    private static final boolean PRETTY_PRINT = IgniteSystemProperties.getBoolean(IGNITE_CALCITE_REL_JSON_PRETTY_PRINT, false);
 
     /** */
     private final RelJson relJson;
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index c9aeace..d20b838 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -2015,6 +2015,41 @@ public final class IgniteSystemProperties {
     public static final String IGNITE_EXPERIMENTAL_SQL_ENGINE = "IGNITE_EXPERIMENTAL_SQL_ENGINE";
 
     /**
+     * Calcite-based SQL engine. Buffer size (count of rows) for query execution nodes.
+     */
+    @SystemProperty(value = "Calcite-based SQL engine. Buffer size (count of rows) for query execution nodes",
+        type = Integer.class)
+    public static final String IGNITE_CALCITE_EXEC_IN_BUFFER_SIZE = "IGNITE_CALCITE_EXEC_IN_BUFFER_SIZE";
+
+    /**
+     * Calcite-based SQL engine. Batch size (count of rows) for cache modify execution nodes.
+     */
+    @SystemProperty(value = "Calcite-based SQL engine. Batch size (count of rows) for cache modify execution nodes",
+        type = Integer.class)
+    public static final String IGNITE_CALCITE_EXEC_MODIFY_BATCH_SIZE = "IGNITE_CALCITE_EXEC_MODIFY_BATCH_SIZE";
+
+    /**
+     * Calcite-based SQL engine. Batch size (count of rows) for outgoing data message.
+     */
+    @SystemProperty(value = "Calcite-based SQL engine. Batch size (count of rows) for outgoing data message",
+        type = Integer.class)
+    public static final String IGNITE_CALCITE_EXEC_IO_BATCH_SIZE = "IGNITE_CALCITE_EXEC_IO_BATCH_SIZE";
+
+    /**
+     * Calcite-based SQL engine. Maximum number of pending data messages for each outbox.
+     */
+    @SystemProperty(value = "Calcite-based SQL engine. Maximum number of pending data messages for each outbox",
+        type = Integer.class)
+    public static final String IGNITE_CALCITE_EXEC_IO_BATCH_CNT = "IGNITE_CALCITE_EXEC_IO_BATCH_CNT";
+
+    /**
+     * Calcite-based SQL engine. Pretty print serialized to JSON plan, when sending it to remote nodes.
+     */
+    @SystemProperty(value = "Calcite-based SQL engine. Pretty print serialized to JSON plan, when sending it to " +
+        "remote nodes")
+    public static final String IGNITE_CALCITE_REL_JSON_PRETTY_PRINT = "IGNITE_CALCITE_REL_JSON_PRETTY_PRINT";
+
+    /**
      * Count of rows, being processed within a single checkpoint lock when indexes are rebuilt.
      * The default value is {@link SchemaIndexCachePartitionWorker#DFLT_IGNITE_INDEX_REBUILD_BATCH_SIZE}.
      */