fix: corrigido problema com o operador extern sort

afazer.txt

@@ -1,57 +1,30 @@
 
 
+Tabela dinamica -> {
+ - Criar storage para armazenar itens dinamicos
+}
+
+
 Tabela de indexes -> {
  - Arvore B+ para armazenamento de tabelas
  - Operadores que usam indexes
+ - Criar indice primario que não seja a primary key
+ - Criar um complete table que use um indice primario e tenha tabelas de indices adicionais
 }
 
 Locks e permissões de acesso -> {
  - MVCC
-}
-
-
-Testes de query -> {
- - TPC-H https://www.tpc.org/tpch/
-
+ - Remover todos os sitema de locks que existe hoje e refazer do zero.
 
 }
 
-
 Parquet estrutura:
 https://parquet.apache.org/documentation/latest/
 
 
 PrestoDB:
 https://prestodb.io/docs/current/#
 
-Testar:{
-
 
- - Simple Table {
-  - Testar desempenho atual máximo -> Testado sem valores reais
-  - Consistencia de dados -> OK
-  - Query Builder
- }
-
-
- - Memory Table -> RecordManager ArvoreBTree memoria{
-  - Testar desempenho atual comparado com simple table -> Testado sem valores reais
-  - Consistencia de dados -> OK
-  - Query Builder
- }
-
- - Double Table -Implementar{
-  - Testar desempenho atual comparado com simple table e memory table
-  - Consistencia de dados
- }
-
-
- - Group Operator {
-  - Testar se está funcionando com o min e max, etc...
- }
-
-
-
-}
 
 

src/main/java/engine/file/blocks/commitable/CommitableBlockStream.java

@@ -2,7 +2,9 @@
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.LinkedList;
+import java.util.List;
 
 import engine.exceptions.DataBaseException;
 import engine.file.streams.WriteByteStream;
@@ -42,6 +44,9 @@ public int write(long pos, byte[] data, int offset, int len)  {
 		for(int x=0;x<len && pos+x<blockSize;x++){
 			buffer[(int)pos+x] = (short) data[offset+x];
 		}
+		//System.arraycopy(data,offset,buffer,(int)pos, (int)((len<blockSize-pos)?len:(blockSize-pos)));
+
+
 		//changes.addLast(bw);
 		if(pos+len>blockSize)return (int) (blockSize-pos);
 		else return len;

src/main/java/sgbd/query/Main.java

@@ -34,12 +34,15 @@ public static void main(String[] args) {
         Operator scan1 = new TableScan(biostats);
         Operator scan2 = new TableScan(mlbplayers);
 
-        Operator cartesiano = new BlockNestedLoopJoin(scan2,scan1,(t1, t2) -> true);
+        Operator group = new GroupOperator(scan2,"mlbplayers","Team",List.of(
+                new CountAgregation()
+        ));
 
+        Operator exec = group;
 
-        TestOperators.testOperator(cartesiano,15); // Executa select por 15 itens
-        TestOperators.testOperator(cartesiano,15); // Executa select por 15 itens
-        TestOperators.testOperator(cartesiano,15); // Executa select por 15 itens
+
+        TestOperators.testOperator(exec,15); // Executa select por 15 itens
+        TestOperators.testOperator(exec); // Executa select por 15 itens
 
         //Fecha as tables, não serão mais acessadas
 

src/main/java/sgbd/query/Operator.java

@@ -11,7 +11,7 @@ public interface Operator {
     public Tuple next();
     public boolean hasNext();
     public void close();
-    public void clearTempFile();
+    public void freeResources();
 
     public List<Table> getSources();
     public Map<String,List<String>> getContentInfo();

src/main/java/sgbd/query/TestOperators.java

@@ -59,7 +59,7 @@ public static void testOperator(Operator executor,long limit){
         }
         //Fecha operador
         executor.close();
-        executor.clearTempFile();
+        executor.freeResources();
         System.out.println("Count: "+count);
     }
 

src/main/java/sgbd/query/agregation/CountAgregation.java

@@ -11,6 +11,12 @@ public CountAgregation(String sourceSrc, String columnSrc, String sourceDst, Str
     public CountAgregation(String sourceSrc, String columnSrc) {
         super(sourceSrc, columnSrc);
     }
+    public CountAgregation(String sourceSrc) {
+        super(sourceSrc, "*");
+    }
+    public CountAgregation() {
+        super("*", "*");
+    }
 
     @Override
     public String getAgregationName() {

src/main/java/sgbd/query/binaryop/BinaryOperator.java

@@ -44,9 +44,9 @@ public void close() {
     }
 
     @Override
-    public void clearTempFile() {
-        this.left.clearTempFile();
-        this.right.clearTempFile();
+    public void freeResources() {
+        this.left.freeResources();
+        this.right.freeResources();
     }
 
     public List<Table> getSources(){

src/main/java/sgbd/query/sourceop/SourceOperator.java

@@ -27,7 +27,7 @@ public List<Table> getSources(){
     }
 
     @Override
-    public void clearTempFile(){
+    public void freeResources(){
 
     }
 

src/main/java/sgbd/query/sourceop/TableScan.java

@@ -30,12 +30,15 @@ public TableScan(Table t,List<String> columns){
 
     @Override
     public void open() {
-        if(iterator==null)
-            if(columns!=null) {
+        if(iterator==null) {
+            if (columns != null) {
                 iterator = table.iterator(columns);
-            }else{
+            } else {
                 iterator = table.iterator();
             }
+        }else{
+            iterator.restart();
+        }
 
     }
 
@@ -55,7 +58,11 @@ public boolean hasNext() {
 
     @Override
     public void close() {
-        iterator=null;
+    }
+
+    @Override
+    public void freeResources() {
+        iterator.unlock();
     }
 
     @Override

src/main/java/sgbd/query/unaryop/ExternalSortOperator.java

@@ -88,6 +88,7 @@ public void open() {
 
 
         externalSortedTable.open();
+        operator.open();
         ArrayList<RowData> inserts = new ArrayList<>();
 
         long unique_val = 0;
@@ -171,13 +172,14 @@ public void close() {
     }
 
     @Override
-    public void clearTempFile() {
-        super.clearTempFile();
+    public void freeResources() {
+        super.freeResources();
         if(scan!=null) {
             try {
                 fileWriter.close();
             } catch (IOException e) {
             }
+            scan.freeResources();
             externalSortedTable.close();
             dataFile.delete();
             String path = externalSortedTable.getHeader().get(Header.FILE_PATH);