You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/08/21 12:49:21 UTC

[1/2] ignite git commit: Removed temporary added file.

Repository: ignite
Updated Branches:
  refs/heads/master 97b3cef37 -> 60c056098


Removed temporary added file.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a871006b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a871006b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a871006b

Branch: refs/heads/master
Commit: a871006b2e904a173114d67564056317b434d94d
Parents: e678c81
Author: sboikov <sb...@gridgain.com>
Authored: Mon Aug 21 15:49:02 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Aug 21 15:49:02 2017 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/TestDebugLog.java    | 219 -------------------
 1 file changed, 219 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a871006b/modules/core/src/main/java/org/apache/ignite/TestDebugLog.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/TestDebugLog.java b/modules/core/src/main/java/org/apache/ignite/TestDebugLog.java
deleted file mode 100644
index 94c5eb2..0000000
--- a/modules/core/src/main/java/org/apache/ignite/TestDebugLog.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * 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;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.ignite.internal.processors.cache.KeyCacheObject;
-import org.apache.ignite.internal.util.typedef.internal.U;
-
-/**
- * TODO
- */
-public class TestDebugLog {
-    /** */
-    private static final List<Object> msgs = Collections.synchronizedList(new ArrayList<>(100_000));
-
-    /** */
-    private static final SimpleDateFormat DEBUG_DATE_FMT = new SimpleDateFormat("HH:mm:ss,SSS");
-
-    static class Message {
-        String thread = Thread.currentThread().getName();
-
-        String msg;
-
-        long ts = U.currentTimeMillis();
-
-        public Message(String msg) {
-            this.msg = msg;
-        }
-
-        public String toString() {
-            return "Msg [msg=" + msg + ", thread=" + thread + ", time=" + DEBUG_DATE_FMT.format(new Date(ts)) + ']';
-        }
-    }
-
-    static class EntryMessage extends Message {
-        Object key;
-        Object val;
-
-        public EntryMessage(Object key, Object val, String msg) {
-            super(msg);
-
-            this.key = key;
-            this.val = val;
-        }
-
-        public String toString() {
-            return "EntryMsg [key=" + key + ", val=" + val + ", msg=" + msg + ", thread=" + thread + ", time=" + DEBUG_DATE_FMT.format(new Date(ts)) + ']';
-        }
-    }
-
-    static class PartMessage extends Message {
-        int p;
-        Object val;
-
-        public PartMessage(int p, Object val, String msg) {
-            super(msg);
-
-            this.p = p;
-            this.val = val;
-        }
-
-        public String toString() {
-            return "PartMessage [p=" + p + ", val=" + val + ", msg=" + msg + ", thread=" + thread + ", time=" + DEBUG_DATE_FMT.format(new Date(ts)) + ']';
-        }
-    }
-
-    static final boolean out = false;
-
-    public static void addMessage(String msg) {
-        msgs.add(new Message(msg));
-
-        if (out)
-            System.out.println(msg);
-    }
-
-    public static void addEntryMessage(Object key, Object val, String msg) {
-        if (key instanceof KeyCacheObject)
-            key = ((KeyCacheObject)key).value(null, false);
-
-        EntryMessage msg0 = new EntryMessage(key, val, msg);
-
-        msgs.add(msg0);
-
-        if (out) {
-            System.out.println(msg0.toString());
-
-            System.out.flush();
-        }
-    }
-
-    public static void addPartMessage(int p, Object val, String msg) {
-        PartMessage msg0 = new PartMessage(p, val, msg);
-
-        msgs.add(msg0);
-
-        if (out) {
-            System.out.println(msg0.toString());
-
-            System.out.flush();
-        }
-    }
-
-    public static void printMessages(boolean file, Integer part) {
-        List<Object> msgs0;
-
-        synchronized (msgs) {
-            msgs0 = new ArrayList<>(msgs);
-
-            msgs.clear();
-        }
-
-        if (file) {
-            try {
-                FileOutputStream out = new FileOutputStream("test_debug.log");
-
-                PrintWriter w = new PrintWriter(out);
-
-                for (Object msg : msgs0) {
-                    if (part != null && msg instanceof PartMessage) {
-                        if (((PartMessage) msg).p != part)
-                            continue;
-                    }
-
-                    w.println(msg.toString());
-                }
-
-                w.close();
-
-                out.close();
-            }
-            catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        else {
-            for (Object msg : msgs0)
-                System.out.println(msg);
-        }
-    }
-
-    public static void printKeyMessages(boolean file, Object key) {
-        List<Object> msgs0;
-
-        synchronized (msgs) {
-            msgs0 = new ArrayList<>(msgs);
-
-            msgs.clear();
-        }
-
-        if (file) {
-            try {
-                FileOutputStream out = new FileOutputStream("test_debug.log");
-
-                PrintWriter w = new PrintWriter(out);
-
-                for (Object msg : msgs0) {
-                    if (msg instanceof EntryMessage && !((EntryMessage)msg).key.equals(key))
-                        continue;
-
-                    w.println(msg.toString());
-                }
-
-                w.close();
-
-                out.close();
-            }
-            catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        else {
-            for (Object msg : msgs0) {
-                if (msg instanceof EntryMessage && !((EntryMessage)msg).key.equals(key))
-                    continue;
-
-                System.out.println(msg);
-            }
-        }
-    }
-
-    public static void clear() {
-        msgs.clear();
-    }
-
-    public static void clearEntries() {
-        for (Iterator it = msgs.iterator(); it.hasNext();) {
-            Object msg = it.next();
-
-            if (msg instanceof EntryMessage)
-                it.remove();
-        }
-    }
-
-    public static void main(String[] args) {
-    }
-}
\ No newline at end of file


[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60c05609
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60c05609
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60c05609

Branch: refs/heads/master
Commit: 60c0560989a9039f3e20897e8d2bece681d32d79
Parents: a871006 97b3cef
Author: sboikov <sb...@gridgain.com>
Authored: Mon Aug 21 15:49:18 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Aug 21 15:49:18 2017 +0300

----------------------------------------------------------------------
 modules/web-console/frontend/app/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------