Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1058231 into lp:zorba
The changes all look good to me now; thanks. However, I just noticed something else that might be an issue for 28msec. Matthias, this code changes the magic Windows behaviour of finding modules based on the install location of Zorba. It used to be that it would find the location of zorba.exe. Now it bases it on the location of zorba_simplestore.dll. However: For Sausalito, the library isn't named zorba_simplestore, is it? Is there a programmatic way of determining the DLL's name, based I guess on the current value of ZORBA_STORE_NAME? I guess we might want something like #cmakedefine ZORBA_STORE_NAME in config.h.cmake ? -- https://code.launchpad.net/~zorba-coders/zorba/bug1058231/+merge/129531 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba
Chris Hillery has proposed merging
lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba.
Commit message:
Added http-uri-resolution feature, default enabled. If disabled via normal
option mechanism (or the convenience --disable-http-resolution command-line
parameter), Zorba will not attempt to download HTTP/HTTPS/FTP URLs.
Requested reviews:
Chris Hillery (ceejatec)
Markos Zaharioudakis (markos-za)
Related bugs:
Bug #867363 in Zorba: disabling schema download
https://bugs.launchpad.net/zorba/+bug/867363
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-867363-disable-http/+merge/133032
--
https://code.launchpad.net/~zorba-coders/zorba/bug-867363-disable-http/+merge/133032
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2012-10-10 21:15:05 +
+++ bin/zorbacmd.cpp 2012-11-06 10:16:23 +
@@ -178,10 +178,10 @@
Item lQName = zorba-getItemFactory()-createQName(lIter-clark_qname);
sctx-declareOption(lQName, lIter-value);
}
-catch (zorba::ZorbaException const /* e */)
+catch (zorba::ZorbaException const e)
{
std::cerr unable to set static context option with qname
- lIter-clark_qname std::endl;
+ lIter-clark_qname : e.what() std::endl;
return false;
}
}
@@ -251,7 +251,8 @@
sctx-registerURIMapper(theThesaurusMapper);
}
}
-#endif
+#endif /* ZORBA_NO_FULL_TEXT */
+
return true;
}
=== modified file 'bin/zorbacmdproperties_base.h'
--- bin/zorbacmdproperties_base.h 2012-09-19 21:16:15 +
+++ bin/zorbacmdproperties_base.h 2012-11-06 10:16:23 +
@@ -42,7 +42,8 @@
--no-serializer, --debug, --debug-host, --debug-port, --no-logo,
--timeout, --uri-path, --lib-path, --module-path, --classpath,
--option, --trailing-nl, --stop-words, --thesaurus,
- --compile-plan, --execute-plan --serialize-plan, NULL };
+ --compile-plan, --execute-plan, --serialize-plan,
+ --disable-http-resolution, NULL };
return result;
}
@@ -426,6 +427,11 @@
{
theLoadPlan = true;
}
+ else if (strcmp (*argv, --disable-http-resolution) == 0)
+ {
+init_val ({http://www.zorba-xquery.com/options/features}disable=http-uri-resolution;,
+ theOption, 0);
+ }
else if (strcmp (*argv, --) == 0)
{
copy_args (++argv);
@@ -489,6 +495,7 @@
--serialize-plan, -s\nSerialize and then load the query execution plan.\n\n
--compile-plan,\nDo not execute the query; just compile it and save the execution plan in the file specified with the -o option.\n\n
--execute-plan\nDo not compile the query; instead load the execution plan from the file specified by the -f -q options, and execute the loaded plan.\n\n
+--disable-http-resolution\nDo not use HTTP to resolve URIs\n\n
;
}
=== modified file 'src/context/default_uri_mappers.cpp'
--- src/context/default_uri_mappers.cpp 2012-09-19 21:16:15 +
+++ src/context/default_uri_mappers.cpp 2012-11-06 10:16:23 +
@@ -17,6 +17,7 @@
#include stdafx.h
#include context/default_uri_mappers.h
+#include context/default_url_resolvers.h
#include util/uri_util.h
#include util/fs_util.h
#include zorbatypes/URI.h
@@ -192,7 +193,14 @@
// Finally, append the original URI, so that it will be resolved
// as-is if there's nothing appropriate on the local filesystem.
- oUris.push_back(aUri);
+ // Note: For module or schema imports, don't do this if it's a
+ // network (HTTP) URI and the http_resolution feature is disabled
+ // on this context.
+ if ( (lKind != EntityData::MODULE lKind != EntityData::SCHEMA) ||
+ aSctx.is_feature_set(feature::http_resolution) ||
+ (HTTPURLResolver::isHTTPScheme(aUri) == false) ) {
+oUris.push_back(aUri);
+ }
}
ZorbaCollectionURIMapper::~ZorbaCollectionURIMapper()
=== modified file 'src/context/default_uri_mappers.h'
--- src/context/default_uri_mappers.h 2012-09-19 21:16:15 +
+++ src/context/default_uri_mappers.h 2012-11-06 10:16:23 +
@@ -91,10 +91,10 @@
virtual void mapURI(zstring const aUri,
EntityData const* aEntityData,
static_context const aSctx,
-std::vectorzstring oUrls);
+std::vectorzstring oUris);
};
-} /* namespace zorba::impl */
+} /* namespace zorba::internal */
} /* namespace zorba */
=== modified file 'src/context/default_url_resolvers.cpp'
--- src/context/default_url_resolvers.cpp 2012-09-19 21:16:15 +
+++ src/context/default_url_resolvers.cpp 2012-11-06 10:16:23 +
@@ -34,34 +34,44 @@
namespace internal {
-/**
- * http: (and https: and ftp:) URL resolver.
- **/
-
-Resource*
-HTTPURLResolver::resolveURL
-(zstring const aUrl, EntityData const* aEntityData)
+/**
+ * Utility function that identifies URL schemes that will be handled
+ * by the HttpStream class.
+ */
+bool
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba has been updated. Commit Message changed to: Added http-uri-resolution feature, default enabled. If disabled via normal option mechanism (or the convenience --disable-http-resolution command-line parameter), Zorba will not attempt to download HTTP/HTTPS/FTP URLs. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-867363-disable-http/+merge/133032 -- https://code.launchpad.net/~zorba-coders/zorba/bug-867363-disable-http/+merge/133032 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-867363-disable-http/+merge/133032 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867363-disable-http-2012-11-06T10-17-50.354Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-867363-disable-http/+merge/133032 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba
Validation queue job bug-867363-disable-http-2012-11-06T10-17-50.354Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-867363-disable-http/+merge/133032 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-867363-disable-http/+merge/133032 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-867363-disable-http into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-867363-disable-http/+merge/133032 -- https://code.launchpad.net/~zorba-coders/zorba/bug-867363-disable-http/+merge/133032 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
Review: Approve I think you're correct, although at this point I'm not really sure either. For what it's worth, ZORBA_FIND_JNI() doesn't actually do the finding of JNI; it sets up JAVA_HOME in some magic way, and then just calls FIND_PACKAGE(JNI) anyway. So it depends on FindJNI.cmake existing somewhere. But FindJNI.cmake comes with CMake (at least recent versions), so I don't think we need to package it anywhere ourselves anymore. (Unless we have local hacks to it, which we may...) It would probably make sense for ZORBA_FIND_JNI() to also find Java, but one thing at a time. Let's see if this change goes in as it stands... -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
The proposal to merge lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/data-formatting-module-bug-989490 into lp:zorba/data-formatting-module
Attempt to merge into lp:zorba/data-formatting-module failed due to conflicts: contents conflict in cmake_modules/FindJNI.cmake -- https://code.launchpad.net/~davidagraf/zorba/data-formatting-module-bug-989490/+merge/110273 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1058231 into lp:zorba
The changes all look good to me now; thanks. However, I just noticed something else that might be an issue for 28msec. Matthias, this code changes the magic Windows behaviour of finding modules based on the install location of Zorba. It used to be that it would find the location of zorba.exe. Now it bases it on the location of zorba_simplestore.dll. However: For Sausalito, the library isn't named zorba_simplestore, is it? Is there a programmatic way of determining the DLL's name, based I guess on the current value of ZORBA_STORE_NAME? I guess we might want something like #cmakedefine ZORBA_STORE_NAME in config.h.cmake ? Yes, nothing should depend on the name of the library. -- https://code.launchpad.net/~zorba-coders/zorba/bug1058231/+merge/129531 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
