use of org.locationtech.geogig.repository.DepthSearch in project GeoGig by boundlessgeo.
the class WriteBackTest method testSimple.
@Test
public void testSimple() {
RevTreeBuilder oldRoot = new RevTreeBuilder(odb);
RevTree tree = new RevTreeBuilder(odb).put(blob("blob")).build();
ObjectId newRootId = writeBack.setAncestor(oldRoot).setChildPath("subtree").setTree(tree).call();
Optional<NodeRef> ref = new DepthSearch(odb).find(newRootId, "subtree");
assertTrue(ref.isPresent());
}
use of org.locationtech.geogig.repository.DepthSearch in project GeoGig by boundlessgeo.
the class WriteBackTest method testSingleNested.
@Test
public void testSingleNested() {
RevTreeBuilder oldRoot = new RevTreeBuilder(odb);
RevTree tree = new RevTreeBuilder(odb).put(blob("blob")).build();
ObjectId newRootId = writeBack.setAncestor(oldRoot).setChildPath("level1/level2").setTree(tree).call();
// created the intermediate tree node?
Optional<NodeRef> ref;
DepthSearch depthSearch = new DepthSearch(odb);
ref = depthSearch.find(newRootId, "level1");
assertTrue(ref.isPresent());
ref = depthSearch.find(newRootId, "level1/level2");
assertTrue(ref.isPresent());
ref = depthSearch.find(newRootId, "level1/level2/blob");
assertTrue(ref.isPresent());
}
use of org.locationtech.geogig.repository.DepthSearch in project GeoGig by boundlessgeo.
the class WriteBackTest method testSingleLevel.
@Test
public void testSingleLevel() {
RevTreeBuilder oldRoot = new RevTreeBuilder(odb);
RevTree tree = new RevTreeBuilder(odb).put(blob("blob")).build();
ObjectId newRootId = writeBack.setAncestor(oldRoot).setChildPath("level1").setTree(tree).call();
// created the intermediate tree node?
Optional<NodeRef> ref;
DepthSearch depthSearch = new DepthSearch(odb);
ref = depthSearch.find(newRootId, "level1");
assertTrue(ref.isPresent());
ref = depthSearch.find(newRootId, "level1/blob");
assertTrue(ref.isPresent());
}
use of org.locationtech.geogig.repository.DepthSearch in project GeoGig by boundlessgeo.
the class VerifyPatchOp method _call.
/**
* Executes the verify command
*
* @return the result of checking if the patch can be applied
*/
protected VerifyPatchResults _call() throws RuntimeException {
Preconditions.checkArgument(patch != null, "No patch file provided");
Patch patch = reverse ? this.patch.reversed() : this.patch;
Patch toApply = new Patch();
Patch toReject = new Patch();
for (RevFeatureType ft : patch.getFeatureTypes()) {
toApply.addFeatureType(ft);
toReject.addFeatureType(ft);
}
String path;
Optional<RevObject> obj;
List<FeatureDiff> diffs = patch.getModifiedFeatures();
for (FeatureDiff diff : diffs) {
path = diff.getPath();
String refSpec = Ref.WORK_HEAD + ":" + path;
obj = command(RevObjectParse.class).setRefSpec(refSpec).call();
if (!obj.isPresent()) {
toReject.addModifiedFeature(diff);
break;
}
RevFeature feature = (RevFeature) obj.get();
DepthSearch depthSearch = new DepthSearch(stagingDatabase());
Optional<NodeRef> noderef = depthSearch.find(workingTree().getTree(), path);
RevFeatureType featureType = command(RevObjectParse.class).setObjectId(noderef.get().getMetadataId()).call(RevFeatureType.class).get();
ImmutableList<PropertyDescriptor> descriptors = featureType.sortedDescriptors();
Set<Entry<PropertyDescriptor, AttributeDiff>> attrDiffs = diff.getDiffs().entrySet();
boolean ok = true;
for (Iterator<Entry<PropertyDescriptor, AttributeDiff>> iterator = attrDiffs.iterator(); iterator.hasNext(); ) {
Entry<PropertyDescriptor, AttributeDiff> entry = iterator.next();
AttributeDiff attrDiff = entry.getValue();
PropertyDescriptor descriptor = entry.getKey();
switch(attrDiff.getType()) {
case ADDED:
if (descriptors.contains(descriptor)) {
ok = false;
}
break;
case REMOVED:
case MODIFIED:
if (!descriptors.contains(descriptor)) {
ok = false;
break;
}
for (int i = 0; i < descriptors.size(); i++) {
if (descriptors.get(i).equals(descriptor)) {
Optional<Object> value = feature.getValues().get(i);
if (!attrDiff.canBeAppliedOn(value)) {
ok = false;
}
break;
}
}
}
}
if (!ok) {
toReject.addModifiedFeature(diff);
} else {
toApply.addModifiedFeature(diff);
}
}
List<FeatureInfo> added = patch.getAddedFeatures();
for (FeatureInfo feature : added) {
String refSpec = Ref.WORK_HEAD + ":" + feature.getPath();
obj = command(RevObjectParse.class).setRefSpec(refSpec).call();
if (obj.isPresent()) {
toReject.addAddedFeature(feature.getPath(), feature.getFeature(), feature.getFeatureType());
} else {
toApply.addAddedFeature(feature.getPath(), feature.getFeature(), feature.getFeatureType());
}
}
List<FeatureInfo> removed = patch.getRemovedFeatures();
for (FeatureInfo feature : removed) {
String refSpec = Ref.WORK_HEAD + ":" + feature.getPath();
obj = command(RevObjectParse.class).setRefSpec(refSpec).call();
if (!obj.isPresent()) {
toReject.addRemovedFeature(feature.getPath(), feature.getFeature(), feature.getFeatureType());
} else {
RevFeature revFeature = (RevFeature) obj.get();
DepthSearch depthSearch = new DepthSearch(stagingDatabase());
Optional<NodeRef> noderef = depthSearch.find(workingTree().getTree(), feature.getPath());
RevFeatureType revFeatureType = command(RevObjectParse.class).setObjectId(noderef.get().getMetadataId()).call(RevFeatureType.class).get();
RevFeature patchRevFeature = RevFeatureBuilder.build(feature.getFeature());
if (revFeature.equals(patchRevFeature) && revFeatureType.equals(feature.getFeatureType())) {
toApply.addRemovedFeature(feature.getPath(), feature.getFeature(), feature.getFeatureType());
} else {
toReject.addRemovedFeature(feature.getPath(), feature.getFeature(), feature.getFeatureType());
}
}
}
ImmutableList<FeatureTypeDiff> alteredTrees = patch.getAlteredTrees();
for (FeatureTypeDiff diff : alteredTrees) {
DepthSearch depthSearch = new DepthSearch(stagingDatabase());
Optional<NodeRef> noderef = depthSearch.find(workingTree().getTree(), diff.getPath());
ObjectId metadataId = noderef.isPresent() ? noderef.get().getMetadataId() : ObjectId.NULL;
if (Objects.equal(metadataId, diff.getOldFeatureType())) {
toApply.addAlteredTree(diff);
} else {
toReject.addAlteredTree(diff);
}
}
return new VerifyPatchResults(toApply, toReject);
}
use of org.locationtech.geogig.repository.DepthSearch in project GeoGig by boundlessgeo.
the class ReportCommitConflictsOp method _call.
@Override
protected MergeScenarioReport _call() {
MergeScenarioReport report = new MergeScenarioReport();
ObjectId parentCommitId = ObjectId.NULL;
if (commit.getParentIds().size() > 0) {
parentCommitId = commit.getParentIds().get(0);
}
ObjectId parentTreeId = ObjectId.NULL;
Repository repository = repository();
if (repository.commitExists(parentCommitId)) {
parentTreeId = repository.getCommit(parentCommitId).getTreeId();
}
// get changes
Iterator<DiffEntry> diffs = command(DiffTree.class).setOldTree(parentTreeId).setNewTree(commit.getTreeId()).setReportTrees(true).call();
while (diffs.hasNext()) {
DiffEntry diff = diffs.next();
String path = diff.oldPath() == null ? diff.newPath() : diff.oldPath();
Optional<RevObject> obj = command(RevObjectParse.class).setRefSpec(Ref.HEAD + ":" + path).call();
switch(diff.changeType()) {
case ADDED:
if (obj.isPresent()) {
TYPE type = command(ResolveObjectType.class).setObjectId(diff.getNewObject().objectId()).call();
if (TYPE.TREE.equals(type)) {
NodeRef headVersion = command(FindTreeChild.class).setChildPath(path).setParent(repository.getOrCreateHeadTree()).call().get();
if (!headVersion.getMetadataId().equals(diff.getNewObject().getMetadataId())) {
report.addConflict(new Conflict(path, ObjectId.NULL, diff.getNewObject().getMetadataId(), headVersion.getMetadataId()));
}
} else {
if (!obj.get().getId().equals(diff.newObjectId())) {
report.addConflict(new Conflict(path, ObjectId.NULL, diff.newObjectId(), obj.get().getId()));
}
}
} else {
report.addUnconflicted(diff);
}
break;
case REMOVED:
if (obj.isPresent()) {
if (obj.get().getId().equals(diff.oldObjectId())) {
report.addUnconflicted(diff);
} else {
report.addConflict(new Conflict(path, diff.oldObjectId(), ObjectId.NULL, obj.get().getId()));
}
}
break;
case MODIFIED:
TYPE type = command(ResolveObjectType.class).setObjectId(diff.getNewObject().objectId()).call();
if (TYPE.TREE.equals(type)) {
// one
if (!diff.isChange()) {
report.addUnconflicted(diff);
}
} else {
String refSpec = Ref.HEAD + ":" + path;
obj = command(RevObjectParse.class).setRefSpec(refSpec).call();
if (!obj.isPresent()) {
// git reports this as a conflict but does not mark as conflicted, just adds
// the missing file.
// We add it and consider it unconflicted
report.addUnconflicted(diff);
break;
}
RevFeature feature = (RevFeature) obj.get();
DepthSearch depthSearch = new DepthSearch(repository.objectDatabase());
Optional<NodeRef> noderef = depthSearch.find(this.workingTree().getTree(), path);
RevFeatureType featureType = command(RevObjectParse.class).setObjectId(noderef.get().getMetadataId()).call(RevFeatureType.class).get();
ImmutableList<PropertyDescriptor> descriptors = featureType.sortedDescriptors();
FeatureDiff featureDiff = command(DiffFeature.class).setOldVersion(Suppliers.ofInstance(diff.getOldObject())).setNewVersion(Suppliers.ofInstance(diff.getNewObject())).call();
Set<Entry<PropertyDescriptor, AttributeDiff>> attrDiffs = featureDiff.getDiffs().entrySet();
RevFeature newFeature = command(RevObjectParse.class).setObjectId(diff.newObjectId()).call(RevFeature.class).get();
boolean ok = true;
for (Iterator<Entry<PropertyDescriptor, AttributeDiff>> iterator = attrDiffs.iterator(); iterator.hasNext() && ok; ) {
Entry<PropertyDescriptor, AttributeDiff> entry = iterator.next();
AttributeDiff attrDiff = entry.getValue();
PropertyDescriptor descriptor = entry.getKey();
switch(attrDiff.getType()) {
case ADDED:
if (descriptors.contains(descriptor)) {
ok = false;
}
break;
case REMOVED:
case MODIFIED:
if (!descriptors.contains(descriptor)) {
ok = false;
break;
}
for (int i = 0; i < descriptors.size(); i++) {
if (descriptors.get(i).equals(descriptor)) {
Optional<Object> value = feature.getValues().get(i);
Optional<Object> newValue = newFeature.getValues().get(i);
if (!newValue.equals(value)) {
// check
if (!attrDiff.canBeAppliedOn(value)) {
ok = false;
}
break;
}
}
}
}
}
if (ok) {
report.addUnconflicted(diff);
} else {
report.addConflict(new Conflict(path, diff.oldObjectId(), diff.newObjectId(), obj.get().getId()));
}
}
break;
}
}
return report;
}
Aggregations