kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mahong...@apache.org
Subject [05/52] [abbrv] incubator-kylin git commit: KYLIN-759 clean log setttings
Date Fri, 15 May 2015 05:21:34 GMT
KYLIN-759 clean log setttings


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

Branch: refs/heads/0.8.0
Commit: 60d94fa55bfed1876dbbecb821aa5323c5cbffb4
Parents: 9179235
Author: honma <honma@ebay.com>
Authored: Thu May 14 20:17:41 2015 +0800
Committer: honma <honma@ebay.com>
Committed: Thu May 14 20:22:04 2015 +0800

----------------------------------------------------------------------
 .../kylin/storage/cache/StreamSQLResult.java    |  1 -
 .../apache/kylin/storage/cache/EhcacheTest.java | 10 +++-
 streaming/src/test/resources/log4j.xml          | 51 --------------------
 3 files changed, 9 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/60d94fa5/storage/src/main/java/org/apache/kylin/storage/cache/StreamSQLResult.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/cache/StreamSQLResult.java b/storage/src/main/java/org/apache/kylin/storage/cache/StreamSQLResult.java
index 924044b..57dbd67 100644
--- a/storage/src/main/java/org/apache/kylin/storage/cache/StreamSQLResult.java
+++ b/storage/src/main/java/org/apache/kylin/storage/cache/StreamSQLResult.java
@@ -17,7 +17,6 @@ import java.util.NavigableMap;
 
 /**
  */
-
 public class StreamSQLResult {
     private Range<Long> timeCovered;
     private NavigableMap<Long, List<ITuple>> sortedRows;

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/60d94fa5/storage/src/test/java/org/apache/kylin/storage/cache/EhcacheTest.java
----------------------------------------------------------------------
diff --git a/storage/src/test/java/org/apache/kylin/storage/cache/EhcacheTest.java b/storage/src/test/java/org/apache/kylin/storage/cache/EhcacheTest.java
index fe390de..2751196 100644
--- a/storage/src/test/java/org/apache/kylin/storage/cache/EhcacheTest.java
+++ b/storage/src/test/java/org/apache/kylin/storage/cache/EhcacheTest.java
@@ -1,5 +1,6 @@
 package org.apache.kylin.storage.cache;
 
+import com.google.common.collect.Lists;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
@@ -7,9 +8,10 @@ import net.sf.ehcache.config.CacheConfiguration;
 import net.sf.ehcache.config.Configuration;
 import net.sf.ehcache.config.PersistenceConfiguration;
 import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
-
 import org.junit.Test;
 
+import java.util.List;
+
 /**
  */
 public class EhcacheTest {
@@ -36,6 +38,12 @@ public class EhcacheTest {
         System.out.println("runtime used memory: " + (Runtime.getRuntime().totalMemory()
- Runtime.getRuntime().freeMemory()) / 1024 / 1024 + "M");
         byte[] blob = new byte[(1024 * 40 * 1024)];//400M
 
+        List<String> manyObjects = Lists.newArrayList();
+        for (int i = 0; i < 10000; i++) {
+            manyObjects.add(new String("" + i));
+        }
+        testCache.put(new Element("0", manyObjects));
+
         testCache.put(new Element("1", blob));
         System.out.println(testCache.get("1") == null);
         System.out.println(testCache.getSize());

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/60d94fa5/streaming/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/streaming/src/test/resources/log4j.xml b/streaming/src/test/resources/log4j.xml
deleted file mode 100644
index a0afa96..0000000
--- a/streaming/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ /*
-  ~
-  ~ * 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.
-  ~
-  ~ */
-  -->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration debug="true"
-                     xmlns:log4j='http://jakarta.apache.org/log4j/'>
-
-    <appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{dd MMM yyyy HH:mm:ss} %5p %c{1}
- %m%n"/>
-        </layout>
-    </appender>
-
-    <root>
-        <level value="INFO"/>
-        <appender-ref ref="consoleAppender"/>
-    </root>
-
-</log4j:configuration>
\ No newline at end of file


Mime
View raw message