opendev/gerrit
Code Issues Proposed changes

Move InMemoryInserter out of notedb package

Browse Source 
Change-Id: I23f8938ef188374a43c0ad6e08134a7ea2f89373
This commit is contained in:
Dave Borowitz
2016-06-24 10:02:57 -04:00
parent 8d02290d84
commit 250e50f142
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-server/src/main/java/com/google/gerrit/server/git/BatchUpdate.java
View File

@@ -43,7 +43,6 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.index.change.ChangeIndexer; import com.google.gerrit.server.index.change.ChangeIndexer;
import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.notedb.ChangeUpdate;
import com.google.gerrit.server.notedb.InsertedObject;
import com.google.gerrit.server.notedb.NoteDbUpdateManager; import com.google.gerrit.server.notedb.NoteDbUpdateManager;
import com.google.gerrit.server.notedb.NotesMigration; import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.ChangeControl;

10
gerrit-server/src/main/java/com/google/gerrit/server/notedb/InMemoryInserter.java → gerrit-server/src/main/java/com/google/gerrit/server/git/InMemoryInserter.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package com.google.gerrit.server.notedb; package com.google.gerrit.server.git;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@@ -35,17 +35,17 @@ import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
class InMemoryInserter extends ObjectInserter { public class InMemoryInserter extends ObjectInserter {
private final ObjectReader reader; private final ObjectReader reader;
private final Map<ObjectId, InsertedObject> inserted = new LinkedHashMap<>(); private final Map<ObjectId, InsertedObject> inserted = new LinkedHashMap<>();
private final boolean closeReader; private final boolean closeReader;
InMemoryInserter(ObjectReader reader) { public InMemoryInserter(ObjectReader reader) {
this.reader = checkNotNull(reader); this.reader = checkNotNull(reader);
closeReader = false; closeReader = false;
} }
InMemoryInserter(Repository repo) { public InMemoryInserter(Repository repo) {
this.reader = repo.newObjectReader(); this.reader = repo.newObjectReader();
closeReader = true; closeReader = true;
} }
@@ -66,7 +66,7 @@ class InMemoryInserter extends ObjectInserter {
return insert(InsertedObject.create(type, data, off, len)); return insert(InsertedObject.create(type, data, off, len));
} }
ObjectId insert(InsertedObject obj) { public ObjectId insert(InsertedObject obj) {
inserted.put(obj.id(), obj); inserted.put(obj.id(), obj);
return obj.id(); return obj.id();
} }

2
gerrit-server/src/main/java/com/google/gerrit/server/notedb/InsertedObject.java → gerrit-server/src/main/java/com/google/gerrit/server/git/InsertedObject.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package com.google.gerrit.server.notedb; package com.google.gerrit.server.git;
import com.google.auto.value.AutoValue; import com.google.auto.value.AutoValue;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;

2
gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java
View File

@@ -18,6 +18,8 @@ import static com.google.common.base.Preconditions.checkArgument;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap; import com.google.common.collect.ListMultimap;
import com.google.gerrit.server.git.InMemoryInserter;
import com.google.gerrit.server.git.InsertedObject;
import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.MissingObjectException;

2
gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
View File

@@ -36,6 +36,8 @@ import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.ChainedReceiveCommands; import com.google.gerrit.server.git.ChainedReceiveCommands;
import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.InMemoryInserter;
import com.google.gerrit.server.git.InsertedObject;
import com.google.gwtorm.server.OrmConcurrencyException; import com.google.gwtorm.server.OrmConcurrencyException;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;