Fix per code review

* Fixed bug that doesn’t return NOT_FOUND status when compiling the design doc and there is no design doc or map function defined. Also support the case that there is a native design doc like view defined, then the design doc is queries through the REST API. * Added isDesignDoc flag to bypass design doc compilation process (check existing and version) if the view is not a design doc view. #1758
couchbase · Sep 28, 2017 · a64f5af · a64f5af
1 parent 6923714
commit a64f5af
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/Source/API/CBLView.m b/Source/API/CBLView.m
@@ -92,7 +92,7 @@ - (instancetype) initWithDatabase: (CBLDatabase*)db name: (NSString*)name create
 }
 
 
-@synthesize name=_name, storage=_storage, collation=_collation;
+@synthesize name=_name, storage=_storage, collation=_collation, isDesignDoc=_isDesignDoc;
 
 
 - (NSString*) description {
@@ -151,11 +151,18 @@ - (CBLMapBlock) registeredMapBlock {
 }
 
 - (CBLMapBlock) mapBlock {
-    CBLMapBlock map = self.registeredMapBlock;
-    // Invoke view compiler if it's available:
-    if (!map && [self respondsToSelector: @selector(compileFromDesignDoc)])
+    CBLMapBlock map;
+    if (_isDesignDoc) {
         if ([self compileFromDesignDoc] == kCBLStatusOK)
             map = self.registeredMapBlock;
+    } else {
+        map = self.registeredMapBlock;
+        // Invoke view compiler if it's available:
+        if (!map && [self respondsToSelector: @selector(compileFromDesignDoc)]) {
+            if ([self compileFromDesignDoc] == kCBLStatusOK)
+                map = self.registeredMapBlock;
+        }
+    }
     return map;
 }
 

diff --git a/Source/CBLView+Internal.h b/Source/CBLView+Internal.h
@@ -53,6 +53,8 @@ BOOL CBLQueryRowValueIsEntireDoc(id value);
 
 @property (readonly) NSArray* viewsInGroup;
 
+@property (nonatomic) BOOL isDesignDoc;
+
 /** Updates the view's index (incrementally) if necessary.
     If the index is updated, the other views in the viewGroup will be updated as a bonus.
     @return  200 if updated, 304 if already up-to-date, else an error code */

diff --git a/Source/CBLView+REST.m b/Source/CBLView+REST.m
@@ -16,17 +16,16 @@ @implementation CBLView (REST)
 
 
 - (CBLStatus) compileFromDesignDoc {
+    if (!self.isDesignDoc && self.registeredMapBlock) /* Native design doc like view */
+        return kCBLStatusOK;
+
     // see if there's a design doc with a CouchDB-style view definition we can compile:
     NSString* language;
     NSDictionary* viewProps = $castIf(NSDictionary, [self.database getDesignDocFunction: self.name
                                                                                     key: @"views"
                                                                                language: &language]);
-    if (!viewProps) {
-        if (self.registeredMapBlock != nil)
-            return kCBLStatusOK;
-        else
-            return kCBLStatusNotFound;
-    }
+    if (!viewProps)
+        return kCBLStatusNotFound;
 
     LogTo(View, @"%@: Attempting to compile %@ from design doc", self.name, language);
     if (![CBLView compiler])
@@ -71,6 +70,10 @@ - (CBLStatus) compileFromProperties: (NSDictionary*)viewProps language: (NSStrin
     NSDictionary* options = $castIf(NSDictionary, viewProps[@"options"]);
     self.collation = ($equal(options[@"collation"], @"raw")) ? kCBLViewCollationRaw
                                                              : kCBLViewCollationUnicode;
+
+    // Mark as a design doc view:
+    self.isDesignDoc = YES;
+
     return kCBLStatusOK;
 }
 

diff --git a/Unit-Tests/Router_Tests.m b/Unit-Tests/Router_Tests.m
@@ -586,8 +586,6 @@ - (void) test_UpdateMapFunction {
                 }
           }, kCBLStatusCreated, nil);
 
-    NSLog(@"%@", result);
-
     // Query view and check the result:
     id null = [NSNull null];
     Send(self, @"GET", @"/db/_design/design/_view/view", kCBLStatusOK,