Merge pull request #37 from d-ylee/bulkblocksFilesTests

Bulkblocks and Files tests

.gitignore

@@ -38,4 +38,5 @@ writer.json
 migrate.json
 migration.json
 test/data/dbsdata
-.env
+.env
+.vscode

Makefile

@@ -70,9 +70,14 @@ test-lexicon-reader-neg:
 	cd test && LD_LIBRARY_PATH=${odir} DYLD_LIBRARY_PATH=${odir} DBS_LEXICON_FILE=../static/lexicon_reader.json DBS_LEXICON_SAMPLE_FILE=../static/lexicon_reader_negative.json go test -v -run LexiconNegative
 test-integration:
 	cd test && rm -f /tmp/dbs-test.db && sqlite3 /tmp/dbs-test.db < ../static/schema/sqlite-schema.sql && \
-	echo "\"sqlite3 /tmp/dbs-test.db sqlite\"" > ./dbfile && LD_LIBRARY_PATH=${odir} DYLD_LIBRARY_PATH=${odir} DBS_READER_LEXICON_FILE=../static/lexicon_reader.json \
-	DBS_WRITER_LEXICON_FILE=../static/lexicon_writer.json DBS_DB_FILE=./dbfile INTEGRATION_DATA_FILE=./data/integration/integration_data.json \
-	go test -v -run Integration
+	echo "\"sqlite3 /tmp/dbs-test.db sqlite\"" > ./dbfile && \
+	LD_LIBRARY_PATH=${odir} DYLD_LIBRARY_PATH=${odir} \
+	DBS_READER_LEXICON_FILE=../static/lexicon_reader.json \
+	DBS_WRITER_LEXICON_FILE=../static/lexicon_writer.json \
+	DBS_DB_FILE=./dbfile \
+	INTEGRATION_DATA_FILE=./data/integration/integration_data.json \
+	BULKBLOCKS_DATA_FILE=./data/integration/bulkblocks_data.json \
+	go test -v -failfast -run Integration
 test-migration:
 	cd test && rm -f /tmp/dbs-one.db && \
 	sqlite3 /tmp/dbs-one.db < ../static/schema/sqlite-schema.sql && \

dbs/bulkblocks.go

@@ -583,6 +583,14 @@ func (a *API) InsertBulkBlocks() error {
 		if lBy == "" {
 			lBy = a.CreateBy
 		}
+		// if the data string does contain the is_file_valid field, use value from request
+		if isFileValid == 0 {
+			if rrr.IsFileValid != 0 && rrr.IsFileValid != 1 {
+				msg := "wrong is_file_valid value"
+				return Error(InvalidParamErr, ParametersErrorCode, msg, "dbs.bulkblocks.InsertBulkBlocks")
+			}
+			isFileValid = rrr.IsFileValid
+		}
 		r := Files{
 			LOGICAL_FILE_NAME:      rrr.LogicalFileName,
 			IS_FILE_VALID:          isFileValid,

dbs/bulkblocks2.go

@@ -678,7 +678,7 @@ func (a *API) InsertBulkBlocksConcurrently() error {
 			rrr.FileType,
 		)
 		if err != nil {
-			msg := fmt.Sprintf("%s unable to find file_type_id for %s, error %v", hash, ftype, err)
+			msg := fmt.Sprintf("%s unable to find file_type_id for %v, error %v", hash, ftype, err)
 			log.Println(msg)
 			return Error(err, GetIDErrorCode, msg, "dbs.bulkblocks.InsertBulkBlocksConcurrently")
 		}
@@ -956,6 +956,15 @@ func insertFilesChunk(
 		if lBy == "" {
 			lBy = trec.CreateBy
 		}
+		// if the data string does contain the is_file_valid field, use value from request
+		if trec.IsFileValid == 0 {
+			if rrr.IsFileValid != 0 && rrr.IsFileValid != 1 {
+				log.Println("### wrong is_file_valid value for", rrr.FileType, "lfn", lfn, "error", err)
+				trec.NErrors += 1
+				return
+			}
+			trec.IsFileValid = rrr.IsFileValid
+		}
 		fileID := ids[idx]
 		r := Files{
 			FILE_ID:                fileID,