Move protobuf spec of table FILE_SOURCES.BINARY_DATA into sonar-db

SonarSource · Jul 23, 2015 · 17af536 · 17af536
1 parent 5e36720
commit 17af536
Show file tree

Hide file tree

Showing 37 changed files with 571 additions and 4,044 deletions.
diff --git a/compile_protobuf.sh b/compile_protobuf.sh
@@ -1,14 +1,25 @@
 #!/bin/bash
 
-# Usage: compile_protobuf <inputDir> <outputDir>
+# Compiles all the Protocol Buffers files (*.proto) to Java source code.
+# IMPORTANT - protobuf 2.6.1 must be installed. Other versions are not supported.
+
+# Usage: compile_protobuf <module> <type: main or test>
 function compile_protobuf {
-  echo "Compiling [$1] to [$2]..."
+  INPUT="$1/src/$2/protobuf"
-  mkdir -p $2
+  OUTPUT="$1/src/$2/gen-java"
-  protoc --proto_path=$1 --java_out=$2 $1/*.proto
+
+  if [ -d $INPUT ]
+  then
+    echo "Compiling [$INPUT] to [$OUTPUT]..."
+    rm -rf $OUTPUT
+    mkdir -p $OUTPUT
+    protoc --proto_path=$INPUT --java_out=$OUTPUT $INPUT/*.proto
+  fi
 }
 
-compile_protobuf "sonar-core/src/test/protobuf" "sonar-core/src/test/gen-java"
+compile_protobuf "sonar-batch-protocol" "main"
-compile_protobuf "sonar-batch-protocol/src/main/protobuf" "sonar-batch-protocol/src/main/gen-java"
+compile_protobuf "sonar-core" "test"
+compile_protobuf "sonar-db" "main"
 
 
 
diff --git a/...nar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java b/...nar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java
@@ -23,7 +23,6 @@
 import java.util.Arrays;
 import java.util.Timer;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.apache.commons.io.IOUtils;
 import org.junit.Rule;
 import org.junit.Test;
@@ -32,9 +31,9 @@
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.internal.Uuids;
 import org.sonar.db.DbTester;
+import org.sonar.db.FileSources;
 import org.sonar.db.source.FileSourceDao;
 import org.sonar.db.source.FileSourceDto;
-import org.sonar.server.source.db.FileSourceDb;
 import org.sonar.server.source.index.FileSourcesUpdaterHelper;
 import org.sonar.server.source.index.SourceLineResultSetIterator;
 
@@ -111,8 +110,8 @@ private FileSourceDto generateDto() throws IOException {
   }
 
   private byte[] generateData() {
-    FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder();
+    FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder();
-    FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Line.newBuilder();
+    FileSources.Line.Builder lineBuilder = FileSources.Line.newBuilder();
     for (int i = 1; i <= NUMBER_OF_LINES; i++) {
       lineBuilder.clear();
       dataBuilder.addLines(lineBuilder

diff --git a/...-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceIndexBenchmarkTest.java b/...-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceIndexBenchmarkTest.java
@@ -31,8 +31,8 @@
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.sonar.db.FileSources;
 import org.sonar.server.es.EsClient;
-import org.sonar.server.source.db.FileSourceDb;
 import org.sonar.server.source.index.FileSourcesUpdaterHelper;
 import org.sonar.server.source.index.SourceLineDoc;
 import org.sonar.server.source.index.SourceLineIndex;
@@ -115,8 +115,8 @@ private static class SourceIterator implements Iterator<FileSourcesUpdaterHelper
     private final int nbLinesPerFile;
     private int currentProject = 0;
     private AtomicLong count = new AtomicLong(0L);
-    private final FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder();
+    private final FileSources.Data.Builder dataBuilder = FileSources.Data.newBuilder();
-    private final FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Line.newBuilder();
+    private final FileSources.Line.Builder lineBuilder = FileSources.Line.newBuilder();
 
     SourceIterator(long nbFiles, int nbLinesPerFile) {
       this.nbFiles = nbFiles;

diff --git a/...sonar-server/src/main/java/org/sonar/server/computation/source/ComputeFileSourceData.java b/...sonar-server/src/main/java/org/sonar/server/computation/source/ComputeFileSourceData.java
@@ -20,14 +20,13 @@
 
 package org.sonar.server.computation.source;
 
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
-import org.sonar.server.source.db.FileSourceDb;
-
 import java.security.MessageDigest;
 import java.util.Iterator;
 import java.util.List;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang.StringUtils;
+import org.sonar.db.FileSources;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -69,7 +68,7 @@ private void read(Data data, String source, boolean hasNextLine) {
       data.srcMd5Digest.update(source.getBytes(UTF_8));
     }
 
-    FileSourceDb.Line.Builder lineBuilder = data.fileSourceBuilder.addLinesBuilder()
+    FileSources.Line.Builder lineBuilder = data.fileSourceBuilder.addLinesBuilder()
       .setSource(source)
       .setLine(currentLine);
     for (LineReader lineReader : lineReaders) {
@@ -85,17 +84,17 @@ private static String computeLineChecksum(String line) {
     return DigestUtils.md5Hex(reducedLine);
   }
 
-  private boolean hasNextLine(){
+  private boolean hasNextLine() {
     return linesIterator.hasNext() || currentLine < numberOfLines;
   }
 
   public static class Data {
     private final StringBuilder lineHashes;
     private final MessageDigest srcMd5Digest;
-    private final FileSourceDb.Data.Builder fileSourceBuilder;
+    private final FileSources.Data.Builder fileSourceBuilder;
 
     public Data() {
-      this.fileSourceBuilder = FileSourceDb.Data.newBuilder();
+      this.fileSourceBuilder = FileSources.Data.newBuilder();
       this.lineHashes = new StringBuilder();
       this.srcMd5Digest = DigestUtils.getMd5Digest();
     }
@@ -108,7 +107,7 @@ public String getLineHashes() {
       return lineHashes.toString();
     }
 
-    public FileSourceDb.Data getFileSourceData() {
+    public FileSources.Data getFileSourceData() {
       return fileSourceBuilder.build();
     }
   }

diff --git a/...er/sonar-server/src/main/java/org/sonar/server/computation/source/CoverageLineReader.java b/...er/sonar-server/src/main/java/org/sonar/server/computation/source/CoverageLineReader.java
@@ -21,7 +21,7 @@
 package org.sonar.server.computation.source;
 
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.server.source.db.FileSourceDb;
+import org.sonar.db.FileSources;
 
 import javax.annotation.CheckForNull;
 
@@ -37,7 +37,7 @@ public CoverageLineReader(Iterator<BatchReport.Coverage> coverageIterator) {
   }
 
   @Override
-  public void read(FileSourceDb.Line.Builder lineBuilder) {
+  public void read(FileSources.Line.Builder lineBuilder) {
     BatchReport.Coverage reportCoverage = getNextLineCoverageIfMatchLine(lineBuilder.getLine());
     if (reportCoverage != null) {
       processUnitTest(lineBuilder, reportCoverage);
@@ -47,7 +47,7 @@ public void read(FileSourceDb.Line.Builder lineBuilder) {
     }
   }
 
-  private static void processUnitTest(FileSourceDb.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){
+  private static void processUnitTest(FileSources.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){
     if (reportCoverage.hasUtHits()) {
       lineBuilder.setUtLineHits(reportCoverage.getUtHits() ? 1 : 0);
     }
@@ -57,7 +57,7 @@ private static void processUnitTest(FileSourceDb.Line.Builder lineBuilder, Batch
     }
   }
 
-  private static void processIntegrationTest(FileSourceDb.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){
+  private static void processIntegrationTest(FileSources.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){
     if (reportCoverage.hasItHits()) {
       lineBuilder.setItLineHits(reportCoverage.getItHits() ? 1 : 0);
     }
@@ -67,7 +67,7 @@ private static void processIntegrationTest(FileSourceDb.Line.Builder lineBuilder
     }
   }
 
-  private static void processOverallTest(FileSourceDb.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){
+  private static void processOverallTest(FileSources.Line.Builder lineBuilder, BatchReport.Coverage reportCoverage){
     if (reportCoverage.hasUtHits() || reportCoverage.hasItHits()) {
       lineBuilder.setOverallLineHits((reportCoverage.getUtHits() || reportCoverage.getItHits()) ? 1 : 0);
     }

diff --git a/...sonar-server/src/main/java/org/sonar/server/computation/source/DuplicationLineReader.java b/...sonar-server/src/main/java/org/sonar/server/computation/source/DuplicationLineReader.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.server.source.db.FileSourceDb;
+import org.sonar.db.FileSources;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Maps.newHashMap;
@@ -47,7 +47,7 @@ public DuplicationLineReader(Iterator<BatchReport.Duplication> duplications) {
   }
 
   @Override
-  public void read(FileSourceDb.Line.Builder lineBuilder) {
+  public void read(FileSources.Line.Builder lineBuilder) {
     int line = lineBuilder.getLine();
     List<BatchReport.Range> blocks = findDuplicationBlockMatchingLine(line);
     for (BatchReport.Range block : blocks) {

diff --git a/...onar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java b/...onar-server/src/main/java/org/sonar/server/computation/source/HighlightingLineReader.java
@@ -21,15 +21,13 @@
 package org.sonar.server.computation.source;
 
 import com.google.common.collect.ImmutableMap;
-import org.sonar.batch.protocol.Constants;
-import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.server.source.db.FileSourceDb;
-
-import javax.annotation.CheckForNull;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.CheckForNull;
+import org.sonar.batch.protocol.Constants;
+import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.db.FileSources;
 
 import static com.google.common.collect.Lists.newArrayList;
 
@@ -58,7 +56,7 @@ public HighlightingLineReader(Iterator<BatchReport.SyntaxHighlighting> lineHighl
   }
 
   @Override
-  public void read(FileSourceDb.Line.Builder lineBuilder) {
+  public void read(FileSources.Line.Builder lineBuilder) {
     int line = lineBuilder.getLine();
     StringBuilder highlighting = new StringBuilder();
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/LineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/LineReader.java
@@ -20,10 +20,10 @@
 
 package org.sonar.server.computation.source;
 
-import org.sonar.server.source.db.FileSourceDb;
+import org.sonar.db.FileSources;
 
 public interface LineReader {
 
-  void read(FileSourceDb.Line.Builder lineBuilder);
+  void read(FileSources.Line.Builder lineBuilder);
 
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/ScmLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/ScmLineReader.java
@@ -21,7 +21,7 @@
 package org.sonar.server.computation.source;
 
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.server.source.db.FileSourceDb;
+import org.sonar.db.FileSources;
 
 public class ScmLineReader implements LineReader {
 
@@ -30,8 +30,9 @@ public class ScmLineReader implements LineReader {
   public ScmLineReader(BatchReport.Changesets scmReport) {
     this.scmReport = scmReport;
   }
+
   @Override
-  public void read(FileSourceDb.Line.Builder lineBuilder) {
+  public void read(FileSources.Line.Builder lineBuilder) {
     int changeSetIndex = scmReport.getChangesetIndexByLine(lineBuilder.getLine() - 1);
     BatchReport.Changesets.Changeset changeset = scmReport.getChangeset(changeSetIndex);
     boolean hasAuthor = changeset.hasAuthor();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java b/server/sonar-server/src/main/java/org/sonar/server/computation/source/SymbolsLineReader.java
@@ -32,7 +32,7 @@
 import java.util.Map;
 import java.util.Set;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.server.source.db.FileSourceDb;
+import org.sonar.db.FileSources;
 
 public class SymbolsLineReader implements LineReader {
 
@@ -49,7 +49,7 @@ public SymbolsLineReader(Iterator<BatchReport.Symbol> symbols) {
   }
 
   @Override
-  public void read(FileSourceDb.Line.Builder lineBuilder) {
+  public void read(FileSources.Line.Builder lineBuilder) {
     int line = lineBuilder.getLine();
     List<BatchReport.Symbol> lineSymbols = findSymbolsMatchingLine(line);
     for (BatchReport.Symbol lineSymbol : lineSymbols) {

diff --git a/.../sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java b/.../sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java
@@ -47,7 +47,7 @@
 import org.sonar.server.computation.source.LineReader;
 import org.sonar.server.computation.source.ScmLineReader;
 import org.sonar.server.computation.source.SymbolsLineReader;
-import org.sonar.server.source.db.FileSourceDb;
+import org.sonar.db.FileSources;
 
 import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER;
 
@@ -120,7 +120,7 @@ public void visitFile(Component file) {
     }
 
     private void persistSource(ComputeFileSourceData.Data fileSourceData, String componentUuid) {
-      FileSourceDb.Data fileData = fileSourceData.getFileSourceData();
+      FileSources.Data fileData = fileSourceData.getFileSourceData();
 
       byte[] data = FileSourceDto.encodeSourceData(fileData);
       String dataHash = DigestUtils.md5Hex(data);