Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote branch 'origin/develop'

  • Loading branch information...
commit a6df24408d392d17b17c6d7a7aece24989d2f17f 2 parents 46115a3 + d1083a4
@hanshuebner authored
View
8 src/data/json.lisp
@@ -1,9 +1,9 @@
(in-package :bknr.datastore)
-(defparameter *ignore-slots* '(bknr.datastore::id bknr.indices::destroyed-p))
+(defparameter *json-ignore-slots* '(bknr.datastore::id bknr.indices::destroyed-p))
(defmacro with-json-ignore-slots ((&rest slots) &body body)
- `(let ((*ignore-slots* (append *ignore-slots* ,slots)))
+ `(let ((*json-ignore-slots* (append *json-ignore-slots* ,slots)))
,@body))
(defmethod json:encode ((object store-object) &optional (stream *standard-output*))
@@ -11,6 +11,6 @@
(json:with-object ()
(dolist (slotdef (closer-mop:class-slots (class-of object)))
(when (and (slot-boundp object (closer-mop:slot-definition-name slotdef))
- (not (find (closer-mop:slot-definition-name slotdef) *ignore-slots*)))
- (json:encode-object-element (closer-mop:slot-definition-name slotdef)
+ (not (find (closer-mop:slot-definition-name slotdef) *json-ignore-slots*)))
+ (json:encode-object-element (string-downcase (closer-mop:slot-definition-name slotdef))
(slot-value object (closer-mop:slot-definition-name slotdef))))))))
View
3  src/data/package.lisp
@@ -125,7 +125,8 @@
#:ensure-store-current-directory
;; JSON serialization
- #:with-json-ignore-slots))
+ #:with-json-ignore-slots
+ #:*json-ignore-slots*))
(defpackage :bknr.datastore.tests
(:use :cl :bknr.datastore :bknr.indices :unit-test))
View
4 src/data/txn.lisp
@@ -468,7 +468,9 @@ to the log file in an atomic group"))
(setf execution-time (- (common-lisp::get-internal-run-time) start-time)))
(retry-transaction ()
:report (lambda (stream) (format stream "Retry the transaction ~A." transaction))
- (go again))))
+ (go again))
+ (skip-transaction ()
+ :report (lambda (stream) (format stream "Skip the transaction ~A." transaction)))))
(incf (store-transaction-run-time *store*) execution-time)
retval))
Please sign in to comment.
Something went wrong with that request. Please try again.