diff --git a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoEmbeddedObjectProcessor.java b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoEmbeddedObjectProcessor.java index 88e7a764a..88fa0e92b 100755 --- a/src/main/java/io/mycat/backend/jdbc/mongodb/MongoEmbeddedObjectProcessor.java +++ b/src/main/java/io/mycat/backend/jdbc/mongodb/MongoEmbeddedObjectProcessor.java @@ -141,7 +141,7 @@ private static Class getParameterizedClass(Field field) { if (pt.getActualTypeArguments() == null || pt.getActualTypeArguments().length == 0) { return null; } - parameterizedType = pt.getActualTypeArguments()[0].getTypeName(); + parameterizedType = pt.getActualTypeArguments()[0].toString(); } else { return null; } diff --git a/src/main/java/io/mycat/config/model/SystemConfig.java b/src/main/java/io/mycat/config/model/SystemConfig.java index 15169ce1e..77da29458 100644 --- a/src/main/java/io/mycat/config/model/SystemConfig.java +++ b/src/main/java/io/mycat/config/model/SystemConfig.java @@ -72,7 +72,7 @@ public final class SystemConfig { private static final String DEFAULT_CLUSTER_HEARTBEAT_PASS = "_HEARTBEAT_PASS_"; private static final int DEFAULT_PARSER_COMMENT_VERSION = 50148; private static final int DEFAULT_SQL_RECORD_COUNT = 10; - private static final boolean DEFAULT_USE_ZK_SWITCH = true; + private static final boolean DEFAULT_USE_ZK_SWITCH = false; private int maxStringLiteralLength = 65535; private int frontWriteQueueSize = 2048; private String bindIp = "0.0.0.0"; diff --git a/src/main/resources/server.xml b/src/main/resources/server.xml index 09467e4b9..9777c8274 100644 --- a/src/main/resources/server.xml +++ b/src/main/resources/server.xml @@ -62,7 +62,7 @@ - true + false diff --git a/src/test/java/io/mycat/buffer/TestByteBufferArena.java b/src/test/java/io/mycat/buffer/TestByteBufferArena.java index eaf5296ae..55bce2456 100644 --- a/src/test/java/io/mycat/buffer/TestByteBufferArena.java +++ b/src/test/java/io/mycat/buffer/TestByteBufferArena.java @@ -47,8 +47,8 @@ public void testAllocate() { @Test public void testAllocateDirect() { - int pageSize = 1024 * 1024 * 100; - int allocTimes = 1024; + int pageSize = 1024 ; + int allocTimes = 100; DirectByteBufferPool pool = new DirectByteBufferPool(pageSize, (short) 256, (short) 8,0); long start = System.currentTimeMillis(); for (int i = 0; i < allocTimes; i++) { @@ -65,7 +65,7 @@ public void testAllocateDirect() { //System.out.println("recycle usage "+(System.nanoTime()-start)); } long used = (System.currentTimeMillis() - start); - System.out.println("DirectByteBufferPool total used time " + used + " avg speed " + allocTimes / used); +// System.out.println("DirectByteBufferPool total used time " + used + " avg speed " + allocTimes / used); } @Test diff --git a/src/test/java/io/mycat/buffer/TestDirectByteBufferPool.java b/src/test/java/io/mycat/buffer/TestDirectByteBufferPool.java index 3fd146a33..76ba5ebdc 100644 --- a/src/test/java/io/mycat/buffer/TestDirectByteBufferPool.java +++ b/src/test/java/io/mycat/buffer/TestDirectByteBufferPool.java @@ -15,7 +15,7 @@ public class TestDirectByteBufferPool { @Test public void testAllocate() { - int pageSize = 1024 * 1024 * 100; + int pageSize = 1024 ; int allocTimes = 1024; DirectByteBufferPool pool = new DirectByteBufferPool(pageSize, (short) 256, (short) 8,0); long start = System.currentTimeMillis();