# HG changeset patch # User Nobuyasu Oshiro # Date 1390735200 -32400 # Node ID 1abd3c17cff941fc272967e373d576aee3649eb1 # Parent 388cd4555b3d7ccd3892021499c2e8eb1f546627 Added tree_conflict figures diff -r 388cd4555b3d -r 1abd3c17cff9 paper/abstract.tex --- a/paper/abstract.tex Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/abstract.tex Sun Jan 26 20:20:00 2014 +0900 @@ -5,10 +5,9 @@ スケーラビリティとは, ある複数のノードから構成される分散ソフトウェアがあるとき, その分散ソフトウェアに対して単純にノード を追加するだけで性能を線形に上昇させることができる性質である. そこで, スケーラビリティを持たせるためにアーキテクチャの設計から考えることにした. 当研究室では非破壊的木構造を用いたデータベースである Jungle を開発している. -非破壊的木構造とは, データの編集の際に一度木構造として保存したデータには触れず, 新しく木構造を作成してデータの編集を行うことを言う. -Jungle は分散データベースとして設計されていたが, データ分散や永続性といった部分の実装がまだ行われていない. +非破壊的木構造とは, データの編集の際に一度木構造として保存したデータを変更せず, 新しく木構造を作成してデータの編集を行うことを言う. -本研究では, Jungle に分散データベースの実装を行い, スケーラビリティをもつアーキテクチャの追求を行う. +本研究では, Jungle に分散データベースと永続性の実装を行った. データ分散部分には当研究室で開発中である並列分散フレームワークである Alice を使用した. 結果, 複数のサーバノード間でデータの分散を行うことを確認した. diff -r 388cd4555b3d -r 1abd3c17cff9 paper/chapter1.tex --- a/paper/chapter1.tex Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/chapter1.tex Sun Jan 26 20:20:00 2014 +0900 @@ -5,7 +5,8 @@ % NoSQL の説明も必要。 本章ではまずデータベースの種類である RDB と NoSQL について述べる. -その次に, 既存の NoSQL データベースとして Cassandra, MongoDB, Neo4j について述べる. +次に分散データシステムにおいて重要な CAP 定理について触れる. +最後に既存の NoSQL データベースとして Cassandra, MongoDB, Neo4j の特徴について述べる. \section{RDB と NoSQL} データベースは大別すると RDB と NoSQL に分けられる. @@ -82,7 +83,7 @@ MongoDB は保存したデータを複数のサーバに複製をとる. これはレプリケーション(replication)と呼ばれる. また, 1つのサーバが全てのデータを持つのでなく, ある範囲の値を別々の -サーバに分割(シャード)させて保持する. +サーバに分割させて保持する. これをシャーディング(sharding)という. MongoDB はレプリケーションとシャーディングにより分断耐性と一貫性を持つ. @@ -118,7 +119,7 @@ \begin{figure}[htpb] \begin{center} \includegraphics[scale=0.7]{figures/neo4j_replica.pdf} - \caption{Neo4j のクラスタ} + \caption{マスターとスレーブによるクラスタ} \label{fig:neo4j_replica} \end{center} \end{figure} diff -r 388cd4555b3d -r 1abd3c17cff9 paper/chapter2.tex --- a/paper/chapter2.tex Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/chapter2.tex Sun Jan 26 20:20:00 2014 +0900 @@ -1,7 +1,5 @@ \chapter{木構造データベースJungleの分散設計} - - \section{木構造データベースJungle} Jungle はスケーラビリティのある CMS の開発を目指して当研究室で開発されている非破壊的木構造データベースである. 一般的なコンテンツマネジメントシステムではブログツールや Wiki・SNS が多く, これらの @@ -154,16 +152,47 @@ -\section{データ衝突時におけるマージによる解決} -Jungle への分散実装を行うことである問題が発生する. -それは更新されたデータ同士が衝突を起こした時の処理である. -Jungle はリクエストがきた場合, 現在もっているデータを返す. -しかしそのデータは最新のものであるかは保証されない. -よって, 別のサーバノードで動いている Jungle からの更新データと衝突する可能性がある. + +\section{分散管理システムによるデータの分散} +Jungle は Git や Mercurial といった分散管理システムの機能を参考に作られている. +分散管理システムとは, +反対の意味の言葉として集中型バージョン管理システムがある. + + +\subsection{マージによるデータ変更衝突の解決} +分散管理システムでは, データの更新時において衝突が発生する時がある. +それは, 分散管理システムを参考にしている Jungle においても起こる問題である. +データの変更を行うときには, 元のデータに変更が加えられている状態かもしれない. +また, Jungle はリクエストがきた場合, 現在もっているデータを返す. +そのためデータは最新のものであるかは保証されない. +その場合, 古いデータに変更が加えられ, それを更に最新のデータへ伝搬させなければならない. +このデータ変更の衝突を解決する手段が必要である. +そこで + + +\begin{figure}[htpb] + \begin{center} + \includegraphics[scale=0.7]{figures/tree_conflict.pdf} + \caption{編集に衝突の発生しないデータ編集} + \label{fig:tree_conflict1} + \end{center} +\end{figure} + +\begin{figure}[htpb] + \begin{center} + \includegraphics[scale=0.7]{figures/tree_conflict2.pdf} + \caption{編集に衝突が発生するデータ編集} + \label{fig:tree_conflict2} + \end{center} +\end{figure} + この問題に対して Jungle はアプリケーションレベルでのマージを実装して貰うことで解決をはかる. + + + \section{データの永続性} @@ -183,5 +212,3 @@ - - diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/alice_topology.xbb --- a/paper/figures/alice_topology.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/alice_topology.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 386.000000 218.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:15 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/cap_theorem.xbb --- a/paper/figures/cap_theorem.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/cap_theorem.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 301.000000 231.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:15 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/cassandra.xbb --- a/paper/figures/cassandra.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/cassandra.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 336.000000 201.000000 %%PDFVersion: 1.3 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:15 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/cassandra_ring.xbb --- a/paper/figures/cassandra_ring.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/cassandra_ring.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 400.000000 290.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:15 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/cluster_benchmark.xbb --- a/paper/figures/cluster_benchmark.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/cluster_benchmark.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 479.000000 293.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:15 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/deos_proccess.xbb --- a/paper/figures/deos_proccess.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/deos_proccess.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 900.000000 619.500000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:15 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/destructive_tree.xbb --- a/paper/figures/destructive_tree.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/destructive_tree.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 404.000000 207.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:15 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/distribute_jungle.xbb --- a/paper/figures/distribute_jungle.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/distribute_jungle.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 245.000000 213.000000 %%PDFVersion: 1.3 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:15 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/dsandcs.xbb --- a/paper/figures/dsandcs.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/dsandcs.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 396.000000 256.000000 %%PDFVersion: 1.3 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:15 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/merge1.xbb --- a/paper/figures/merge1.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/merge1.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 427.000000 430.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/merge2.xbb --- a/paper/figures/merge2.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/merge2.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 427.000000 242.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/merge_imp1.xbb --- a/paper/figures/merge_imp1.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/merge_imp1.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 499.000000 243.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/merge_imp2.xbb --- a/paper/figures/merge_imp2.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/merge_imp2.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 467.000000 256.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/mongodb_sharding.pdf Binary file paper/figures/mongodb_sharding.pdf has changed diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/mongodb_sharding.xbb --- a/paper/figures/mongodb_sharding.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/mongodb_sharding.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -1,8 +1,8 @@ %%Title: ./mongodb_sharding.pdf %%Creator: extractbb 20130405 -%%BoundingBox: 0 0 406 219 -%%HiResBoundingBox: 0.000000 0.000000 406.000000 219.000000 +%%BoundingBox: 0 0 417 317 +%%HiResBoundingBox: 0.000000 0.000000 417.000000 317.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:15:03 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/neo4j_replica.xbb --- a/paper/figures/neo4j_replica.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/neo4j_replica.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 448.000000 262.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:15:03 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/network_topology_ring.xbb --- a/paper/figures/network_topology_ring.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/network_topology_ring.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 271.000000 236.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/network_topology_tree.xbb --- a/paper/figures/network_topology_tree.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/network_topology_tree.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 329.000000 237.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/nodepath.xbb --- a/paper/figures/nodepath.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/nodepath.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 315.000000 310.000000 %%PDFVersion: 1.3 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/non_destructive_edit1.xbb --- a/paper/figures/non_destructive_edit1.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/non_destructive_edit1.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 462.000000 207.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/non_destructive_edit2.xbb --- a/paper/figures/non_destructive_edit2.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/non_destructive_edit2.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 470.000000 240.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/non_destructive_edit3.xbb --- a/paper/figures/non_destructive_edit3.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/non_destructive_edit3.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 511.000000 211.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/non_destructive_edit4.xbb --- a/paper/figures/non_destructive_edit4.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/non_destructive_edit4.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 505.000000 218.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/non_destructive_merit.xbb --- a/paper/figures/non_destructive_merit.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/non_destructive_merit.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 350.000000 301.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/non_destructive_tree.xbb --- a/paper/figures/non_destructive_tree.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/non_destructive_tree.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 459.000000 207.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/nondestructive_edit1.xbb --- a/paper/figures/nondestructive_edit1.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/nondestructive_edit1.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 438.000000 207.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/putChildLog.xbb --- a/paper/figures/putChildLog.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/putChildLog.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 385.000000 149.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/putLog.xbb --- a/paper/figures/putLog.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/putLog.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 385.000000 149.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/read_result.xbb --- a/paper/figures/read_result.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/read_result.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 360.000000 252.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/tree_conflict.pdf Binary file paper/figures/tree_conflict.pdf has changed diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/tree_conflict.xbb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/paper/figures/tree_conflict.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -0,0 +1,8 @@ +%%Title: ./tree_conflict.pdf +%%Creator: extractbb 20130405 +%%BoundingBox: 0 0 448 181 +%%HiResBoundingBox: 0.000000 0.000000 448.000000 181.000000 +%%PDFVersion: 1.4 +%%Pages: 1 +%%CreationDate: Sun Jan 26 20:06:16 2014 + diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/tree_conflict2.pdf Binary file paper/figures/tree_conflict2.pdf has changed diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/tree_conflict2.xbb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/paper/figures/tree_conflict2.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -0,0 +1,8 @@ +%%Title: ./tree_conflict2.pdf +%%Creator: extractbb 20130405 +%%BoundingBox: 0 0 475 241 +%%HiResBoundingBox: 0.000000 0.000000 475.000000 241.000000 +%%PDFVersion: 1.4 +%%Pages: 1 +%%CreationDate: Sun Jan 26 20:06:16 2014 + diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/tree_topology.xbb --- a/paper/figures/tree_topology.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/tree_topology.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 684.000000 237.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/treeoperationlog1.xbb --- a/paper/figures/treeoperationlog1.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/treeoperationlog1.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 595.000000 258.000000 %%PDFVersion: 1.3 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/figures/write_result.xbb --- a/paper/figures/write_result.xbb Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/figures/write_result.xbb Sun Jan 26 20:20:00 2014 +0900 @@ -4,5 +4,5 @@ %%HiResBoundingBox: 0.000000 0.000000 360.000000 252.000000 %%PDFVersion: 1.4 %%Pages: 1 -%%CreationDate: Sun Jan 26 00:09:45 2014 +%%CreationDate: Sun Jan 26 20:06:16 2014 diff -r 388cd4555b3d -r 1abd3c17cff9 paper/graffle/mongodb_sharding.graffle --- a/paper/graffle/mongodb_sharding.graffle Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/graffle/mongodb_sharding.graffle Sun Jan 26 20:20:00 2014 +0900 @@ -52,6 +52,224 @@ GraphicsList + Bounds + {{368.59998416900635, 326}, {104.39999981007244, 49}} + Class + ShapedGraphic + ID + 27 + Shape + Rectangle + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 Node 3\ +\'82\'cc\'95\'a1\'90\'bb} + + + + Bounds + {{232.5499906539917, 326}, {104.39999981007244, 49}} + Class + ShapedGraphic + ID + 26 + Shape + Rectangle + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 Node 2\ +\'82\'cc\'95\'a1\'90\'bb} + + + + Bounds + {{107, 326}, {104.39999981007244, 49}} + Class + ShapedGraphic + ID + 25 + Shape + Rectangle + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 Node 1 \ +\'95\'a1\'90\'bb} + + + + Class + LineGraphic + Head + + ID + 21 + + ID + 24 + Points + + {410.29998334637543, 275.5} + {410.29998334637543, 316} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 10 + + + + Class + LineGraphic + Head + + ID + 20 + + ID + 23 + Points + + {279.49999929474103, 275.5} + {279.49999929474103, 316} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 9 + + + + Class + LineGraphic + Head + + ID + 19 + + ID + 22 + Points + + {148.70001315760115, 275.5} + {148.70001315760115, 316} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 5 + + + + Bounds + {{358.0999755859375, 316.5}, {104.39999981007244, 49}} + Class + ShapedGraphic + ID + 21 + Shape + Rectangle + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 \'83\'8c\'83\'76\'83\'8a\'83\'4a3} + + + + Bounds + {{227.29998779296875, 316.5}, {104.39999981007244, 49}} + Class + ShapedGraphic + ID + 20 + Shape + Rectangle + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 \'83\'8c\'83\'76\'83\'8a\'83\'4a2} + + + + Bounds + {{96.5, 316.5}, {104.39999981007244, 49}} + Class + ShapedGraphic + ID + 19 + Shape + Rectangle + + Class LineGraphic Head @@ -63,8 +281,8 @@ 18 Points - {308.47716485692126, 154.3496624262053} - {383.40030559640127, 227.65033757379473} + {309.27766479496364, 154.34473225221419} + {384.19325946411072, 225.65530972810561} Style @@ -98,8 +316,8 @@ 16 Points - {279.16205567781606, 154.49996484539707} - {278.29644200376941, 227.50003515460293} + {279.4999815337556, 154.5} + {279.4999815337556, 225.5} Style @@ -133,8 +351,8 @@ 15 Points - {249.8548193470852, 154.34554308315896} - {173.18470624702331, 227.65445691684104} + {249.72233520503642, 154.34473225221419} + {174.80674053588936, 225.65530972810564} Style @@ -187,7 +405,7 @@ Bounds - {{356.60000018992758, 228}, {104.39999981007244, 49}} + {{358.10000018992753, 226}, {104.39999981007244, 49}} Class ShapedGraphic ID @@ -208,7 +426,7 @@ Bounds - {{225.79999976204505, 228}, {104.39999981007244, 49}} + {{227.29999976204505, 226}, {104.39999981007244, 49}} Class ShapedGraphic ID @@ -268,7 +486,7 @@ Bounds - {{95.000000000000128, 228}, {104.39999981007244, 49}} + {{96.500000000000128, 226}, {104.39999981007244, 49}} Class ShapedGraphic ID @@ -335,7 +553,7 @@ MasterSheets ModificationDate - 2014-01-25 15:14:38 +0000 + 2014-01-26 09:13:49 +0000 Modifier Oshiro Nobuyasu NotesVisible @@ -416,7 +634,7 @@ Frame - {{35, 114}, {693, 922}} + {{156, 128}, {693, 922}} ListView OutlineWidth diff -r 388cd4555b3d -r 1abd3c17cff9 paper/graffle/tree_conflict.graffle --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/paper/graffle/tree_conflict.graffle Sun Jan 26 20:20:00 2014 +0900 @@ -0,0 +1,1666 @@ + + + + + ActiveLayerIndex + 0 + ApplicationVersion + + com.omnigroup.OmniGraffle + 139.18.0.187838 + + AutoAdjust + + BackgroundGraphic + + Bounds + {{0, 0}, {559, 783}} + Class + SolidGraphic + ID + 2 + Style + + shadow + + Draws + NO + + stroke + + Draws + NO + + + + BaseZoom + 0 + CanvasOrigin + {0, 0} + ColumnAlign + 1 + ColumnSpacing + 36 + CreationDate + 2014-01-26 09:28:43 +0000 + Creator + Oshiro Nobuyasu + DisplayScale + 1 0/72 in = 1 0/72 in + GraphDocumentVersion + 8 + GraphicsList + + + Bounds + {{371.5693359375, 335}, {100.1751708984375, 33}} + Class + ShapedGraphic + ID + 206 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 \'83\'66\'81\'5b\'83\'5e\'95\'d2\'8f\'57\'8a\'ae\'97\'b9} + + + + Class + Group + Graphics + + + Class + LineGraphic + Head + + ID + 196 + + ID + 195 + Points + + {438.11396076897717, 297.47787725736924} + {442.02754250412102, 309.27495601205476} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 203 + + + + Bounds + {{438.5711049584703, 308.51351763751063}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + FontInfo + + Color + + b + 0 + g + 0 + r + 0 + + + ID + 196 + Shape + Circle + Style + + fill + + Color + + b + 1 + g + 0 + r + 0 + + + + Text + + VerticalPad + 0 + + + + Class + LineGraphic + Head + + ID + 201 + + ID + 197 + Points + + {411.64493421679049, 297.85370126799415} + {414.55221514075549, 308.89180889242181} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 204 + + + + Class + LineGraphic + Head + + ID + 202 + + ID + 198 + Points + + {405.50382814405503, 297.30490688148694} + {401.20426358755208, 309.21133482513557} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 204 + + + + Class + LineGraphic + Head + + ID + 203 + + ID + 199 + Points + + {425.93319770156177, 265.85176668064923} + {430.98141835126694, 278.46698028696693} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 205 + + + + Class + LineGraphic + Head + + ID + 204 + + ID + 200 + Points + + {418.24898599782517, 265.67806370194864} + {412.79712808459487, 278.40788588252468} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 205 + + + + Bounds + {{410.55700981625978, 308.51351763751063}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 201 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{391, 308.51351763751063}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 202 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{427.99974830103241, 277.29730142129438}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 203 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{402.09992449030966, 277.29730142129438}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 204 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{415.3141203121067, 246.08108520507812}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 205 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + ID + 194 + + + Bounds + {{349, 213}, {75.489044189453125, 33}} + Class + ShapedGraphic + ID + 181 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 commit} + + + + Class + LineGraphic + ID + 179 + Points + + {146, 315} + {363, 315} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + Width + 3 + + + + + Class + LineGraphic + ID + 177 + Points + + {360.73761259723705, 245.34917094253402} + {395.57147433464593, 268.56975622437886} + + Rotation + 65 + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + Width + 3 + + + + + Bounds + {{214, 204}, {75.489044189453125, 33}} + Class + ShapedGraphic + ID + 152 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 \'83\'66\'81\'5b\'83\'5e\'95\'d2\'8f\'57} + + + + Bounds + {{90.40875244140625, 238}, {68, 33}} + Class + ShapedGraphic + ID + 151 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 \'83\'52\'83\'73\'81\'5b} + + + + Class + LineGraphic + ID + 150 + Points + + {234.32116788321156, 246.08108108108098} + {276.65693430656898, 246.08108108108098} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + Width + 3 + + + + + Class + Group + Graphics + + + Class + LineGraphic + Head + + ID + 184 + + ID + 183 + Points + + {331.85400955071634, 246.35660665858023} + {335.83187018643355, 258.10285276260691} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 191 + + + + Bounds + {{332.25723634533119, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + FontInfo + + Color + + b + 0 + g + 0 + r + 0 + + + ID + 184 + Shape + Circle + Style + + fill + + Color + + b + 1 + g + 0 + r + 0 + + + + Text + + VerticalPad + 0 + + + + Class + LineGraphic + Head + + ID + 189 + + ID + 185 + Points + + {305.39694063691275, 246.7334837557587} + {308.37502307228846, 257.72597390949142} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 192 + + + + Class + LineGraphic + Head + + ID + 190 + + ID + 186 + Points + + {299.23134477707754, 246.25679231217723} + {294.98360691980122, 258.20266773661365} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 192 + + + + Class + LineGraphic + Head + + ID + 191 + + ID + 187 + Points + + {319.6619640502135, 214.73247795456317} + {324.76693134739202, 227.29454874007524} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 193 + + + + Class + LineGraphic + Head + + ID + 192 + + ID + 188 + Points + + {311.96769106597571, 214.62778388729961} + {306.5613804156352, 227.39924338364901} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 193 + + + + Bounds + {{304.24314120312067, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 189 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{284.68613138686089, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 190 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{321.6858796878933, 226.21621621621622}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 191 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{295.78605587717055, 226.21621621621622}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 192 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{309.00025169896759, 194.99999999999994}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 193 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + ID + 182 + + + Class + LineGraphic + ID + 137 + Points + + {110.96350364963499, 288.64864864864887} + {146.72992700729921, 266.89189189189216} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + Width + 3 + + + + + Class + Group + Graphics + + + Class + LineGraphic + Head + + ID + 127 + + ID + 126 + Points + + {205.57931891632532, 246.35458638455006} + {209.56041717325451, 258.09840061909392} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 134 + + + + Bounds + {{205.97986408255719, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 127 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Class + LineGraphic + Head + + ID + 132 + + ID + 128 + Points + + {179.12289278955186, 246.73147959331703} + {182.10459128113052, 257.72179886668738} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 135 + + + + Class + LineGraphic + Head + + ID + 133 + + ID + 129 + Points + + {172.95591531339102, 246.25832766307249} + {168.71058506564236, 258.20610977339203} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 135 + + + + Class + LineGraphic + Head + + ID + 134 + + ID + 130 + Points + + {193.3861734076213, 214.73104945356928} + {198.49327184087448, 227.2911986072485} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 136 + + + + Class + LineGraphic + Head + + ID + 135 + + ID + 131 + Points + + {185.69167826966898, 214.62906185487654} + {180.28724952828, 227.40229283924143} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 136 + + + + Bounds + {{177.96576894034726, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 132 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{158.40875912408768, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 133 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{195.40850742511952, 226.21621621621622}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 134 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{169.50868361439686, 226.21621621621622}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 135 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{182.72287943619384, 194.99999999999994}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 136 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + ID + 125 + + + Class + Group + Graphics + + + Class + LineGraphic + Head + + ID + 103 + + ID + 102 + Points + + {93.168633786288524, 303.11279436350247} + {97.14740630370332, 314.85835428172953} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 110 + + + + Bounds + {{93.571104958469476, 314.18918918918916}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 103 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Class + LineGraphic + Head + + ID + 108 + + ID + 104 + Points + + {66.71127856210218, 303.48995775180771} + {69.689871224455814, 314.4821406789963} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 111 + + + + Class + LineGraphic + Head + + ID + 109 + + ID + 105 + Points + + {60.545473441518446, 303.01375467140457} + {56.298057997213704, 314.95988501649344} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 111 + + + + Class + LineGraphic + Head + + ID + 110 + + ID + 106 + Points + + {80.976179418544717, 271.48892158927106} + {86.081613785893936, 284.05057076411731} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 112 + + + + Class + LineGraphic + Head + + ID + 111 + + ID + 107 + Points + + {73.281851978181578, 271.38481547202952} + {67.875946090450114, 284.15665561362459} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 112 + + + + Bounds + {{65.557009816259551, 314.18918918918916}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 108 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{45.99999999999995, 314.18918918918916}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 109 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{82.999748301032028, 282.97297297297291}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 110 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{57.099924490309562, 282.97297297297291}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 111 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{70.314120312106567, 251.75675675675666}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 112 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + ID + 101 + + + GridInfo + + GuidesLocked + NO + GuidesVisible + YES + HPages + 1 + ImageCounter + 1 + KeepToScale + + Layers + + + Lock + NO + Name + Layer 1 + Print + YES + View + YES + + + LayoutInfo + + Animate + NO + circoMinDist + 18 + circoSeparation + 0.0 + layoutEngine + dot + neatoSeparation + 0.0 + twopiSeparation + 0.0 + + LinksVisible + NO + MagnetsVisible + NO + MasterSheets + + ModificationDate + 2014-01-26 10:27:45 +0000 + Modifier + Oshiro Nobuyasu + NotesVisible + NO + Orientation + 2 + OriginVisible + NO + PageBreaks + YES + PrintInfo + + NSBottomMargin + + float + 41 + + NSHorizonalPagination + + coded + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG + + NSLeftMargin + + float + 18 + + NSPaperSize + + size + {595, 842} + + NSPrintReverseOrientation + + int + 0 + + NSRightMargin + + float + 18 + + NSTopMargin + + float + 18 + + + PrintOnePage + + ReadOnly + NO + RowAlign + 1 + RowSpacing + 36 + SheetTitle + Canvas 1 + SmartAlignmentGuidesActive + YES + SmartDistanceGuidesActive + YES + UniqueID + 1 + UseEntirePage + + VPages + 1 + WindowInfo + + CurrentSheet + 0 + ExpandedCanvases + + + name + Canvas 1 + + + Frame + {{183, 126}, {693, 922}} + ListView + + OutlineWidth + 142 + RightSidebar + + ShowRuler + + Sidebar + + SidebarWidth + 120 + VisibleRegion + {{0, 0}, {558, 783}} + Zoom + 1 + ZoomValues + + + Canvas 1 + 1 + 1 + + + + + diff -r 388cd4555b3d -r 1abd3c17cff9 paper/graffle/tree_conflict2.graffle --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/paper/graffle/tree_conflict2.graffle Sun Jan 26 20:20:00 2014 +0900 @@ -0,0 +1,2086 @@ + + + + + ActiveLayerIndex + 0 + ApplicationVersion + + com.omnigroup.OmniGraffle + 139.18.0.187838 + + AutoAdjust + + BackgroundGraphic + + Bounds + {{0, 0}, {559, 783}} + Class + SolidGraphic + ID + 2 + Style + + shadow + + Draws + NO + + stroke + + Draws + NO + + + + BaseZoom + 0 + CanvasOrigin + {0, 0} + ColumnAlign + 1 + ColumnSpacing + 36 + CreationDate + 2014-01-26 10:39:42 +0000 + Creator + Oshiro Nobuyasu + DisplayScale + 1 0/72 in = 1 0/72 in + GraphDocumentVersion + 8 + GraphicsList + + + Bounds + {{90.40875244140625, 347}, {68, 33}} + Class + ShapedGraphic + ID + 236 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 \'83\'52\'83\'73\'81\'5b} + + + + Bounds + {{396.17517852783203, 327}, {94, 33}} + Class + ShapedGraphic + ID + 235 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 \'83\'66\'81\'5b\'83\'5e\'95\'d2\'8f\'57A\'82\'c6B\'82\'f0\'8e\'f3\'82\'af\'82\'bd\'96\'d8} + + + + Bounds + {{211.5, 315.11029052734375}, {80.489044189453125, 33}} + Class + ShapedGraphic + ID + 234 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 \'83\'66\'81\'5b\'83\'5e\'95\'d2\'8f\'57B} + + + + Bounds + {{396.5040283203125, 275.89190316200256}, {75.489044189453125, 59.10809326171875}} + Class + ShapedGraphic + ID + 181 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs72 \cf0 ?} + + + + Class + LineGraphic + ID + 233 + Points + + {360.73760986328125, 348.75675675675672} + {396.50403322094547, 327} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + Width + 3 + + + + + Class + Group + Graphics + + + Class + LineGraphic + Head + + ID + 223 + + ID + 222 + Points + + {331.83413158698716, 362.371537576653} + {335.78808365904365, 374.13611888193077} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 230 + + + + Bounds + {{332.2572621850328, 373.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + FontInfo + + Color + + b + 0 + g + 0 + r + 0 + + + ID + 223 + Shape + Circle + Style + + fill + + Color + + b + 1 + g + 0 + r + 0 + + + + Text + + VerticalPad + 0 + + + + Class + LineGraphic + Head + + ID + 228 + + ID + 224 + Points + + {305.3771877689781, 362.74534918762811} + {308.33384349904316, 373.75101544048749} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 231 + + + + Class + LineGraphic + Head + + ID + 229 + + ID + 225 + Points + + {299.25107491162908, 362.27231254206094} + {295.02765241813381, 374.23775439486303} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 231 + + + + Class + LineGraphic + Head + + ID + 230 + + ID + 226 + Points + + {319.6432840128661, 330.74931156191991} + {324.7231887011659, 343.33437957259753} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 232 + + + + Class + LineGraphic + Head + + ID + 231 + + ID + 227 + Points + + {311.98598645908305, 330.64490637779534} + {306.60484081045684, 343.44039937065628} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 232 + + + + Bounds + {{304.24316704282228, 373.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 228 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{284.6861572265625, 373.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 229 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{321.68590552759491, 342.21621621621625}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 230 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{295.78608171687216, 342.21621621621625}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 231 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{309.0002775386692, 311}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 232 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + ID + 221 + + + Class + LineGraphic + ID + 220 + Points + + {230.57664489746094, 352.12161254882812} + {272.91241132081836, 352.12161254882812} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + Width + 3 + + + + + Class + LineGraphic + ID + 219 + Points + + {115.4443793296814, 320} + {138.70676673244435, 336.65082905746601} + {150.27824106709028, 343.22058528184482} + + Rotation + 65 + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + Width + 3 + + + + + Class + Group + Graphics + + + Class + LineGraphic + Head + + ID + 209 + + ID + 208 + Points + + {205.55672680183022, 362.371537576653} + {209.51067887388666, 374.13611888193071} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 216 + + + + Bounds + {{205.97985739987575, 373.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 209 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Class + LineGraphic + Head + + ID + 214 + + ID + 210 + Points + + {179.09978298382143, 362.74534918762811} + {182.05643871388662, 373.75101544048755} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 217 + + + + Class + LineGraphic + Head + + ID + 215 + + ID + 211 + Points + + {172.97367012647246, 362.272312542061} + {168.75024763297745, 374.23775439486298} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 217 + + + + Class + LineGraphic + Head + + ID + 216 + + ID + 212 + Points + + {193.36587922770929, 330.74931156191991} + {198.44578391600908, 343.33437957259753} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 218 + + + + Class + LineGraphic + Head + + ID + 217 + + ID + 213 + Points + + {185.70858167392623, 330.64490637779539} + {180.3274360253001, 343.44039937065622} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 218 + + + + Bounds + {{177.96576225766583, 373.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 214 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{158.40875244140625, 373.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 215 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{195.40850074243809, 342.21621621621625}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 216 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{169.50867693171543, 342.21621621621625}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 217 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{182.72287275351241, 311}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 218 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + ID + 207 + + + Class + LineGraphic + ID + 177 + Points + + {360.73761259723705, 245.34917094253402} + {384, 262} + {395.57147433464593, 268.56975622437886} + + Rotation + 65 + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + Width + 3 + + + + + Bounds + {{209, 204}, {80.489044189453125, 33}} + Class + ShapedGraphic + ID + 152 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 \'83\'66\'81\'5b\'83\'5e\'95\'d2\'8f\'57A} + + + + Bounds + {{90.40875244140625, 238}, {68, 33}} + Class + ShapedGraphic + ID + 151 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1265 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset128 HiraKakuProN-W3;} +{\colortbl;\red255\green255\blue255;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf0 \'83\'52\'83\'73\'81\'5b} + + + + Class + LineGraphic + ID + 150 + Points + + {234.32116788321156, 246.08108108108098} + {276.65693430656898, 246.08108108108098} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + Width + 3 + + + + + Class + Group + Graphics + + + Class + LineGraphic + Head + + ID + 184 + + ID + 183 + Points + + {331.85400953538272, 246.35660667049453} + {335.83187015259841, 258.10285278889694} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 191 + + + + Bounds + {{332.25723634533119, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + FontInfo + + Color + + b + 0 + g + 0 + r + 0 + + + ID + 184 + Shape + Circle + Style + + fill + + Color + + b + 1 + g + 0 + r + 0 + + + + Text + + VerticalPad + 0 + + + + Class + LineGraphic + Head + + ID + 189 + + ID + 185 + Points + + {305.39693967951092, 246.73348434777174} + {308.37502106367748, 257.72597510658204} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 192 + + + + Class + LineGraphic + Head + + ID + 190 + + ID + 186 + Points + + {299.23134454069293, 246.25679212092135} + {294.98360637921616, 258.20266733952468} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 192 + + + + Class + LineGraphic + Head + + ID + 191 + + ID + 187 + Points + + {319.66196394394228, 214.73247805378111} + {324.76693109797458, 227.29454897288466} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 193 + + + + Class + LineGraphic + Head + + ID + 192 + + ID + 188 + Points + + {311.96769099195461, 214.62778381529498} + {306.56138023909222, 227.39924321196517} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 193 + + + + Bounds + {{304.24314120312067, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 189 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{284.68613138686089, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 190 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{321.6858796878933, 226.21621621621622}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 191 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{295.78605587717055, 226.21621621621622}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 192 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{309.00025169896759, 194.99999999999994}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 193 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + ID + 182 + + + Class + LineGraphic + ID + 137 + Points + + {110.96350364963499, 288.64864864864887} + {146.72992700729921, 266.89189189189216} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + Width + 3 + + + + + Class + Group + Graphics + + + Class + LineGraphic + Head + + ID + 127 + + ID + 126 + Points + + {205.57664203958393, 246.35660306433033} + {209.55450841561415, 258.10284485212969} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 134 + + + + Bounds + {{205.97986408255719, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 127 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Class + LineGraphic + Head + + ID + 132 + + ID + 128 + Points + + {179.11957664773971, 246.73347877004068} + {182.09766807475063, 257.72596349462185} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 135 + + + + Class + LineGraphic + Head + + ID + 133 + + ID + 129 + Points + + {172.95397533721615, 246.25679456660751} + {168.70624098962836, 258.20267275861033} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 135 + + + + Class + LineGraphic + Head + + ID + 134 + + ID + 130 + Points + + {193.38459339881777, 214.73247649842182} + {198.48956287411556, 227.29454534206579} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 136 + + + + Class + LineGraphic + Head + + ID + 135 + + ID + 131 + Points + + {185.69032003008545, 214.62778503285747} + {180.2840110857629, 227.39924609910437} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 136 + + + + Bounds + {{177.96576894034726, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 132 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{158.40875912408768, 257.43243243243251}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 133 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{195.40850742511952, 226.21621621621622}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 134 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{169.50868361439686, 226.21621621621622}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 135 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{182.72287943619384, 194.99999999999994}, {13.742763654669018, 20.810810810810828}} + Class + ShapedGraphic + ID + 136 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + ID + 125 + + + Class + Group + Graphics + + + Class + LineGraphic + Head + + ID + 103 + + ID + 102 + Points + + {93.167879485233343, 303.11336239226364} + {97.145741738395728, 314.85960732996705} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 110 + + + + Bounds + {{93.571104958469476, 314.18918918918916}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 103 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Class + LineGraphic + Head + + ID + 108 + + ID + 104 + Points + + {66.710809601742682, 303.49024033950889} + {69.688892397566647, 314.48273022444005} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 111 + + + + Class + LineGraphic + Head + + ID + 109 + + ID + 105 + Points + + {60.545213561959947, 303.0135492090397} + {56.29747591805269, 314.95942480594982} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 111 + + + + Class + LineGraphic + Head + + ID + 110 + + ID + 106 + Points + + {80.975832930536143, 271.48923446192305} + {86.080800588017368, 284.05130491264288} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 112 + + + + Class + LineGraphic + Head + + ID + 111 + + ID + 107 + Points + + {73.281559882193392, 271.38454084005036} + {67.875249525390316, 284.15600057874491} + + Style + + stroke + + HeadArrow + FilledArrow + Legacy + + LineType + 1 + TailArrow + 0 + + + Tail + + ID + 112 + + + + Bounds + {{65.557009816259551, 314.18918918918916}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 108 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{45.99999999999995, 314.18918918918916}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 109 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{82.999748301032028, 282.97297297297291}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 110 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{57.099924490309562, 282.97297297297291}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 111 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + Bounds + {{70.314120312106567, 251.75675675675666}, {13.742763654669023, 20.810810810810828}} + Class + ShapedGraphic + ID + 112 + Shape + Circle + Style + + Text + + VerticalPad + 0 + + + + ID + 101 + + + GridInfo + + GuidesLocked + NO + GuidesVisible + YES + HPages + 1 + ImageCounter + 1 + KeepToScale + + Layers + + + Lock + NO + Name + Layer 1 + Print + YES + View + YES + + + LayoutInfo + + Animate + NO + circoMinDist + 18 + circoSeparation + 0.0 + layoutEngine + dot + neatoSeparation + 0.0 + twopiSeparation + 0.0 + + LinksVisible + NO + MagnetsVisible + NO + MasterSheets + + ModificationDate + 2014-01-26 10:42:14 +0000 + Modifier + Oshiro Nobuyasu + NotesVisible + NO + Orientation + 2 + OriginVisible + NO + PageBreaks + YES + PrintInfo + + NSBottomMargin + + float + 41 + + NSHorizonalPagination + + coded + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG + + NSLeftMargin + + float + 18 + + NSPaperSize + + size + {595, 842} + + NSPrintReverseOrientation + + int + 0 + + NSRightMargin + + float + 18 + + NSTopMargin + + float + 18 + + + PrintOnePage + + ReadOnly + NO + RowAlign + 1 + RowSpacing + 36 + SheetTitle + Canvas 1 + SmartAlignmentGuidesActive + YES + SmartDistanceGuidesActive + YES + UniqueID + 1 + UseEntirePage + + VPages + 1 + WindowInfo + + CurrentSheet + 0 + ExpandedCanvases + + + name + Canvas 1 + + + Frame + {{168, 116}, {693, 922}} + ListView + + OutlineWidth + 142 + RightSidebar + + ShowRuler + + Sidebar + + SidebarWidth + 120 + VisibleRegion + {{0, 0}, {558, 783}} + Zoom + 1 + ZoomValues + + + Canvas 1 + 1 + 1 + + + + + diff -r 388cd4555b3d -r 1abd3c17cff9 paper/introduciton.tex --- a/paper/introduciton.tex Sun Jan 26 00:16:38 2014 +0900 +++ b/paper/introduciton.tex Sun Jan 26 20:20:00 2014 +0900 @@ -9,10 +9,9 @@ スケーラビリティとは, ある複数のノードから構成される分散ソフトウェアがあるとき, その分散ソフトウェアに対して単純にノード を追加するだけで性能を線形に上昇させることができる性質である. そこで, スケーラビリティを持たせるためにアーキテクチャの設計から考えることにした. 当研究室では非破壊的木構造を用いたデータベースである Jungle を開発している. -非破壊的木構造とは, データの編集の際に一度木構造として保存したデータには触れず, 新しく木構造を作成してデータの編集を行うことを言う. -Jungle は分散データベースとして設計されていたが, データ分散や永続性といった部分の実装がまだ行われていない. +非破壊的木構造とは, データの編集の際に一度木構造として保存したデータには変更せず, 新しく木構造を作成してデータの編集を行うことを言う. -本研究では, Jungle に分散データベースの実装を行い, スケーラビリティをもつアーキテクチャの追求を行う. +本研究では, Jungle に分散データベースと永続性の実装を行った. データ分散部分には当研究室で開発中である並列分散フレームワークである Alice を使用した. 結果, 複数のサーバノード間でデータの分散を行うことを確認した. diff -r 388cd4555b3d -r 1abd3c17cff9 paper/master_paper.pdf Binary file paper/master_paper.pdf has changed