Update with create_metadata API

Author: a-ok123

.gitignore

@@ -25,4 +25,6 @@ go.work.sum
 .env
 
 # IDEs
-.idea/
+.idea
+
+test-client/main

include/rq-library.h

@@ -54,15 +54,15 @@ bool raptorq_free_session(uintptr_t session_id);
  * *  -5 on invalid session
  * * -11 on IO error
  * * -12 on File not found
- * * -13 on Encoding failed
- * * -15 on Memory limit exceeded
- * * -16 on Concurrency limit reached
+ * * -13 on Invalid path
+ * * -14 on Encoding failed
+ * * -16 on Memory limit exceeded
+ * * -17 on Concurrency limit reached
  */
 int32_t raptorq_create_metadata(uintptr_t session_id,
                                 const char *input_path,
-                                const char *output_dir,
+                                const char *layout_file,
                                 uintptr_t block_size,
-                                bool return_layout,
                                 char *result_buffer,
                                 uintptr_t result_buffer_len);
 
@@ -87,9 +87,10 @@ int32_t raptorq_create_metadata(uintptr_t session_id,
  * *  -5 on invalid session
  * * -11 on IO error
  * * -12 on File not found
- * * -13 on Encoding failed
- * * -15 on Memory limit exceeded
- * * -16 on Concurrency limit reached
+ * * -13 on Invalid Path
+ * * -14 on Encoding failed
+ * * -16 on Memory limit exceeded
+ * * -17 on Concurrency limit reached
  */
 int32_t raptorq_encode_file(uintptr_t session_id,
                             const char *input_path,
@@ -133,9 +134,10 @@ int32_t raptorq_get_last_error(uintptr_t session_id,
  * *  -5 on invalid session
  * * -11 on IO error
  * * -12 on File not found
- * * -14 on Decoding failed
- * * -15 on Memory limit exceeded
- * * -16 on Concurrency limit reached
+ * * -13 on Invalid Path
+ * * -15 on Decoding failed
+ * * -16 on Memory limit exceeded
+ * * -17 on Concurrency limit reached
  */
 int32_t raptorq_decode_symbols(uintptr_t session_id,
                                const char *symbols_dir,

lib/darwin/amd64/librq_library.a

@@ -17,7 +17,7 @@ package rq_go
 extern uintptr_t raptorq_init_session(uint16_t symbol_size, uint8_t redundancy_factor, uint64_t max_memory_mb, uint64_t concurrency_limit);
 extern _Bool raptorq_free_session(uintptr_t session_id);
 extern int32_t raptorq_encode_file(uintptr_t session_id, const char *input_path, const char *output_dir, uintptr_t block_size, char *result_buffer, uintptr_t result_buffer_len);
-extern int32_t raptorq_create_metadata(uintptr_t session_id, const char *input_path, const char *output_dir, uintptr_t block_size, bool return_layout, char *result_buffer, uintptr_t result_buffer_len);
+extern int32_t raptorq_create_metadata(uintptr_t session_id, const char *input_path, const char *layout_file, uintptr_t block_size, char *result_buffer, uintptr_t result_buffer_len);
 extern int32_t raptorq_get_last_error(uintptr_t session_id, char *error_buffer, uintptr_t error_buffer_len);
 extern int32_t raptorq_decode_symbols(uintptr_t session_id, const char *symbols_dir, const char *output_path, const char *layout_path);
 extern uintptr_t raptorq_get_recommended_block_size(uintptr_t session_id, uint64_t file_size);
@@ -210,15 +210,69 @@ func (p *RaptorQProcessor) EncodeFile(inputPath, outputDir string, blockSize int
 }
 
 // CreateMetadata creates metadata for RaptorQ encoding without writing symbol data
-// If returnLayout is true, the layout content is returned in the result rather than written to a file
-//
-// This is a temporary implementation calling directly to the Rust library through CGO
-func (p *RaptorQProcessor) CreateMetadata(inputPath, outputDir string, blockSize int, returnLayout bool) (*ProcessResult, error) {
-	// For now, this is a wrapper around EncodeFile
-	// since we're experiencing CGO integration issues with the raptorq_create_metadata function
-	//
-	// TODO: Replace with direct call to raptorq_create_metadata when CGO integration is fixed
-	return p.EncodeFile(inputPath, outputDir, blockSize)
+// It writes the layout information to the specified layout file
+func (p *RaptorQProcessor) CreateMetadata(inputPath, layoutFile string, blockSize int) (*ProcessResult, error) {
+	if p.SessionID == 0 {
+		return nil, fmt.Errorf("RaptorQ session is closed")
+	}
+
+	cInputPath := C.CString(inputPath)
+	defer C.free(unsafe.Pointer(cInputPath))
+
+	cLayoutFile := C.CString(layoutFile)
+	defer C.free(unsafe.Pointer(cLayoutFile))
+
+	// Buffer for result (16KB should be enough for metadata)
+	resultBufSize := 16 * 1024
+	resultBuf := (*C.char)(C.malloc(C.size_t(resultBufSize)))
+	defer C.free(unsafe.Pointer(resultBuf))
+
+	res := C.raptorq_create_metadata(
+		C.uintptr_t(p.SessionID),
+		cInputPath,
+		cLayoutFile,
+		C.uintptr_t(blockSize),
+		resultBuf,
+		C.uintptr_t(resultBufSize),
+	)
+
+	switch res {
+	case 0:
+		// Success
+	case -1:
+		return nil, fmt.Errorf("generic error")
+	case -2:
+		return nil, fmt.Errorf("invalid parameters")
+	case -3:
+		return nil, fmt.Errorf("invalid response (JSON serialization error)")
+	case -4:
+		return nil, fmt.Errorf("result buffer too small")
+	case -5:
+		return nil, fmt.Errorf("invalid session")
+	case -11:
+		return nil, fmt.Errorf("IO error: %s", p.getLastError())
+	case -12:
+		return nil, fmt.Errorf("file not found: %s", p.getLastError())
+	case -13:
+		return nil, fmt.Errorf("invalid path: %s", p.getLastError())
+	case -14:
+		return nil, fmt.Errorf("encoding failed: %s", p.getLastError())
+	case -16:
+		return nil, fmt.Errorf("memory limit exceeded: %s", p.getLastError())
+	case -17:
+		return nil, fmt.Errorf("concurrency limit reached: %s", p.getLastError())
+	default:
+		return nil, fmt.Errorf("unknown error code %d: %s", res, p.getLastError())
+	}
+
+	// Parse the JSON result
+	resultJSON := C.GoString(resultBuf)
+	var result ProcessResult
+	if err := json.Unmarshal([]byte(resultJSON), &result); err != nil {
+		return nil, fmt.Errorf("failed to parse result: %w", err)
+	}
+
+	return &result, nil
 }
 
 // DecodeSymbols decodes RaptorQ symbols back to the original file

lib/darwin/amd64/librq_library.d

@@ -581,7 +581,7 @@ func TestSysErrorHandlingDecode(t *testing.T) {
 	}
 }
 
-// System test for creating metadata (without returning layout content)
+// System test for creating metadata
 func TestSysCreateMetadata(t *testing.T) {
 	// Create RaptorQ processor with default settings
 	processor, err := NewDefaultRaptorQProcessor()
@@ -598,33 +598,28 @@ func TestSysCreateMetadata(t *testing.T) {
 	ctx := NewTestContext(t, 1024*1024) // 1MB file
 	defer ctx.Cleanup()
 
-	// Create metadata without returning layout (save to file)
-	res, err := processor.CreateMetadata(ctx.InputFile, ctx.SymbolsDir, 0, false)
+	// Create layout file path
+	layoutPath := filepath.Join(ctx.TempDir, "layout.json")
+
+	// Create metadata
+	res, err := processor.CreateMetadata(ctx.InputFile, layoutPath, 0)
 	if err != nil {
 		t.Fatalf("Failed to create metadata: %v", err)
 	}
 
 	// Verify the layout file exists
-	layoutPath := res.LayoutFilePath
 	if _, err := os.Stat(layoutPath); os.IsNotExist(err) {
 		t.Fatalf("Layout file not found at %s", layoutPath)
 	}
 
 	// Verify the result contains expected fields
-	if res.SymbolsDirectory == "" {
-		t.Fatal("Result should contain symbols_directory")
-	}
 	if res.LayoutFilePath == "" {
 		t.Fatal("Result should contain layout_file_path")
 	}
 }
 
-// System test for creating metadata with layout content returned
-func TestSysCreateMetadataReturnLayout(t *testing.T) {
-	// Note: Since our current implementation is a temporary wrapper around EncodeFile,
-	// we can't fully test the returnLayout parameter yet. This test will need to be
-	// updated when the full implementation is complete.
-
+// System test for creating metadata with specific block size
+func TestSysCreateMetadataWithBlockSize(t *testing.T) {
 	// Create RaptorQ processor with default settings
 	processor, err := NewDefaultRaptorQProcessor()
 	if err != nil {
@@ -637,22 +632,33 @@ func TestSysCreateMetadataReturnLayout(t *testing.T) {
 	}()
 
 	// Create test context with input file
-	ctx := NewTestContext(t, 1024*1024) // 1MB file
+	ctx := NewTestContext(t, 5*1024*1024) // 5MB file
 	defer ctx.Cleanup()
 
-	// Create metadata with returnLayout=true (currently uses the same code path)
-	res, err := processor.CreateMetadata(ctx.InputFile, ctx.SymbolsDir, 0, true)
+	// Create layout file path
+	layoutPath := filepath.Join(ctx.TempDir, "layout_with_blocksize.json")
+
+	// Create metadata with specific block size
+	blockSize := 1024 * 1024 // 1MB blocks
+	res, err := processor.CreateMetadata(ctx.InputFile, layoutPath, blockSize)
 	if err != nil {
-		t.Fatalf("Failed to create metadata with returnLayout=true: %v", err)
+		t.Fatalf("Failed to create metadata with specific block size: %v", err)
 	}
 
-	// Verify the layout file exists (when full implementation is done, this should be skipped)
-	layoutPath := res.LayoutFilePath
+	// Verify the layout file exists
 	if _, err := os.Stat(layoutPath); os.IsNotExist(err) {
 		t.Fatalf("Layout file not found at %s", layoutPath)
 	}
 
-	// TODO: When full implementation is complete, verify the result contains layout_content field
+	// Verify the result contains expected fields
+	if res.LayoutFilePath == "" {
+		t.Fatal("Result should contain layout_file_path")
+	}
+
+	// Verify the blocks information is present
+	if len(res.Blocks) == 0 {
+		t.Fatal("Result should contain blocks information")
+	}
 }
 
 // Go-specific test for FFI interactions
@@ -1112,20 +1118,22 @@ func BenchmarkCreateMetadata1MB(b *testing.B) {
 	ctx := setupBenchmarkEnv(b, SIZE_1MB)
 	defer ctx.Cleanup()
 
+	// Create layout file path
+	layoutPath := filepath.Join(ctx.TempDir, "layout.json")
+
 	// Reset timer before starting the benchmark loop
 	b.ResetTimer()
 
 	// Run the benchmark
 	for i := 0; i < b.N; i++ {
-		_, err := processor.CreateMetadata(ctx.InputFile, ctx.SymbolsDir, 0, false)
+		_, err := processor.CreateMetadata(ctx.InputFile, layoutPath, 0)
 		if err != nil {
 			b.Fatalf("Failed to create metadata: %v", err)
 		}
 
-		// Clean symbols directory for next iteration
+		// Remove layout file for next iteration
 		if i < b.N-1 {
-			os.RemoveAll(ctx.SymbolsDir)
-			os.MkdirAll(ctx.SymbolsDir, 0755)
+			os.Remove(layoutPath)
 		}
 	}
 }
@@ -1147,20 +1155,22 @@ func BenchmarkCreateMetadata10MB(b *testing.B) {
 	ctx := setupBenchmarkEnv(b, SIZE_10MB)
 	defer ctx.Cleanup()
 
+	// Create layout file path
+	layoutPath := filepath.Join(ctx.TempDir, "layout_10mb.json")
+
 	// Reset timer before starting the benchmark loop
 	b.ResetTimer()
 
 	// Run the benchmark
 	for i := 0; i < b.N; i++ {
-		_, err := processor.CreateMetadata(ctx.InputFile, ctx.SymbolsDir, 0, true) // with returnLayout=true
+		_, err := processor.CreateMetadata(ctx.InputFile, layoutPath, 0)
 		if err != nil {
 			b.Fatalf("Failed to create metadata: %v", err)
 		}
 
-		// Clean symbols directory for next iteration
+		// Remove layout file for next iteration
 		if i < b.N-1 {
-			os.RemoveAll(ctx.SymbolsDir)
-			os.MkdirAll(ctx.SymbolsDir, 0755)
+			os.Remove(layoutPath)
 		}
 	}
 }
@@ -1185,20 +1195,22 @@ func BenchmarkCreateMetadata100MB(b *testing.B) {
 	// Use block size for large file
 	blockSize := 5 * 1024 * 1024 // 5MB blocks
 
+	// Create layout file path
+	layoutPath := filepath.Join(ctx.TempDir, "layout_100mb.json")
+
 	// Reset timer before starting the benchmark loop
 	b.ResetTimer()
 
 	// Run the benchmark
 	for i := 0; i < b.N; i++ {
-		_, err := processor.CreateMetadata(ctx.InputFile, ctx.SymbolsDir, blockSize, false)
+		_, err := processor.CreateMetadata(ctx.InputFile, layoutPath, blockSize)
 		if err != nil {
 			b.Fatalf("Failed to create metadata: %v", err)
 		}
 
-		// Clean symbols directory for next iteration
+		// Remove layout file for next iteration
 		if i < b.N-1 {
-			os.RemoveAll(ctx.SymbolsDir)
-			os.MkdirAll(ctx.SymbolsDir, 0755)
+			os.Remove(layoutPath)
 		}
 	}
 }

lib/darwin/amd64/librq_library.rlib

@@ -2,4 +2,5 @@ module main
 
 go 1.21
 
-require github.com/LumeraProtocol/rq-go v0.1.0
+require github.com/LumeraProtocol/rq-go v0.0.0
+replace github.com/LumeraProtocol/rq-go => ../