# HG changeset patch # User one # Date 1423933617 -32400 # Node ID 17cc11b04157d9c608c56a486b76b4833282f90a # Parent 190890be73e4d5892c097a25b9c8668933acef45 change read function for transactionPerSecond diff -r 190890be73e4 -r 17cc11b04157 src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/FJTreeMapSetTime.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/FJTreeMapSetTime.java Fri Dec 26 12:04:00 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/FJTreeMapSetTime.java Sun Feb 15 02:06:57 2015 +0900 @@ -14,10 +14,10 @@ public class FJTreeMapSetTime { public static void main(String args[]) throws IOException { - System.out.println("putaaa"); + System.out.println("put"); File putFile = new File("./time/fjPut"); PrintWriter putPw = new PrintWriter(new BufferedWriter(new FileWriter(putFile))); - File getFile = new File("./time/fjGet"); + File getFile = new File("./time/newFjGet"); PrintWriter getPw = new PrintWriter(new BufferedWriter(new FileWriter(getFile))); TreeMap map = TreeMap.empty(Ord.intOrd); long t1 = 0; @@ -29,7 +29,7 @@ map = map.set(count, count); t2 = System.currentTimeMillis(); if (count % 100 == 0 && count != 0) { - System.out.println("put time " + count + " " + (t2 - t1)); + System.out.println("put time " + " " + (t2 - t1)); long sum = 0; for (int count1 = 0; count1 < 20; count1++) { Random ran = new Random(); @@ -49,5 +49,3 @@ } } - - diff -r 190890be73e4 -r 17cc11b04157 src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/ReadJungleThread.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/ReadJungleThread.java Fri Dec 26 12:04:00 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/ReadJungleThread.java Sun Feb 15 02:06:57 2015 +0900 @@ -3,18 +3,19 @@ import java.util.Iterator; import java.util.Random; +import jp.ac.u_ryukyu.cr.ie.tatsuki.xmlTestBbs.JuGrix; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.traverser.InterfaceTraverser; public class ReadJungleThread extends Thread { - JungleTree tree; + JuGrix jugrix; int findCount; boolean loop = true; - public ReadJungleThread(JungleTree tree) { - this.tree = tree; + public ReadJungleThread(JuGrix jugrix) { + this.jugrix = jugrix; this.findCount = 0; } @@ -33,22 +34,9 @@ findCount++; Random rnd = new Random(); - String value = String.valueOf(rnd.nextInt(1000)); - InterfaceTraverser traverser = tree.getTraverser(true); - Iterator resultIterator = traverser.find( - (TreeNode node) -> { - String nodeValue = node.getAttributes().getString("KEY"); - if (nodeValue == null) - return false; - if (nodeValue.equals(value)) - return true; - return false; - }, "KEY", value); - - for (; resultIterator.hasNext();) { - resultIterator.next(); - } - + String value = String.valueOf(rnd.nextInt(400)); + boolean account = jugrix.isActive("p:" + value,"v:1"); + // System.out.println(account); } } } diff -r 190890be73e4 -r 17cc11b04157 src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/TimeMeasurementJuGrixFunction.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/TimeMeasurementJuGrixFunction.java Fri Dec 26 12:04:00 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/TimeMeasurementJuGrixFunction.java Sun Feb 15 02:06:57 2015 +0900 @@ -14,12 +14,12 @@ import org.xml.sax.SAXException; -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import jp.ac.u_ryukyu.cr.ie.tatsuki.xmlTestBbs.JuGrix; public class TimeMeasurementJuGrixFunction { static int roopCount = 10; - static boolean useIndex = true; + static boolean useIndex = false; static LinkedList functionTimeLinkedList = new LinkedList(); static int maxPersonCount = 1000; @@ -48,18 +48,17 @@ int ran = random.nextInt(28); orgId = "o:" + String.valueOf(ran + 1); - ran = random.nextInt(30); - personId = "p:" + String.valueOf(ran + 1); + ran = random.nextInt(personCount - 1); + personId = "p:" + String.valueOf((personCount - 1));//String.valueOf(ran + 1); t1 = System.currentTimeMillis(); functions(jugrix, orgId, personId, filterIds); t2 = System.currentTimeMillis(); sumTime = (t2 - t1) + sumTime; - System.out.println(count + "回目=" + (t2 - t1) + "s"); } getFunctionTimes(personCount); - System.out.println("平均 = " + (sumTime / 10) + "s"); + System.out.println("PersonCount = " + personCount + " : 平均 = " + (sumTime / 10) + "s"); personCount = personCount + 100; } System.out.println("end"); @@ -121,7 +120,7 @@ functionName = "stringPathToId"; break; } - File file = new File("./time/function/" + functionName); + File file = new File("./time/function/" + useIndex + functionName); PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(file, true))); diff -r 190890be73e4 -r 17cc11b04157 src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/TransactionPerSecondMeasurement.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/TransactionPerSecondMeasurement.java Fri Dec 26 12:04:00 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/TransactionPerSecondMeasurement.java Sun Feb 15 02:06:57 2015 +0900 @@ -8,6 +8,11 @@ import java.nio.ByteBuffer; import java.util.Random; +import javax.xml.parsers.ParserConfigurationException; + +import org.xml.sax.SAXException; + +import jp.ac.u_ryukyu.cr.ie.tatsuki.xmlTestBbs.JuGrix; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; @@ -19,35 +24,38 @@ public class TransactionPerSecondMeasurement { - public static void main(String[] args) throws InterruptedException, IOException { - Jungle jungle = new DefaultJungle(null, "hoge", new DefaultTreeEditor(new DefaultTraverser())); - JungleTree tree = jungle.createNewTree("testTree"); - JungleTreeEditor editor = tree.getTreeEditor(); - editor = createTree(0, new DefaultNodePath(), editor); - System.out.println("endCreateTree"); - editor = editor.success().b(); - System.out.println(Runtime.getRuntime().availableProcessors()); + public static void main(String[] args) throws InterruptedException, IOException, ParserConfigurationException, SAXException { +// Jungle jungle = new DefaultJungle(null, "hoge", new DefaultTreeEditor(new DefaultTraverser())); +// JungleTree tree = jungle.createNewTree("testTree"); +// JungleTreeEditor editor = tree.getTreeEditor(); +// editor = createTree(0, new DefaultNodePath(), editor); + JuGrix jugrix = extendXmlTree.createJuGrix(true,100); + System.out.println("endCreatejugrixa "); +// editor = editor.success().b(); + System.out.println(Runtime.getRuntime().availableProcessors()); if (args.length > 0) { + if (args[0].equals("read")) - readOnly(tree); + readOnly(jugrix); if (args[0].equals("write")) - readAndWrite(tree); + readAndWrite(jugrix); + } else System.out.println("Please with the argument"); } - private static void readAndWrite(JungleTree tree) throws InterruptedException, IOException { + private static void readAndWrite(JuGrix jugrix) throws InterruptedException, IOException { System.out.println("read and write"); File file = new File("./time/readAndWrite"); PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(file))); for (int THREAD_COUNT = 1; THREAD_COUNT <= 12; THREAD_COUNT++) { ReadJungleThread readThread[] = new ReadJungleThread[THREAD_COUNT]; for (int count = 0; THREAD_COUNT > count; count++) { - readThread[count] = new ReadJungleThread(tree); + readThread[count] = new ReadJungleThread(jugrix); } - WriteJungleThread writeThread = new WriteJungleThread(tree); + WriteJungleThread writeThread = new WriteJungleThread(null); writeThread.start(); for (int count = 0; THREAD_COUNT > count; count++) { readThread[count].start(); @@ -73,15 +81,15 @@ pw.close(); } - private static void readOnly(JungleTree tree) throws InterruptedException, IOException { - System.out.println("read only"); + private static void readOnly(JuGrix jugrix) throws InterruptedException, IOException { + System.out.println("read onlya"); File file = new File("./time/readOnly"); PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(file))); for (int THREAD_COUNT = 1; THREAD_COUNT <= 12; THREAD_COUNT++) { ReadJungleThread readThread[] = new ReadJungleThread[THREAD_COUNT]; ; for (int count = 0; THREAD_COUNT > count; count++) { - readThread[count] = new ReadJungleThread(tree); + readThread[count] = new ReadJungleThread(jugrix); } for (int count = 0; THREAD_COUNT > count; count++) { diff -r 190890be73e4 -r 17cc11b04157 src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/extendXmlTree.java --- a/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/extendXmlTree.java Fri Dec 26 12:04:00 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/tatsuki/xml/extendXmlTree.java Sun Feb 15 02:06:57 2015 +0900 @@ -17,7 +17,7 @@ import org.xml.sax.SAXException; -import jp.ac.u_ryukyu.cr.ie.tatsuki.bbs.JuGrix; +import jp.ac.u_ryukyu.cr.ie.tatsuki.xmlTestBbs.JuGrix; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.DefaultJungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.Jungle; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.JungleTree; @@ -34,7 +34,7 @@ public static void main(String args[]) throws FileNotFoundException, ParserConfigurationException, SAXException, IOException { - + System.out.println("extendXmlTree"); if (args.length != 2) { System.out.println("Arguments are two necessary , first person count, second use Index"); return; @@ -59,6 +59,7 @@ // JungleTree readXmlTree = readXml("Person", jungle); JungleTree orgTree = readXml("Organization", jungle); JungleTree roleTree = readXml("Role", jungle); + JungleTree rdeTree = readXml("RoleDescriptionElement",jungle); JungleTreeEditor editor = readXmlTree.getTreeEditor(); NodePath path = new DefaultNodePath(); editor = editor.addNewChildAt(path, 0).b(); @@ -78,7 +79,7 @@ System.out.println("create person time = " + (stop - start)); System.out.println("person count = " + personCount); editor.success(); - JuGrix jugrix = new JuGrix(useIndex, readXmlTree, orgTree, roleTree); + JuGrix jugrix = new JuGrix(useIndex, readXmlTree, orgTree, roleTree,rdeTree); return jugrix; }