Niki-SQL-Team
diff --git a/‎.idea/workspace.xml‎
Lines changed: 114 additions & 152 deletions b/‎.idea/workspace.xml‎
Lines changed: 114 additions & 152 deletions
diff --git a/‎DB Files/Index/index_T1_A1_0.nkidx‎
0 Bytes b/‎DB Files/Index/index_T1_A1_0.nkidx‎
0 Bytes
diff --git a/‎out/production/Niki SQL/BufferManager/BufferManager.class‎
0 Bytes b/‎out/production/Niki SQL/BufferManager/BufferManager.class‎
0 Bytes
diff --git a/‎out/production/Niki SQL/IndexManager/BPlusTree.class‎
-1 Bytes b/‎out/production/Niki SQL/IndexManager/BPlusTree.class‎
-1 Bytes
diff --git a/‎out/production/Niki SQL/IndexManager/IndexManager.class‎
14 Bytes b/‎out/production/Niki SQL/IndexManager/IndexManager.class‎
14 Bytes
diff --git a/‎out/production/Niki SQL/Top/Main.class‎
678 Bytes b/‎out/production/Niki SQL/Top/Main.class‎
678 Bytes
diff --git a/‎out/production/Niki SQL/Top/NKSql.class‎
1 Byte b/‎out/production/Niki SQL/Top/NKSql.class‎
1 Byte
diff --git a/‎src/BufferManager/BufferManager.java‎
Lines changed: 1 addition & 0 deletions b/‎src/BufferManager/BufferManager.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/IndexManager/BPlusTree.java‎
Lines changed: 2 additions & 2 deletions b/‎src/IndexManager/BPlusTree.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/IndexManager/IndexManager.java‎
Lines changed: 2 additions & 2 deletions b/‎src/IndexManager/IndexManager.java‎
Lines changed: 2 additions & 2 deletions
@@ -78,6 +78,7 @@ public void storeBlock(Block block) {
         substituteBlock(block, true);
     }
 
+
     public void removeBlock(String identifier, Integer index) {
         Integer indexInBuffer = blockIndexInBuffer(identifier, index);
         if (indexInBuffer != -1) {
 
@@ -209,7 +209,7 @@ public Vector<BPlusTreePointer> searchKeyInRange(byte[] startKey, byte[] endKey,
 			return result;//用来解决有边界比现有元素都大的情况
 		}else{//左侧有限制
 			BPlusTreeBlock currentNode = getTreeNode(this.root);
-			while(currentNode.isLeafNode != true){//根据startkey确定位置
+			while(!currentNode.isLeafNode){//根据startkey确定位置
 				currentNode = getTreeNode(currentNode.searchFor(startKey));
 			}
 
@@ -508,7 +508,7 @@ public Vector<BPlusTreePointer> findAll(){
 
     //私有封装函数
 	//key left, node right
-	private CompareCondition myCompare(byte[] key1, byte[] key2){
+	private CompareCondition myCompare(byte[] key2, byte[] key1){
 		Converter convertUtility = new Converter();
 		if(this.ElementType == DataType.IntegerType){
 			Integer left = convertUtility.convertToInteger(key1);
 
@@ -31,7 +31,7 @@ private void managerInitialize(Index targetObject){
 
 	//创建新的索引，返回Index类型， 通知调整workOn
 	public Index createBlankIndex(String table, String attribute, DataType dataType){//建成空的B+树
-		BufferManager bufferManager = new BufferManager();
+		BufferManager bufferManager = BufferManager.sharedInstance;
 		String identifier = "index" + "_" +  table + "_" + attribute;
 		BPlusTreeBlock myRoot = new BPlusTreeBlock(identifier, dataType, 0, true);
 		myRoot.setTailPointer(-1);
@@ -53,7 +53,7 @@ public Index createBlankIndex(String table, String attribute, DataType dataType)
 	public boolean	dropWholeIndex(Index index){
 		managerInitialize(index);
 
-		BufferManager bufferManager = new BufferManager();
+		BufferManager bufferManager = BufferManager.sharedInstance;
 		for(int i = 0; i < this.blockCount; i++){
 			bufferManager.removeBlock(identifier, i);
 		}
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ public void storeBlock(Block block) {`
`78`	`78`	`substituteBlock(block, true);`
`79`	`79`	`}`
`80`	`80`
	`81`	`+`
`81`	`82`	`public void removeBlock(String identifier, Integer index) {`
`82`	`83`	`Integer indexInBuffer = blockIndexInBuffer(identifier, index);`
`83`	`84`	`if (indexInBuffer != -1) {`