Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Projections debugging #130

Closed
wants to merge 3 commits into from
Closed

Projections debugging #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be56427
Fixed: inappropriate warning when starting projection debugging
ysw May 6, 2014
2cbb89a
Fixed: completed query debugging does not work
ysw May 7, 2014
e811ec0
Fixed: outdated test relying on old strange behavior
ysw May 7, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 27 additions & 11 deletions ...ons.Core.Tests/Integration/parallel_query/when_running_from_catalog_stream_query_twice.cs
View file
Open in desktop
Expand Up @@ -41,20 +41,36 @@ protected override IEnumerable<WhenStep> When()
yield return (new SystemMessage.BecomeMaster(Guid.NewGuid()));
yield return
(new ProjectionManagementMessage.Command.Post(
new PublishEnvelope(_bus), _projectionMode, _projectionName,
ProjectionManagementMessage.RunAs.System, "JS",
_projectionSource, enabled: false, checkpointsEnabled: false,
new PublishEnvelope(_bus),
_projectionMode,
_projectionName,
ProjectionManagementMessage.RunAs.System,
"JS",
_projectionSource,
enabled: false,
checkpointsEnabled: false,
emitEnabled: false));

yield return
new ProjectionManagementMessage.Command.Enable(
Envelope, _projectionName, ProjectionManagementMessage.RunAs.System);
new ProjectionManagementMessage.Command.Disable(
Envelope,
_projectionName,
ProjectionManagementMessage.RunAs.System);

yield return
new WhenStep(
new ProjectionManagementMessage.Command.UpdateQuery(
Envelope, _projectionName, ProjectionManagementMessage.RunAs.System, "JS", _projectionSource,
emitEnabled: false),
new ProjectionManagementMessage.Command.Enable(
Envelope, _projectionName, ProjectionManagementMessage.RunAs.System));
new ProjectionManagementMessage.Command.UpdateQuery(
Envelope,
_projectionName,
ProjectionManagementMessage.RunAs.System,
"JS",
_projectionSource,
emitEnabled: false);

yield return
new ProjectionManagementMessage.Command.Enable(
Envelope,
_projectionName,
ProjectionManagementMessage.RunAs.System);
}

[Test]
Expand Down
24 changes: 21 additions & 3 deletions src/EventStore/EventStore.Projections.Core/Prelude/Projections.js
View file
Open in desktop
Expand Up @@ -235,9 +235,27 @@ var $projections = {
}

function callHandler(handler, state, eventEnvelope) {
if (debugging)
debugger;
var newState = handler(state, eventEnvelope);
var newState;
if (debugging) {
try {



debugger;

/* F11 to step into the projection user code */

newState = handler(state, eventEnvelope);



} catch (ex) {
_log("Exception: " + ex.toString());
throw ex;
}
} else {
newState = handler(state, eventEnvelope);
}
if (newState === undefined)
newState = state;
return newState;
Expand Down
1 change: 1 addition & 0 deletions src/EventStore/EventStore.Projections.Core/Services/Management/ManagedProjection.cs
View file
Open in desktop
Expand Up @@ -535,6 +535,7 @@ private void DoReset1()
private void ResetProjection()
{
UpdateProjectionVersion(force: true);
Enabled = false;
_persistedState.Epoch = _persistedState.Version;
}

Expand Down
10 changes: 5 additions & 5 deletions src/EventStore/EventStore.SingleNode.Web/singlenode-web/js/es.debug.projection.js
View file
Open in desktop
Expand Up @@ -29,10 +29,10 @@ require(['projections/Observer', 'projections/Controller'],

observer.subscribe({
statusChanged: function (status) {
if (status.status !== "Stopped" && status.status !== "Faulted")
if (status.status.indexOf("Stopped") !== 0 && status.status.indexOf("Faulted") !== 0)
alert("The projection must be stopped to be debugged. " + status.status);
projectionStatusOk = true;
checkLoaded();
partLoaded();
},
stateChanged: function (state, xhr) {
var positionJson = xhr.getResponseHeader("ES-Position");
Expand Down Expand Up @@ -104,9 +104,10 @@ require(['projections/Observer', 'projections/Controller'],
$('.run-button').removeAttr("disabled");
if (data == "") {
processor.initialize();
cachedStates[partition] = processor.debugging_get_state();
} else
} else {
processor.set_state(data);
}
cachedStates[partition] = processor.debugging_get_state();
$("#projection-debug-result").text(cachedStates[partition]);
}

Expand Down Expand Up @@ -208,7 +209,6 @@ require(['projections/Observer', 'projections/Controller'],
currentEvent.isJson ? JSON.stringify(currentEvent.metadata) : currentEvent.metadata,
partition);


cachedStates[partition] = state;
console.log(currentEvent.readerPosition);
projectionPosition = currentEvent.readerPosition;
Expand Down
14 changes: 13 additions & 1 deletion src/EventStore/EventStore.SingleNode.Web/singlenode-web/js/projections/ui/Editor.js
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@ define(["ace/ace", "projections/ui/Confirmation", "projections/Observer", "proje
var lastEmitEnabled = false;
var lastStatusUrl = url;
var lastName = null;
var lastStatus = null;

function setEnabled(control, enabled) {
if (!control)
Expand Down Expand Up @@ -74,6 +75,7 @@ define(["ace/ace", "projections/ui/Confirmation", "projections/Observer", "proje
window.location.hash = status.statusUrl;
lastStatusUrl = status.statusUrl;
lastName = status.name;
lastStatus = status.status;
}

function urlChanged(url) {
Expand Down Expand Up @@ -190,6 +192,14 @@ define(["ace/ace", "projections/ui/Confirmation", "projections/Observer", "proje
}
}

function resetIfCompleted(success) {
if (lastStatus.indexOf("Completed") === 0) {
controller.reset(success);
} else {
success();
}
}

function updateAndStart() {
var success = controller.start.bind(controller);
updateIfChanged(success);
Expand All @@ -203,7 +213,9 @@ define(["ace/ace", "projections/ui/Confirmation", "projections/Observer", "proje

function debug() {
updateIfChanged(function () {
window.open("/web/debug-projection.htm#" + lastStatusUrl, "debug-" + lastName);
resetIfCompleted(function() {
window.open("/web/debug-projection.htm#" + lastStatusUrl, "debug-" + lastName);
});
});
}

Expand Down