You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2021/01/24 23:51:07 UTC
[incubator-nlpcraft] branch NLPCRAFT-224 updated (a2b33ee ->
2334aee)
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a change to branch NLPCRAFT-224
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from a2b33ee WIP.
new 9208f36 WIP.
new 2334aee Update NCCli.scala
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../nlpcraft/model/tools/cmdline/NCCli.scala | 73 +++++++++++-----------
.../model/tools/sqlgen/NCSqlModelGenerator.java | 1 -
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 2 +-
3 files changed, 39 insertions(+), 37 deletions(-)
[incubator-nlpcraft] 01/02: WIP.
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-224
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 9208f360720732b58a2b82c9bcdd2e44fb5203c0
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Sun Jan 24 15:39:44 2021 -0800
WIP.
---
.../nlpcraft/model/tools/cmdline/NCCli.scala | 70 +++++++++++-----------
.../model/tools/sqlgen/NCSqlModelGenerator.java | 1 -
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 2 +-
3 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
index 1ec3526..28dd409 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
@@ -74,6 +74,20 @@ import scala.util.control.Exception.ignoring
object NCCli extends App {
private final val NAME = "NLPCraft CLI"
+ /*
+ * Disable warnings from Ignite on JDK 11.
+ */
+ final val JVM_OPTS_RT_WARNS = Seq (
+ "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED",
+ "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
+ "--add-opens=java.base/java.nio=ALL-UNNAMED",
+ "--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED",
+ "--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED",
+ "--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED",
+ "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED",
+ "--illegal-access=permit"
+ )
+
//noinspection RegExpRedundantEscape
private final val TAILER_PTRN = Pattern.compile("^.*NC[a-zA-Z0-9]+ started \\[[\\d]+ms\\]$")
private final val CMD_NAME = Pattern.compile("(^\\s*[\\w-]+)(\\s)")
@@ -334,6 +348,14 @@ object NCCli extends App {
* @param args
* @param id
*/
+ private def isParam(cmd: Command, args: Seq[Argument], id: String): Boolean =
+ args.find(_.parameter.id == id).nonEmpty
+
+ /**
+ * @param cmd
+ * @param args
+ * @param id
+ */
private def getParamOrNull(cmd: Command, args: Seq[Argument], id: String): String =
args.find(_.parameter.id == id) match {
case Some(arg) ⇒ U.trimQuotes(arg.value.get)
@@ -509,15 +531,9 @@ object NCCli extends App {
srvArgs += JAVA
srvArgs ++= jvmOpts
- // Required by Ignite 2.x running on JDK 11+.
// TODO: check for dups with 'jvmOpts'?
- srvArgs += "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED"
- srvArgs += "--add-exports=java.base/sun.nio.ch=ALL-UNNAMED"
- srvArgs += "--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED"
- srvArgs += "--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED"
- srvArgs += "--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED"
- srvArgs += "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED"
- srvArgs += "--illegal-access=permit"
+ JVM_OPTS_RT_WARNS.foreach(srvArgs += _)
+
srvArgs += "-DNLPCRAFT_ANSI_COLOR_DISABLED=true" // No ANSI colors for text log output to the file.
srvArgs += "-cp"
srvArgs += JAVA_CP
@@ -698,13 +714,7 @@ object NCCli extends App {
jvmArgs += JAVA
jvmArgs ++= jvmOpts
- jvmArgs += "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED"
- jvmArgs += "--add-exports=java.base/sun.nio.ch=ALL-UNNAMED"
- jvmArgs += "--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED"
- jvmArgs += "--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED"
- jvmArgs += "--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED"
- jvmArgs += "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED"
- jvmArgs += "--illegal-access=permit"
+ JVM_OPTS_RT_WARNS.foreach(jvmArgs += _)
if (cfgPath != null)
jvmArgs += s"-DNLPCRAFT_PROBE_CONFIG=$cfgPath"
@@ -792,13 +802,7 @@ object NCCli extends App {
prbArgs += JAVA
prbArgs ++= jvmOpts
- prbArgs += "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED"
- prbArgs += "--add-exports=java.base/sun.nio.ch=ALL-UNNAMED"
- prbArgs += "--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED"
- prbArgs += "--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED"
- prbArgs += "--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED"
- prbArgs += "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED"
- prbArgs += "--illegal-access=permit"
+ JVM_OPTS_RT_WARNS.foreach(prbArgs += _)
prbArgs += "-DNLPCRAFT_ANSI_COLOR_DISABLED=true" // No ANSI colors for text log output to the file.
@@ -1734,11 +1738,13 @@ object NCCli extends App {
* @param repl Whether or not executing from REPL.
*/
private [cmdline] def cmdSqlGen(cmd: Command, args: Seq[Argument], repl: Boolean): Unit = {
- // Mandatory parameters check.
- getParam(cmd, args, "driver")
- getParam(cmd, args, "schema")
- getParam(cmd, args, "out")
- getParam(cmd, args, "url")
+ // Mandatory parameters check (unless --help is specified).
+ if (!isParam(cmd, args, "help")) {
+ getParam(cmd, args, "driver")
+ getParam(cmd, args, "schema")
+ getParam(cmd, args, "out")
+ getParam(cmd, args, "url")
+ }
val addCp = getCpParam(cmd, args, "cp")
val jvmOpts = getParamOpt(cmd, args, "jvmopts") match {
@@ -1751,13 +1757,7 @@ object NCCli extends App {
jvmArgs += JAVA
jvmArgs ++= jvmOpts
- jvmArgs += "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED"
- jvmArgs += "--add-exports=java.base/sun.nio.ch=ALL-UNNAMED"
- jvmArgs += "--add-exports=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED"
- jvmArgs += "--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED"
- jvmArgs += "--add-exports=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED"
- jvmArgs += "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED"
- jvmArgs += "--illegal-access=permit"
+ JVM_OPTS_RT_WARNS.foreach(jvmArgs += _)
if (!NCAnsi.isEnabled)
jvmArgs += "-DNLPCRAFT_ANSI_COLOR_DISABLED=true"
@@ -1777,7 +1777,7 @@ object NCCli extends App {
arg.value match {
case None ⇒ jvmArgs += p
- case Some(v) ⇒ jvmArgs ++= Seq(p, arg.value.get)
+ case Some(v) ⇒ jvmArgs += s"$p=${arg.value.get}"
}
}
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.java
index b913747..0bd74a6 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlModelGenerator.java
@@ -17,7 +17,6 @@
package org.apache.nlpcraft.model.tools.sqlgen;
-import org.apache.nlpcraft.common.util.NCUtils;
import org.apache.nlpcraft.model.*;
import org.apache.nlpcraft.common.NCException;
import org.apache.nlpcraft.model.tools.sqlgen.impl.*;
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala
index 6ca9e05..752bc8b 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala
@@ -686,7 +686,7 @@ object NCSqlModelGeneratorImpl {
| Parameter values can be placed in double (") or single (') quotes which will be
| automatically discarded. Use it to pass strings containing spaces in the command line.
|
- | Each -i or -e parameter is a semicolon ';' separated list of table or columns names.
+ | Each -i or -e parameter is a semicolon (;) separated list of table or columns names.
| Each table or column name can be one of following forms:
| - ${g("table")} -- to filter on table names only.
| - ${g("table#column")} -- to filter on both table and column names.
[incubator-nlpcraft] 02/02: Update NCCli.scala
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-224
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 2334aeeff29d9bc550b64798dd2d62ada0c6a3b4
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Sun Jan 24 15:50:55 2021 -0800
Update NCCli.scala
---
.../src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala | 3 +++
1 file changed, 3 insertions(+)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
index 28dd409..94b8c4b 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
@@ -81,6 +81,9 @@ object NCCli extends App {
"--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
"--add-opens=java.base/java.nio=ALL-UNNAMED",
+ "--add-opens=java.base/java.io=ALL-UNNAMED",
+ "--add-opens=java.base/java.util=ALL-UNNAMED",
+ "--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED",
"--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED",