You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/04/18 08:55:15 UTC
ignite git commit: IGNITE-4988 Refactored task arguments class names.
Repository: ignite
Updated Branches:
refs/heads/master faae9d47c -> 920673c4d
IGNITE-4988 Refactored task arguments class names.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/920673c4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/920673c4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/920673c4
Branch: refs/heads/master
Commit: 920673c4d3ae64b94f19a3b45470496e9917e705
Parents: faae9d4
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Apr 18 15:56:04 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Apr 18 15:56:04 2017 +0700
----------------------------------------------------------------------
.../JettyRestProcessorAbstractSelfTest.java | 16 +-
.../visor/cache/VisorCacheLoadTaskArg.java | 2 +-
.../visor/cache/VisorCacheStartTask.java | 10 +-
.../visor/cache/VisorCacheStartTaskArg.java | 100 ++++++++++++
.../internal/visor/file/VisorFileBlockTask.java | 10 +-
.../visor/file/VisorFileBlockTaskArg.java | 114 ++++++++++++++
.../internal/visor/log/VisorLogSearchTask.java | 11 +-
.../visor/log/VisorLogSearchTaskArg.java | 114 ++++++++++++++
.../internal/visor/query/VisorQueryTask.java | 10 +-
.../internal/visor/query/VisorQueryTaskArg.java | 155 ++++++++++++++++++
.../visor/query/VisorScanQueryTask.java | 12 +-
.../visor/query/VisorScanQueryTaskArg.java | 157 +++++++++++++++++++
.../resources/META-INF/classnames.properties | 13 +-
.../commands/cache/VisorCacheScanCommand.scala | 2 +-
.../web-console/backend/app/browsersHandler.js | 4 +-
.../frontend/app/modules/cluster/Cache.js | 20 ++-
.../app/modules/cluster/CacheMetrics.js | 20 ++-
17 files changed, 712 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index c383de0..63429a5 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -68,7 +68,7 @@ import org.apache.ignite.internal.visor.cache.VisorCacheMetricsCollectorTaskArg;
import org.apache.ignite.internal.visor.cache.VisorCacheNodesTask;
import org.apache.ignite.internal.visor.cache.VisorCacheRebalanceTask;
import org.apache.ignite.internal.visor.cache.VisorCacheResetMetricsTask;
-import org.apache.ignite.internal.visor.cache.VisorCacheStartArg;
+import org.apache.ignite.internal.visor.cache.VisorCacheStartTaskArg;
import org.apache.ignite.internal.visor.cache.VisorCacheStartTask;
import org.apache.ignite.internal.visor.cache.VisorCacheStopTask;
import org.apache.ignite.internal.visor.compute.VisorComputeCancelSessionsTask;
@@ -77,7 +77,7 @@ import org.apache.ignite.internal.visor.compute.VisorComputeToggleMonitoringTask
import org.apache.ignite.internal.visor.compute.VisorComputeToggleMonitoringTaskArg;
import org.apache.ignite.internal.visor.compute.VisorGatewayTask;
import org.apache.ignite.internal.visor.debug.VisorThreadDumpTask;
-import org.apache.ignite.internal.visor.file.VisorFileBlockArg;
+import org.apache.ignite.internal.visor.file.VisorFileBlockTaskArg;
import org.apache.ignite.internal.visor.file.VisorFileBlockTask;
import org.apache.ignite.internal.visor.file.VisorLatestTextFilesTask;
import org.apache.ignite.internal.visor.file.VisorLatestTextFilesTaskArg;
@@ -87,7 +87,7 @@ import org.apache.ignite.internal.visor.igfs.VisorIgfsProfilerTask;
import org.apache.ignite.internal.visor.igfs.VisorIgfsResetMetricsTask;
import org.apache.ignite.internal.visor.igfs.VisorIgfsSamplingStateTask;
import org.apache.ignite.internal.visor.igfs.VisorIgfsSamplingStateTaskArg;
-import org.apache.ignite.internal.visor.log.VisorLogSearchArg;
+import org.apache.ignite.internal.visor.log.VisorLogSearchTaskArg;
import org.apache.ignite.internal.visor.log.VisorLogSearchTask;
import org.apache.ignite.internal.visor.misc.VisorAckTask;
import org.apache.ignite.internal.visor.misc.VisorLatestVersionTask;
@@ -100,7 +100,7 @@ import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTaskArg;
import org.apache.ignite.internal.visor.node.VisorNodeGcTask;
import org.apache.ignite.internal.visor.node.VisorNodePingTask;
import org.apache.ignite.internal.visor.node.VisorNodeSuppressedErrorsTask;
-import org.apache.ignite.internal.visor.query.VisorQueryArg;
+import org.apache.ignite.internal.visor.query.VisorQueryTaskArg;
import org.apache.ignite.internal.visor.query.VisorQueryCleanupTask;
import org.apache.ignite.internal.visor.query.VisorQueryNextPageTask;
import org.apache.ignite.internal.visor.query.VisorQueryNextPageTaskArg;
@@ -1378,7 +1378,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
ret = content(new VisorGatewayArgument(VisorFileBlockTask.class)
.forNode(locNode)
- .argument(VisorFileBlockArg.class, "", 0L, 1, 0L));
+ .argument(VisorFileBlockTaskArg.class, "", 0L, 1, 0L));
info("VisorFileBlockTask result: " + ret);
@@ -1408,7 +1408,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
ret = content(new VisorGatewayArgument(VisorQueryTask.class)
.forNode(locNode)
- .argument(VisorQueryArg.class, "person", URLEncoder.encode("select * from Person", CHARSET),
+ .argument(VisorQueryTaskArg.class, "person", URLEncoder.encode("select * from Person", CHARSET),
false, false, false, false, 1));
info("VisorQueryTask result: " + ret);
@@ -1462,7 +1462,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonTaskResult(ret);
ret = content(new VisorGatewayArgument(VisorLogSearchTask.class)
- .argument(VisorLogSearchArg.class, ".", ".", "abrakodabra.txt", 1));
+ .argument(VisorLogSearchTaskArg.class, ".", ".", "abrakodabra.txt", 1));
info("VisorLogSearchTask result: " + ret);
@@ -1532,7 +1532,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
"</beans>";
ret = content(new VisorGatewayArgument(VisorCacheStartTask.class)
- .argument(VisorCacheStartArg.class, false, "person2",
+ .argument(VisorCacheStartTaskArg.class, false, "person2",
URLEncoder.encode(START_CACHE, CHARSET)));
info("VisorCacheStartTask result: " + ret);
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTaskArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTaskArg.java
index 831446a..d5c7f20 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTaskArg.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheLoadTaskArg.java
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
- * Argument for task returns cache load results.
+ * Arguments for {@link VisorCacheLoadTask}.
*/
public class VisorCacheLoadTaskArg extends VisorDataTransferObject {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
index af51a38..5f6337b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTask.java
@@ -40,12 +40,12 @@ import org.jetbrains.annotations.Nullable;
* Task that start cache or near cache with specified configuration.
*/
@GridInternal
-public class VisorCacheStartTask extends VisorMultiNodeTask<VisorCacheStartArg, Map<UUID, IgniteException>, Void> {
+public class VisorCacheStartTask extends VisorMultiNodeTask<VisorCacheStartTaskArg, Map<UUID, IgniteException>, Void> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorCacheStartJob job(VisorCacheStartArg arg) {
+ @Override protected VisorCacheStartJob job(VisorCacheStartTaskArg arg) {
return new VisorCacheStartJob(arg, debug);
}
@@ -63,7 +63,7 @@ public class VisorCacheStartTask extends VisorMultiNodeTask<VisorCacheStartArg,
/**
* Job that start cache or near cache with specified configuration.
*/
- private static class VisorCacheStartJob extends VisorJob<VisorCacheStartArg, Void> {
+ private static class VisorCacheStartJob extends VisorJob<VisorCacheStartTaskArg, Void> {
/** */
private static final long serialVersionUID = 0L;
@@ -73,12 +73,12 @@ public class VisorCacheStartTask extends VisorMultiNodeTask<VisorCacheStartArg,
* @param arg Contains cache name and XML configurations of cache.
* @param debug Debug flag.
*/
- private VisorCacheStartJob(VisorCacheStartArg arg, boolean debug) {
+ private VisorCacheStartJob(VisorCacheStartTaskArg arg, boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected Void run(VisorCacheStartArg arg) throws IgniteException {
+ @Override protected Void run(VisorCacheStartTaskArg arg) throws IgniteException {
String cfg = arg.getConfiguration();
assert !F.isEmpty(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTaskArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTaskArg.java
new file mode 100644
index 0000000..0b058ae
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStartTaskArg.java
@@ -0,0 +1,100 @@
+/*
+ * 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.visor.cache;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorDataTransferObject;
+
+/**
+ * Cache start arguments.
+ */
+public class VisorCacheStartTaskArg extends VisorDataTransferObject {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
+ private boolean near;
+
+ /** */
+ private String name;
+
+ /** */
+ private String cfg;
+
+ /**
+ * Default constructor.
+ */
+ public VisorCacheStartTaskArg() {
+ // No-op.
+ }
+
+ /**
+ * @param near {@code true} if near cache should be started.
+ * @param name Name for near cache.
+ * @param cfg Cache XML configuration.
+ */
+ public VisorCacheStartTaskArg(boolean near, String name, String cfg) {
+ this.near = near;
+ this.name = name;
+ this.cfg = cfg;
+ }
+
+ /**
+ * @return {@code true} if near cache should be started.
+ */
+ public boolean isNear() {
+ return near;
+ }
+
+ /**
+ * @return Name for near cache.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return Cache XML configuration.
+ */
+ public String getConfiguration() {
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void writeExternalData(ObjectOutput out) throws IOException {
+ out.writeBoolean(near);
+ U.writeString(out, name);
+ U.writeString(out, cfg);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+ near = in.readBoolean();
+ name = U.readString(in);
+ cfg = U.readString(in);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorCacheStartTaskArg.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java
index 85a790b..ad851cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTask.java
@@ -35,12 +35,12 @@ import static org.apache.ignite.internal.visor.util.VisorTaskUtils.readBlock;
* Task to read file block.
*/
@GridInternal
-public class VisorFileBlockTask extends VisorOneNodeTask<VisorFileBlockArg, VisorEither<VisorFileBlock>> {
+public class VisorFileBlockTask extends VisorOneNodeTask<VisorFileBlockTaskArg, VisorEither<VisorFileBlock>> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorFileBlockJob job(VisorFileBlockArg arg) {
+ @Override protected VisorFileBlockJob job(VisorFileBlockTaskArg arg) {
return new VisorFileBlockJob(arg, debug);
}
@@ -48,7 +48,7 @@ public class VisorFileBlockTask extends VisorOneNodeTask<VisorFileBlockArg, Viso
* Job that read file block on node.
*/
private static class VisorFileBlockJob
- extends VisorJob<VisorFileBlockArg, VisorEither<VisorFileBlock>> {
+ extends VisorJob<VisorFileBlockTaskArg, VisorEither<VisorFileBlock>> {
/** */
private static final long serialVersionUID = 0L;
@@ -56,12 +56,12 @@ public class VisorFileBlockTask extends VisorOneNodeTask<VisorFileBlockArg, Viso
* @param arg Descriptor of file block to read.
* @param debug Debug flag.
*/
- private VisorFileBlockJob(VisorFileBlockArg arg, boolean debug) {
+ private VisorFileBlockJob(VisorFileBlockTaskArg arg, boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorEither<VisorFileBlock> run(VisorFileBlockArg arg) {
+ @Override protected VisorEither<VisorFileBlock> run(VisorFileBlockTaskArg arg) {
try {
URL url = U.resolveIgniteUrl(arg.getPath());
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTaskArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTaskArg.java
new file mode 100644
index 0000000..de41c4e
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/file/VisorFileBlockTaskArg.java
@@ -0,0 +1,114 @@
+/*
+ * 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.visor.file;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorDataTransferObject;
+
+/**
+ * Arguments for {@link VisorFileBlockTask}
+ */
+public class VisorFileBlockTaskArg extends VisorDataTransferObject {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Log file path. */
+ private String path;
+
+ /** Log file offset. */
+ private long off;
+
+ /** Block size. */
+ private int blockSz;
+
+ /** Log file last modified timestamp. */
+ private long lastModified;
+
+ /**
+ * Default constructor.
+ */
+ public VisorFileBlockTaskArg() {
+ // No-op.
+ }
+
+ /**
+ * @param path Log file path.
+ * @param off Offset in file.
+ * @param blockSz Block size.
+ * @param lastModified Log file last modified timestamp.
+ */
+ public VisorFileBlockTaskArg(String path, long off, int blockSz, long lastModified) {
+ this.path = path;
+ this.off = off;
+ this.blockSz = blockSz;
+ this.lastModified = lastModified;
+ }
+
+ /**
+ * @return Log file path.
+ */
+ public String getPath() {
+ return path;
+ }
+
+ /**
+ * @return Log file offset.
+ */
+ public long getOffset() {
+ return off;
+ }
+
+ /**
+ * @return Block size
+ */
+ public int getBlockSize() {
+ return blockSz;
+ }
+
+ /**
+ * @return Log file last modified timestamp.
+ */
+ public long getLastModified() {
+ return lastModified;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void writeExternalData(ObjectOutput out) throws IOException {
+ U.writeString(out, path);
+ out.writeLong(off);
+ out.writeInt(blockSz);
+ out.writeLong(lastModified);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+ path = U.readString(in);
+ off = in.readLong();
+ blockSz = in.readInt();
+ lastModified = in.readLong();
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorFileBlockTaskArg.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
index 924c285..59d532e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTask.java
@@ -48,8 +48,7 @@ import static org.apache.ignite.internal.visor.util.VisorTaskUtils.textFile;
* Search text matching in logs
*/
@GridInternal
-public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchArg,
- VisorLogSearchTaskResult,
+public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchTaskArg, VisorLogSearchTaskResult,
Collection<VisorLogSearchResult>> {
/** */
private static final long serialVersionUID = 0L;
@@ -61,7 +60,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchArg,
public static final int HALF = LINE_CNT / 2;
/** {@inheritDoc} */
- @Override protected VisorLogSearchJob job(VisorLogSearchArg arg) {
+ @Override protected VisorLogSearchJob job(VisorLogSearchTaskArg arg) {
return new VisorLogSearchJob(arg, debug);
}
@@ -87,7 +86,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchArg,
/**
* Job to perform search on node.
*/
- private static class VisorLogSearchJob extends VisorJob<VisorLogSearchArg, Collection<VisorLogSearchResult>> {
+ private static class VisorLogSearchJob extends VisorJob<VisorLogSearchTaskArg, Collection<VisorLogSearchResult>> {
/** */
private static final long serialVersionUID = 0L;
@@ -95,7 +94,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchArg,
* @param arg Search descriptor.
* @param debug Debug flag.
*/
- private VisorLogSearchJob(VisorLogSearchArg arg, boolean debug) {
+ private VisorLogSearchJob(VisorLogSearchTaskArg arg, boolean debug) {
super(arg, debug);
}
@@ -173,7 +172,7 @@ public class VisorLogSearchTask extends VisorMultiNodeTask<VisorLogSearchArg,
}
/** {@inheritDoc} */
- @Override protected Collection<VisorLogSearchResult> run(VisorLogSearchArg arg) {
+ @Override protected Collection<VisorLogSearchResult> run(VisorLogSearchTaskArg arg) {
URL url = U.resolveIgniteUrl(arg.getFolder());
if (url == null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTaskArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTaskArg.java
new file mode 100644
index 0000000..aa05970
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/log/VisorLogSearchTaskArg.java
@@ -0,0 +1,114 @@
+/*
+ * 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.visor.log;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorDataTransferObject;
+
+/**
+ * Arguments for {@link VisorLogSearchTask}.
+ */
+public class VisorLogSearchTaskArg extends VisorDataTransferObject {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Searched string. */
+ private String searchStr;
+
+ /** Folder. */
+ private String folder;
+
+ /** File name search pattern. */
+ private String filePtrn;
+
+ /** Max number of results. */
+ private int limit;
+
+ /**
+ * Default constructor.
+ */
+ public VisorLogSearchTaskArg() {
+ // No-op.
+ }
+
+ /**
+ * @param searchStr Searched string.
+ * @param folder Folder.
+ * @param filePtrn File name search pattern.
+ * @param limit Max number of results.
+ */
+ public VisorLogSearchTaskArg(String searchStr, String folder, String filePtrn, int limit) {
+ this.searchStr = searchStr;
+ this.folder = folder;
+ this.filePtrn = filePtrn;
+ this.limit = limit;
+ }
+
+ /**
+ * @return Searched string.
+ */
+ public String getSearchString() {
+ return searchStr;
+ }
+
+ /**
+ * @return Folder.
+ */
+ public String getFolder() {
+ return folder;
+ }
+
+ /**
+ * @return File name search pattern.
+ */
+ public String getFilePattern() {
+ return filePtrn;
+ }
+
+ /**
+ * @return Max number of results.
+ */
+ public int getLimit() {
+ return limit;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void writeExternalData(ObjectOutput out) throws IOException {
+ U.writeString(out, searchStr);
+ U.writeString(out, folder);
+ U.writeString(out, filePtrn);
+ out.writeInt(limit);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+ searchStr = U.readString(in);
+ folder = U.readString(in);
+ filePtrn = U.readString(in);
+ limit = in.readInt();
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorLogSearchTaskArg.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index 815cf6f..20471e5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -41,19 +41,19 @@ import static org.apache.ignite.internal.visor.query.VisorQueryUtils.scheduleRes
* Task for execute SQL fields query and get first page of results.
*/
@GridInternal
-public class VisorQueryTask extends VisorOneNodeTask<VisorQueryArg, VisorEither<VisorQueryResult>> {
+public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTaskArg, VisorEither<VisorQueryResult>> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorQueryJob job(VisorQueryArg arg) {
+ @Override protected VisorQueryJob job(VisorQueryTaskArg arg) {
return new VisorQueryJob(arg, debug);
}
/**
* Job for execute SCAN or SQL query and get first page of results.
*/
- private static class VisorQueryJob extends VisorJob<VisorQueryArg, VisorEither<VisorQueryResult>> {
+ private static class VisorQueryJob extends VisorJob<VisorQueryTaskArg, VisorEither<VisorQueryResult>> {
/** */
private static final long serialVersionUID = 0L;
@@ -63,12 +63,12 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryArg, VisorEither<
* @param arg Job argument.
* @param debug Debug flag.
*/
- private VisorQueryJob(VisorQueryArg arg, boolean debug) {
+ private VisorQueryJob(VisorQueryTaskArg arg, boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorEither<VisorQueryResult> run(final VisorQueryArg arg) {
+ @Override protected VisorEither<VisorQueryResult> run(final VisorQueryTaskArg arg) {
try {
IgniteCache<Object, Object> c = ignite.context().cache().jcache(arg.getCacheName());
UUID nid = ignite.localNode().id();
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTaskArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTaskArg.java
new file mode 100644
index 0000000..5013b0a
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTaskArg.java
@@ -0,0 +1,155 @@
+/*
+ * 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.visor.query;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorDataTransferObject;
+
+/**
+ * Arguments for {@link VisorQueryTask}.
+ */
+public class VisorQueryTaskArg extends VisorDataTransferObject {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Cache name for query. */
+ private String cacheName;
+
+ /** Query text. */
+ private String qryTxt;
+
+ /** Distributed joins enabled flag. */
+ private boolean distributedJoins;
+
+ /** Enforce join order flag. */
+ private boolean enforceJoinOrder;
+
+ /** Query contains only replicated tables flag.*/
+ private boolean replicatedOnly;
+
+ /** Flag whether to execute query locally. */
+ private boolean loc;
+
+ /** Result batch size. */
+ private int pageSize;
+
+ /**
+ * Default constructor.
+ */
+ public VisorQueryTaskArg() {
+ // No-op.
+ }
+
+ /**
+ * @param cacheName Cache name for query.
+ * @param qryTxt Query text.
+ * @param distributedJoins If {@code true} then distributed joins enabled.
+ * @param enforceJoinOrder If {@code true} then enforce join order.
+ * @param replicatedOnly {@code true} then query contains only replicated tables.
+ * @param loc Flag whether to execute query locally.
+ * @param pageSize Result batch size.
+ */
+ public VisorQueryTaskArg(String cacheName, String qryTxt,
+ boolean distributedJoins, boolean enforceJoinOrder, boolean replicatedOnly, boolean loc, int pageSize) {
+ this.cacheName = cacheName;
+ this.qryTxt = qryTxt;
+ this.distributedJoins = distributedJoins;
+ this.enforceJoinOrder = enforceJoinOrder;
+ this.replicatedOnly = replicatedOnly;
+ this.loc = loc;
+ this.pageSize = pageSize;
+ }
+
+ /**
+ * @return Cache name.
+ */
+ public String getCacheName() {
+ return cacheName;
+ }
+
+ /**
+ * @return Query txt.
+ */
+ public String getQueryText() {
+ return qryTxt;
+ }
+
+ /**
+ * @return Distributed joins enabled flag.
+ */
+ public boolean isDistributedJoins() {
+ return distributedJoins;
+ }
+
+ /**
+ * @return Enforce join order flag.
+ */
+ public boolean isEnforceJoinOrder() {
+ return enforceJoinOrder;
+ }
+
+ /**
+ * @return {@code true} If the query contains only replicated tables.
+ */
+ public boolean isReplicatedOnly() {
+ return replicatedOnly;
+ }
+
+ /**
+ * @return {@code true} If query should be executed locally.
+ */
+ public boolean isLocal() {
+ return loc;
+ }
+
+ /**
+ * @return Page size.
+ */
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void writeExternalData(ObjectOutput out) throws IOException {
+ U.writeString(out, cacheName);
+ U.writeString(out, qryTxt);
+ out.writeBoolean(distributedJoins);
+ out.writeBoolean(enforceJoinOrder);
+ out.writeBoolean(loc);
+ out.writeInt(pageSize);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+ cacheName = U.readString(in);
+ qryTxt = U.readString(in);
+ distributedJoins = in.readBoolean();
+ enforceJoinOrder = in.readBoolean();
+ loc = in.readBoolean();
+ pageSize = in.readInt();
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorQueryTaskArg.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorScanQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorScanQueryTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorScanQueryTask.java
index b8173ba..d200211 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorScanQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorScanQueryTask.java
@@ -45,19 +45,19 @@ import static org.apache.ignite.internal.visor.query.VisorQueryUtils.scheduleRes
* Task for execute SCAN query and get first page of results.
*/
@GridInternal
-public class VisorScanQueryTask extends VisorOneNodeTask<VisorScanQueryArg, VisorEither<VisorQueryResult>> {
+public class VisorScanQueryTask extends VisorOneNodeTask<VisorScanQueryTaskArg, VisorEither<VisorQueryResult>> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorScanQueryJob job(VisorScanQueryArg arg) {
+ @Override protected VisorScanQueryJob job(VisorScanQueryTaskArg arg) {
return new VisorScanQueryJob(arg, debug);
}
/**
* Job for execute SCAN query and get first page of results.
*/
- private static class VisorScanQueryJob extends VisorJob<VisorScanQueryArg, VisorEither<VisorQueryResult>> {
+ private static class VisorScanQueryJob extends VisorJob<VisorScanQueryTaskArg, VisorEither<VisorQueryResult>> {
/** */
private static final long serialVersionUID = 0L;
@@ -67,7 +67,7 @@ public class VisorScanQueryTask extends VisorOneNodeTask<VisorScanQueryArg, Viso
* @param arg Job argument.
* @param debug Debug flag.
*/
- private VisorScanQueryJob(VisorScanQueryArg arg, boolean debug) {
+ private VisorScanQueryJob(VisorScanQueryTaskArg arg, boolean debug) {
super(arg, debug);
}
@@ -78,7 +78,7 @@ public class VisorScanQueryTask extends VisorOneNodeTask<VisorScanQueryArg, Viso
* @param arg Job argument with query parameters.
* @return Query cursor.
*/
- private QueryCursor<Cache.Entry<Object, Object>> scan(IgniteCache<Object, Object> c, VisorScanQueryArg arg,
+ private QueryCursor<Cache.Entry<Object, Object>> scan(IgniteCache<Object, Object> c, VisorScanQueryTaskArg arg,
IgniteBiPredicate<Object, Object> filter) {
ScanQuery<Object, Object> qry = new ScanQuery<>(filter);
qry.setPageSize(arg.getPageSize());
@@ -98,7 +98,7 @@ public class VisorScanQueryTask extends VisorOneNodeTask<VisorScanQueryArg, Viso
}
/** {@inheritDoc} */
- @Override protected VisorEither<VisorQueryResult> run(final VisorScanQueryArg arg) {
+ @Override protected VisorEither<VisorQueryResult> run(final VisorScanQueryTaskArg arg) {
try {
IgniteCache<Object, Object> c = ignite.context().cache().jcache(arg.getCacheName());
UUID nid = ignite.localNode().id();
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorScanQueryTaskArg.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorScanQueryTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorScanQueryTaskArg.java
new file mode 100644
index 0000000..314a7c4
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorScanQueryTaskArg.java
@@ -0,0 +1,157 @@
+/*
+ * 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.visor.query;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorDataTransferObject;
+
+/**
+ * Arguments for {@link VisorScanQueryTask}.
+ */
+public class VisorScanQueryTaskArg extends VisorDataTransferObject {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** Cache name for query. */
+ private String cacheName;
+
+ /** Filter text. */
+ private String filter;
+
+ /** Filter is regular expression */
+ private boolean regEx;
+
+ /** Case sensitive filtration */
+ private boolean caseSensitive;
+
+ /** Scan of near cache */
+ private boolean near;
+
+ /** Flag whether to execute query locally. */
+ private boolean loc;
+
+ /** Result batch size. */
+ private int pageSize;
+
+ /**
+ * Default constructor.
+ */
+ public VisorScanQueryTaskArg() {
+ // No-op.
+ }
+
+ /**
+ * @param cacheName Cache name for query.
+ * @param filter Filter text.
+ * @param regEx Filter is regular expression.
+ * @param caseSensitive Case sensitive filtration.
+ * @param near Scan near cache.
+ * @param loc Flag whether to execute query locally.
+ * @param pageSize Result batch size.
+ */
+ public VisorScanQueryTaskArg(String cacheName, String filter, boolean regEx, boolean caseSensitive, boolean near,
+ boolean loc, int pageSize) {
+ this.cacheName = cacheName;
+ this.filter = filter;
+ this.regEx = regEx;
+ this.caseSensitive = caseSensitive;
+ this.near = near;
+ this.loc = loc;
+ this.pageSize = pageSize;
+ }
+
+ /**
+ * @return Cache name.
+ */
+ public String getCacheName() {
+ return cacheName;
+ }
+
+ /**
+ * @return Filter is regular expression.
+ */
+ public boolean isRegEx() {
+ return regEx;
+ }
+
+ /**
+ * @return Filter.
+ */
+ public String getFilter() {
+ return filter;
+ }
+
+ /**
+ * @return Case sensitive filtration.
+ */
+ public boolean isCaseSensitive() {
+ return caseSensitive;
+ }
+
+ /**
+ * @return Scan of near cache.
+ */
+ public boolean isNear() {
+ return near;
+ }
+
+ /**
+ * @return {@code true} if query should be executed locally.
+ */
+ public boolean isLocal() {
+ return loc;
+ }
+
+ /**
+ * @return Page size.
+ */
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void writeExternalData(ObjectOutput out) throws IOException {
+ U.writeString(out, cacheName);
+ U.writeString(out, filter);
+ out.writeBoolean(regEx);
+ out.writeBoolean(caseSensitive);
+ out.writeBoolean(near);
+ out.writeBoolean(loc);
+ out.writeInt(pageSize);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException {
+ cacheName = U.readString(in);
+ filter = U.readString(in);
+ regEx = in.readBoolean();
+ caseSensitive = in.readBoolean();
+ near = in.readBoolean();
+ loc = in.readBoolean();
+ pageSize = in.readInt();
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorScanQueryTaskArg.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 22124af..e5f80dd 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -978,8 +978,6 @@ org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl
org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserKeyCacheObjectImpl
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLA
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1
-org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLA
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2MLA
org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4
@@ -1425,6 +1423,7 @@ org.apache.ignite.internal.util.GridConsistentHash$1
org.apache.ignite.internal.util.GridConsistentHash$2
org.apache.ignite.internal.util.GridEmptyCloseableIterator
org.apache.ignite.internal.util.GridEmptyIterator
+org.apache.ignite.internal.util.GridIntList
org.apache.ignite.internal.util.GridLeanMap
org.apache.ignite.internal.util.GridLeanMap$LeanHashMap
org.apache.ignite.internal.util.GridLeanMap$Map1
@@ -1699,9 +1698,9 @@ org.apache.ignite.internal.visor.cache.VisorCacheResetMetricsTask
org.apache.ignite.internal.visor.cache.VisorCacheResetMetricsTask$VisorCacheResetMetricsJob
org.apache.ignite.internal.visor.cache.VisorCacheSqlIndexMetadata
org.apache.ignite.internal.visor.cache.VisorCacheSqlMetadata
-org.apache.ignite.internal.visor.cache.VisorCacheStartArg
org.apache.ignite.internal.visor.cache.VisorCacheStartTask
org.apache.ignite.internal.visor.cache.VisorCacheStartTask$VisorCacheStartJob
+org.apache.ignite.internal.visor.cache.VisorCacheStartTaskArg
org.apache.ignite.internal.visor.cache.VisorCacheStopTask
org.apache.ignite.internal.visor.cache.VisorCacheStopTask$VisorCacheStopJob
org.apache.ignite.internal.visor.cache.VisorCacheStoreConfiguration
@@ -1729,9 +1728,9 @@ org.apache.ignite.internal.visor.event.VisorGridEventsLost
org.apache.ignite.internal.visor.event.VisorGridJobEvent
org.apache.ignite.internal.visor.event.VisorGridTaskEvent
org.apache.ignite.internal.visor.file.VisorFileBlock
-org.apache.ignite.internal.visor.file.VisorFileBlockArg
org.apache.ignite.internal.visor.file.VisorFileBlockTask
org.apache.ignite.internal.visor.file.VisorFileBlockTask$VisorFileBlockJob
+org.apache.ignite.internal.visor.file.VisorFileBlockTaskArg
org.apache.ignite.internal.visor.file.VisorLatestTextFilesTask
org.apache.ignite.internal.visor.file.VisorLatestTextFilesTask$VisorLatestTextFilesJob
org.apache.ignite.internal.visor.file.VisorLatestTextFilesTaskArg
@@ -1753,10 +1752,10 @@ org.apache.ignite.internal.visor.igfs.VisorIgfsSamplingStateTask
org.apache.ignite.internal.visor.igfs.VisorIgfsSamplingStateTask$VisorIgfsSamplingStateJob
org.apache.ignite.internal.visor.igfs.VisorIgfsSamplingStateTaskArg
org.apache.ignite.internal.visor.log.VisorLogFile
-org.apache.ignite.internal.visor.log.VisorLogSearchArg
org.apache.ignite.internal.visor.log.VisorLogSearchResult
org.apache.ignite.internal.visor.log.VisorLogSearchTask
org.apache.ignite.internal.visor.log.VisorLogSearchTask$VisorLogSearchJob
+org.apache.ignite.internal.visor.log.VisorLogSearchTaskArg
org.apache.ignite.internal.visor.log.VisorLogSearchTaskResult
org.apache.ignite.internal.visor.misc.VisorAckTask
org.apache.ignite.internal.visor.misc.VisorAckTask$VisorAckJob
@@ -1808,7 +1807,6 @@ org.apache.ignite.internal.visor.node.VisorSpiDescription
org.apache.ignite.internal.visor.node.VisorSpisConfiguration
org.apache.ignite.internal.visor.node.VisorSuppressedError
org.apache.ignite.internal.visor.node.VisorTransactionConfiguration
-org.apache.ignite.internal.visor.query.VisorQueryArg
org.apache.ignite.internal.visor.query.VisorQueryCancelTask
org.apache.ignite.internal.visor.query.VisorQueryCancelTask$VisorCancelQueriesJob
org.apache.ignite.internal.visor.query.VisorQueryCleanupTask
@@ -1833,12 +1831,13 @@ org.apache.ignite.internal.visor.query.VisorQueryResult
org.apache.ignite.internal.visor.query.VisorQueryScanRegexFilter
org.apache.ignite.internal.visor.query.VisorQueryTask
org.apache.ignite.internal.visor.query.VisorQueryTask$VisorQueryJob
+org.apache.ignite.internal.visor.query.VisorQueryTaskArg
org.apache.ignite.internal.visor.query.VisorRunningQueriesCollectorTask
org.apache.ignite.internal.visor.query.VisorRunningQueriesCollectorTask$VisorCollectRunningQueriesJob
org.apache.ignite.internal.visor.query.VisorRunningQuery
-org.apache.ignite.internal.visor.query.VisorScanQueryArg
org.apache.ignite.internal.visor.query.VisorScanQueryTask
org.apache.ignite.internal.visor.query.VisorScanQueryTask$VisorScanQueryJob
+org.apache.ignite.internal.visor.query.VisorScanQueryTaskArg
org.apache.ignite.internal.visor.service.VisorCancelServiceTask
org.apache.ignite.internal.visor.service.VisorCancelServiceTask$VisorCancelServiceJob
org.apache.ignite.internal.visor.service.VisorServiceDescriptor
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
index f35ed52..8e46ffc 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
@@ -138,7 +138,7 @@ class VisorCacheScanCommand {
val firstPage =
try
executeRandom(groupForDataNode(node, cacheName),
- classOf[VisorScanQueryTask], new VisorScanQueryArg(cacheName, null, false, false, false, false, pageSize)) match {
+ classOf[VisorScanQueryTask], new VisorScanQueryTaskArg(cacheName, null, false, false, false, false, pageSize)) match {
case x if x.getError != null =>
error(x.getError)
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/web-console/backend/app/browsersHandler.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/app/browsersHandler.js b/modules/web-console/backend/app/browsersHandler.js
index 793fd5b..d77d9ce 100644
--- a/modules/web-console/backend/app/browsersHandler.js
+++ b/modules/web-console/backend/app/browsersHandler.js
@@ -199,8 +199,8 @@ module.exports.factory = (_, socketio, configure, errors) => {
const internalVisor = (postfix) => `org.apache.ignite.internal.visor.${postfix}`;
- this.registerVisorTask('querySql', internalVisor('query.VisorQueryTask'), internalVisor('query.VisorQueryArg'));
- this.registerVisorTask('queryScan', internalVisor('query.VisorScanQueryTask'), internalVisor('query.VisorScanQueryArg'));
+ this.registerVisorTask('querySql', internalVisor('query.VisorQueryTask'), internalVisor('query.VisorQueryTaskArg'));
+ this.registerVisorTask('queryScan', internalVisor('query.VisorScanQueryTask'), internalVisor('query.VisorScanQueryTaskArg'));
this.registerVisorTask('queryFetch', internalVisor('query.VisorQueryNextPageTask'), internalVisor('query.VisorQueryNextPageTaskArg'));
this.registerVisorTask('queryClose', internalVisor('query.VisorQueryCleanupTask'),
'java.util.Map', 'java.util.UUID', 'java.util.Set');
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/web-console/frontend/app/modules/cluster/Cache.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/cluster/Cache.js b/modules/web-console/frontend/app/modules/cluster/Cache.js
index 5007900..4918a7c 100644
--- a/modules/web-console/frontend/app/modules/cluster/Cache.js
+++ b/modules/web-console/frontend/app/modules/cluster/Cache.js
@@ -1,10 +1,18 @@
/*
- * Copyright (C) GridGain Systems. All Rights Reserved.
- * _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ * 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.
*/
export default class Cache {
http://git-wip-us.apache.org/repos/asf/ignite/blob/920673c4/modules/web-console/frontend/app/modules/cluster/CacheMetrics.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/cluster/CacheMetrics.js b/modules/web-console/frontend/app/modules/cluster/CacheMetrics.js
index ab1fd8c..90d3a9b 100644
--- a/modules/web-console/frontend/app/modules/cluster/CacheMetrics.js
+++ b/modules/web-console/frontend/app/modules/cluster/CacheMetrics.js
@@ -1,10 +1,18 @@
/*
- * Copyright (C) GridGain Systems. All Rights Reserved.
- * _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ * 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.
*/
export default class CacheMetrics {